diff options
| author | jperkin <jperkin> | 2014-09-02 10:07:23 +0000 |
|---|---|---|
| committer | jperkin <jperkin> | 2014-09-02 10:07:23 +0000 |
| commit | 36509d05c2692351f3667747dc1c7540031b306f (patch) | |
| tree | df12825d052ec98484f24dbff321b92b76163202 /converters | |
| parent | f9bc7f2723e02c80e2ca56c8d313dcd888120abf (diff) | |
| download | pkgsrc-36509d05c2692351f3667747dc1c7540031b306f.tar.gz | |
Ensure 'cd dir && make' rules are executed in a sub-shell, allowing us to
remove MAKE_JOBS_SAFE=no. We can't depend on gmake due to circular
dependencies.
Diffstat (limited to 'converters')
| -rw-r--r-- | converters/libiconv/Makefile | 3 | ||||
| -rw-r--r-- | converters/libiconv/distinfo | 4 | ||||
| -rw-r--r-- | converters/libiconv/patches/patch-ab | 26 |
3 files changed, 24 insertions, 9 deletions
diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile index 1deb2775d12..cdb5ac199dc 100644 --- a/converters/libiconv/Makefile +++ b/converters/libiconv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.63 2013/12/23 11:57:02 wiz Exp $ +# $NetBSD: Makefile,v 1.64 2014/09/02 10:07:23 jperkin Exp $ DISTNAME= libiconv-1.14 PKGREVISION= 2 @@ -33,7 +33,6 @@ EGDIR= ${PREFIX}/share/examples/libiconv REQD_FILES= ${EGDIR}/charset.alias ${PREFIX}/lib/charset.alias MAKE_ENV+= PAX=${PAX:Q} -MAKE_JOBS_SAFE= no # ENOENT(srclib) .include "../../mk/compiler.mk" diff --git a/converters/libiconv/distinfo b/converters/libiconv/distinfo index 87360f77d06..3002e0200e2 100644 --- a/converters/libiconv/distinfo +++ b/converters/libiconv/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.39 2014/01/01 15:50:01 schmonz Exp $ +$NetBSD: distinfo,v 1.40 2014/09/02 10:07:23 jperkin Exp $ SHA1 (libiconv-1.13-cp932.patch.gz) = 3dd6ed92e0d9f58db71edf63e31ab6cbd4420f99 RMD160 (libiconv-1.13-cp932.patch.gz) = 71040b00489ad1a5f218a09b4d22e550b1d31fc8 @@ -7,7 +7,7 @@ SHA1 (libiconv-1.14.tar.gz) = be7d67e50d72ff067b2c0291311bc283add36965 RMD160 (libiconv-1.14.tar.gz) = 87c36ba3f8ad1a49eb0d06f71856c856893bb52e Size (libiconv-1.14.tar.gz) = 4984397 bytes SHA1 (patch-aa) = 7fe47a14379dbeb487c677957e67fc7b043297ce -SHA1 (patch-ab) = 5ee1e7573d84fb857fb96387653c191008d96b02 +SHA1 (patch-ab) = 1499add23e7941b21dcc982baefe0276bcaafc28 SHA1 (patch-ad) = e94da1c4423677b74f463d4b132c7714efc65815 SHA1 (patch-ae) = ab346a515d5ab0efd679e7783edebd95a05db782 SHA1 (patch-af) = 513a8f995161853870a01afabccdb2a650b794a6 diff --git a/converters/libiconv/patches/patch-ab b/converters/libiconv/patches/patch-ab index 9169e42a2ee..c276f184051 100644 --- a/converters/libiconv/patches/patch-ab +++ b/converters/libiconv/patches/patch-ab @@ -1,8 +1,10 @@ -$NetBSD: patch-ab,v 1.11 2011/09/08 16:29:49 bsiegert Exp $ +$NetBSD: patch-ab,v 1.12 2014/09/02 10:07:23 jperkin Exp $ ---- Makefile.in.orig Sun Jun 21 11:17:09 2009 +Support MAKE_JOBS. + +--- Makefile.in.orig 2009-06-21 11:17:33.000000000 +0000 +++ Makefile.in -@@ -25,6 +25,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -25,21 +25,26 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ mkinstalldirs = $(SHELL) @top_srcdir@/build-aux/mkinstalldirs @@ -12,8 +14,22 @@ $NetBSD: patch-ab,v 1.11 2011/09/08 16:29:49 bsiegert Exp $ #### End of system configuration section. #### SHELL = /bin/sh -@@ -39,7 +42,9 @@ all : lib/localcharset.h force - if test -d tests; then cd tests && $(MAKE) all; fi + + all : lib/localcharset.h force +- cd lib && $(MAKE) all +- cd preload && $(MAKE) all +- cd srclib && $(MAKE) all +- cd src && $(MAKE) all +- cd po && $(MAKE) all +- cd man && $(MAKE) all +- if test -d tests; then cd tests && $(MAKE) all; fi ++ (cd lib && $(MAKE) all) ++ (cd preload && $(MAKE) all) ++ (cd srclib && $(MAKE) all) ++ (cd src && $(MAKE) all) ++ (cd po && $(MAKE) all) ++ (cd man && $(MAKE) all) ++ (if test -d tests; then cd tests && $(MAKE) all; fi) lib/localcharset.h : - builddir="`pwd`"; cd libcharset && $(MAKE) all && $(MAKE) install-lib libdir="$$builddir/lib" includedir="$$builddir/lib" |