diff options
| author | sevan <sevan@pkgsrc.org> | 2015-07-28 12:48:14 +0000 |
|---|---|---|
| committer | sevan <sevan@pkgsrc.org> | 2015-07-28 12:48:14 +0000 |
| commit | d0698da47bbc30b8cb8f73c4b6888539cfed7d01 (patch) | |
| tree | 6e8ac88699f3b7d7caecd81e2487b2cf8af1e40b | |
| parent | 6dcbbe6e6979771f4c8a202b9752e9c1b8cde884 (diff) | |
| download | pkgsrc-d0698da47bbc30b8cb8f73c4b6888539cfed7d01.tar.gz | |
"Backport upstream patch for pkgsrc to unbreak FreeBSD and DragonflyBSD" - kamil@
| -rw-r--r-- | devel/capstone/Makefile | 4 | ||||
| -rw-r--r-- | devel/capstone/distinfo | 3 | ||||
| -rw-r--r-- | devel/capstone/patches/patch-Makefile | 33 |
3 files changed, 38 insertions, 2 deletions
diff --git a/devel/capstone/Makefile b/devel/capstone/Makefile index 237f2708729..48990e20440 100644 --- a/devel/capstone/Makefile +++ b/devel/capstone/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2015/07/19 14:49:44 kamil Exp $ +# $NetBSD: Makefile,v 1.7 2015/07/28 12:48:14 sevan Exp $ DISTNAME= capstone-3.0.4 CATEGORIES= devel @@ -15,4 +15,6 @@ USE_TOOLS+= gmake # succeeds after 'make install' TEST_TARGET= check +ALL_ENV+= USE_GENERIC_LIBDATADIR=yes + .include "../../mk/bsd.pkg.mk" diff --git a/devel/capstone/distinfo b/devel/capstone/distinfo index a560c7ec48e..5b746960e99 100644 --- a/devel/capstone/distinfo +++ b/devel/capstone/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.6 2015/07/19 14:49:44 kamil Exp $ +$NetBSD: distinfo,v 1.7 2015/07/28 12:48:14 sevan Exp $ SHA1 (capstone-3.0.4.tar.gz) = 6153bbb4a4141fd9e6996d646cf7c81953cfe75a RMD160 (capstone-3.0.4.tar.gz) = 3f96993cc7cd2fbc1080e785bb7c7ae7f209d0f9 Size (capstone-3.0.4.tar.gz) = 2800818 bytes +SHA1 (patch-Makefile) = 7720d97ba443e0bf3465dd5963535b4079956c1e diff --git a/devel/capstone/patches/patch-Makefile b/devel/capstone/patches/patch-Makefile new file mode 100644 index 00000000000..bf5396d05fe --- /dev/null +++ b/devel/capstone/patches/patch-Makefile @@ -0,0 +1,33 @@ +$NetBSD: patch-Makefile,v 1.1 2015/07/28 12:48:14 sevan Exp $ + +Unbreak build on FreeBSD and DragonflyBSD. + +Patch accepted upstream: +https://github.com/aquynh/capstone/commit/453b41a29ed7f02f8319329cc86853d394b85a1e + +--- Makefile.orig 2015-07-15 07:44:42.000000000 +0000 ++++ Makefile +@@ -70,12 +70,18 @@ LIBDIRARCH ?= lib + LIBDIR = $(DESTDIR)$(PREFIX)/$(LIBDIRARCH) + + LIBDATADIR = $(LIBDIR) ++ ++# Don't redefine $LIBDATADIR when global environment variable ++# USE_GENERIC_LIBDATADIR is set. This is used by the pkgsrc framework. ++ ++ifndef USE_GENERIC_LIBDATADIR + ifeq ($(UNAME_S), FreeBSD) + LIBDATADIR = $(DESTDIR)$(PREFIX)/libdata + endif + ifeq ($(UNAME_S), DragonFly) + LIBDATADIR = $(DESTDIR)$(PREFIX)/libdata + endif ++endif + + INSTALL_BIN ?= install + INSTALL_DATA ?= $(INSTALL_BIN) -m0644 +@@ -463,4 +469,3 @@ define generate-pkgcfg + echo 'Libs: -L$${libdir} -lcapstone' >> $(PKGCFGF) + echo 'Cflags: -I$${includedir}' >> $(PKGCFGF) + endef +- |