diff options
| author | wiz <wiz@pkgsrc.org> | 2017-08-29 11:40:13 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2017-08-29 11:40:13 +0000 |
| commit | cfea1396464a983d413228deb8a02a92a753513d (patch) | |
| tree | bd9e6fe96607832ebc4556e8874e76f72a0ca996 /devel/pth | |
| parent | db7f558a4e71977b64b686b64ae58392e6c66d4a (diff) | |
| download | pkgsrc-cfea1396464a983d413228deb8a02a92a753513d.tar.gz | |
Honor LDFLAGS.
Remove some old workarounds.
Bump PKGREVISION.
Diffstat (limited to 'devel/pth')
| -rw-r--r-- | devel/pth/Makefile | 20 | ||||
| -rw-r--r-- | devel/pth/distinfo | 3 | ||||
| -rw-r--r-- | devel/pth/patches/patch-Makefile.in | 19 |
3 files changed, 25 insertions, 17 deletions
diff --git a/devel/pth/Makefile b/devel/pth/Makefile index 29ff2dd1b25..36044e906d4 100644 --- a/devel/pth/Makefile +++ b/devel/pth/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.79 2015/06/16 13:06:30 jperkin Exp $ +# $NetBSD: Makefile,v 1.80 2017/08/29 11:40:13 wiz Exp $ DISTNAME= pth-2.0.7 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU:=pth/} @@ -10,12 +10,10 @@ HOMEPAGE= http://www.gnu.org/software/pth/pth.html COMMENT= GNU Portable Thread library LICENSE= gnu-lgpl-v2.1 -CONFLICTS= pth-current-[0-9]* pth-syscall<1.4.1nb1 - MAKE_JOBS_SAFE= no -USE_LIBTOOL= YES -GNU_CONFIGURE= YES +USE_LIBTOOL= yes +GNU_CONFIGURE= yes #CONFIGURE_ARGS+= --enable-debug TEST_TARGET= test @@ -23,22 +21,12 @@ TEST_TARGET= test .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "NetBSD" -. if ${MACHINE_ARCH} == "m68k" && (!empty(OS_VERSION:M1.5.[12]*) || !empty(OS_VERSION:M1.[0-4]*)) -pre-configure: - @${ECHO} Building without --enable-syscall-hard. lib/18644 needs fixing. -. else CONFIGURE_ARGS+= --enable-syscall-hard -. endif .elif ${OPSYS} == "Interix" || ${OPSYS} == "Darwin" CONFIGURE_ENV+= ac_cv_check_nfdstype='unsigned int' CONFIGURE_ENV+= ac_cv_typedef_nfds_t=no # in <poll.h>, but that's unused .endif -# XXX: Check this is still required and reverse test to OS which need it. -.if ${OPSYS} != "SunOS" -CONFIGURE_ARGS+= --with-fdsetsize=1024 -.endif - PLIST_VARS+= pthread .include "../../mk/pthread.buildlink3.mk" diff --git a/devel/pth/distinfo b/devel/pth/distinfo index 02e59accdb8..5549128ca1d 100644 --- a/devel/pth/distinfo +++ b/devel/pth/distinfo @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.18 2015/11/03 03:29:04 agc Exp $ +$NetBSD: distinfo,v 1.19 2017/08/29 11:40:13 wiz Exp $ SHA1 (pth-2.0.7.tar.gz) = 9a71915c89ff2414de69fe104ae1016d513afeee RMD160 (pth-2.0.7.tar.gz) = 80bc66777ba20d9648b7aaf3f58d593be6416910 SHA512 (pth-2.0.7.tar.gz) = f79d74047c50e06f3198356f88647c5c1c8a04ebdd94641fc31d5ab0fd2750d86615fcb81da2f98d7ea73d012a501195d3fa09060571d18dcfdaec5d7a0ecb12 Size (pth-2.0.7.tar.gz) = 652640 bytes +SHA1 (patch-Makefile.in) = ee52ef657b753340bf559112ab9ff8365b5e8fc6 SHA1 (patch-ab) = 8495e25d31dadc9f0b56e48950eecf3e895a9f30 SHA1 (patch-ac) = d3683f603c3e4f1826b55967639823b3295d1fb7 SHA1 (patch-ad) = ddabeeff5bab8b580904861ea5437ed8f24f3965 diff --git a/devel/pth/patches/patch-Makefile.in b/devel/pth/patches/patch-Makefile.in new file mode 100644 index 00000000000..5ef07fb8668 --- /dev/null +++ b/devel/pth/patches/patch-Makefile.in @@ -0,0 +1,19 @@ +$NetBSD: patch-Makefile.in,v 1.1 2017/08/29 11:40:13 wiz Exp $ + +Honor LDFLAGS. + +--- Makefile.in.orig 2006-06-08 17:54:01.000000000 +0000 ++++ Makefile.in +@@ -168,10 +168,10 @@ pth_p.h: $(S)pth_p.h.in + + # build the static and possibly shared libraries + libpth.la: $(LOBJS) +- $(LIBTOOL) --mode=link --quiet $(CC) -o libpth.la $(LOBJS) \ ++ $(LIBTOOL) --mode=link --quiet $(CC) -o libpth.la $(LDFLAGS) $(LOBJS) \ + -rpath $(libdir) -version-info `$(SHTOOL) version -lc -dlibtool $(_VERSION_FILE)` + libpthread.la: pthread.lo $(LOBJS) +- $(LIBTOOL) --mode=link --quiet $(CC) -o libpthread.la pthread.lo $(LOBJS) \ ++ $(LIBTOOL) --mode=link --quiet $(CC) -o libpthread.la pthread.lo $(LDFLAGS) $(LOBJS) \ + -rpath $(libdir) -version-info `$(SHTOOL) version -lc -dlibtool $(_VERSION_FILE)` + + # build the manual pages |