diff options
| author | wiz <wiz@pkgsrc.org> | 2021-04-08 08:21:58 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2021-04-08 08:21:58 +0000 |
| commit | 65307d28c44be8927823ca16b5652453d0c495c0 (patch) | |
| tree | 855c8a53e09d171628483d0363fe06681fee661d /devel | |
| parent | 3abc7416153777852586476fc2cf966cb61eda4c (diff) | |
| download | pkgsrc-65307d28c44be8927823ca16b5652453d0c495c0.tar.gz | |
poco: honor CFLAGS and LDFLAGS
Bump PKGREVISION.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/poco/Makefile | 6 | ||||
| -rw-r--r-- | devel/poco/distinfo | 4 | ||||
| -rw-r--r-- | devel/poco/patches/patch-ae | 22 |
3 files changed, 24 insertions, 8 deletions
diff --git a/devel/poco/Makefile b/devel/poco/Makefile index 8acc17bab45..126663c5eb9 100644 --- a/devel/poco/Makefile +++ b/devel/poco/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.13 2020/01/18 21:48:09 jperkin Exp $ -# +# $NetBSD: Makefile,v 1.14 2021/04/08 08:21:58 wiz Exp $ PKGNAME= poco-${POCO_VERSION} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= devel COMMENT= POCO C++ Foundation libraries @@ -20,6 +19,7 @@ CONFIGURE_ARGS+= --include-path=${BUILDLINK_PREFIX.zlib}/include CONFIGURE_ARGS+= --include-path=${BUILDLINK_PREFIX.openssl}/include # remove patch backup files. +# XXX: this should delete in post-install ${DESTDIR}${PREFIX} instead pre-install: ${RM} -f ${WRKSRC}/Foundation/include/Poco/Platform.h.orig diff --git a/devel/poco/distinfo b/devel/poco/distinfo index 1baa23a0e5d..367ad05325e 100644 --- a/devel/poco/distinfo +++ b/devel/poco/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.14 2020/03/27 02:08:11 joerg Exp $ +$NetBSD: distinfo,v 1.15 2021/04/08 08:21:58 wiz Exp $ SHA1 (poco-1.6.1-all.tar.gz) = 38841212a6893d4290909a62b4f310450230fb6d RMD160 (poco-1.6.1-all.tar.gz) = a7ab9429db5b4b5fc02c194a208f11f296deb90b @@ -19,7 +19,7 @@ SHA1 (patch-aa) = be1c72c9c63b65e8d4211abab9dd036255ed6233 SHA1 (patch-ab) = a5ebcc44e9ab728d9812cefd01188622bfea172f SHA1 (patch-ac) = 08fa398b76935082dccbfb81bb69877d10996f6f SHA1 (patch-ad) = f6eeb9dc9b3a85525f264edbd1587bc4f124b9e1 -SHA1 (patch-ae) = d168bd1e391992b64555373065fb431ad9c23731 +SHA1 (patch-ae) = 79f9ab433e87a5518efe51133877e7e9f25b0bf1 SHA1 (patch-ag) = e1ef2677c25d445cdae97c832211e2407fae9af3 SHA1 (patch-ah) = a4ba890ab2501552bf18b2778f3f3593e4b0abcb SHA1 (patch-build_config_Linux) = f1b4eb600a472dfe9dca8d61e9c6ac3c5e4f2f9d diff --git a/devel/poco/patches/patch-ae b/devel/poco/patches/patch-ae index ac511da6fb8..74902e64580 100644 --- a/devel/poco/patches/patch-ae +++ b/devel/poco/patches/patch-ae @@ -1,11 +1,11 @@ -$NetBSD: patch-ae,v 1.2 2016/01/18 20:46:52 joerg Exp $ +$NetBSD: patch-ae,v 1.3 2021/04/08 08:21:58 wiz Exp $ # clean up the FreeBSD configuration to fit better with pkgsrc # Build a full set of shared library search paths, rather than # *assuming* everything is under PREFIX. ---- build/config/FreeBSD.orig 2010-12-16 05:43:24.000000000 +0000 +--- build/config/FreeBSD.orig 2015-08-04 05:20:55.000000000 +0000 +++ build/config/FreeBSD @@ -20,7 +20,9 @@ CXX = g++ LINK = $(CXX) @@ -14,10 +14,26 @@ $NetBSD: patch-ae,v 1.2 2016/01/18 20:46:52 joerg Exp $ -SHLIB = $(CXX) -shared -Wl,-soname,$(notdir $@) -o $@ +SHLIBFLAGS = -L$(POCO_PREFIX)/lib -Wl,-rpath,$(POCO_PREFIX)/lib \ + $(foreach p,$(sort $(POCO_ADD_LIBRARY)),-L$(p) -Wl,-R$(p)) -+SHLIB = $(CXX) -Wl,-rpath,$(POCO_PREFIX)/lib -shared -Wl,-soname,$(notdir $@) -o $@ ++SHLIB = $(CXX) $(CXXFLAGS) $(LDFLAGS) -Wl,-rpath,$(POCO_PREFIX)/lib -shared -Wl,-soname,$(notdir $@) -o $@ SHLIBLN = $(POCO_BASE)/build/script/shlibln DEP = $(POCO_BASE)/build/script/makedepend.gcc STRIP = strip +@@ -38,13 +40,13 @@ SHAREDLIBLINKEXT = .so + # + # Compiler and Linker Flags + # +-CFLAGS = ++CFLAGS ?= + CFLAGS32 = + CFLAGS64 = + CXXFLAGS = + CXXFLAGS32 = + CXXFLAGS64 = +-LINKFLAGS = ++LINKFLAGS = ${LDFLAGS} + LINKFLAGS32 = + LINKFLAGS64 = + STATICOPT_CC = @@ -52,7 +54,7 @@ STATICOPT_CXX = STATICOPT_LINK = -static SHAREDOPT_CC = -fPIC |