diff options
| author | fhajny <fhajny@pkgsrc.org> | 2014-01-24 13:28:30 +0000 |
|---|---|---|
| committer | fhajny <fhajny@pkgsrc.org> | 2014-01-24 13:28:30 +0000 |
| commit | 79fa3b2c5111271dcf72e79421ea49fbe6d3cad8 (patch) | |
| tree | 7b4132f8d2fa51193e2bc987b357cd6fc820a8fb | |
| parent | 4a396c8d77338b10de1f2b23fa4890ee03394fd5 (diff) | |
| download | pkgsrc-79fa3b2c5111271dcf72e79421ea49fbe6d3cad8.tar.gz | |
Fix gyp for Darwin, where platform libtool should be used.
Bump PKGREVISION.
| -rw-r--r-- | devel/gyp/Makefile | 3 | ||||
| -rw-r--r-- | devel/gyp/distinfo | 4 | ||||
| -rw-r--r-- | devel/gyp/patches/patch-pylib_gyp_generator_make.py | 17 |
3 files changed, 18 insertions, 6 deletions
diff --git a/devel/gyp/Makefile b/devel/gyp/Makefile index 826955707c4..f914c39f438 100644 --- a/devel/gyp/Makefile +++ b/devel/gyp/Makefile @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.2 2013/09/08 16:33:25 ryoon Exp $ +# $NetBSD: Makefile,v 1.3 2014/01/24 13:28:30 fhajny Exp $ SVN_REVISION= 1718 DIST_VERSION= 0.1 DISTNAME= gyp-${DIST_VERSION}pre${SVN_REVISION} PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_LOCAL} diff --git a/devel/gyp/distinfo b/devel/gyp/distinfo index c6bbe4b26fa..4e474e8873e 100644 --- a/devel/gyp/distinfo +++ b/devel/gyp/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.2 2013/09/08 16:33:25 ryoon Exp $ +$NetBSD: distinfo,v 1.3 2014/01/24 13:28:30 fhajny Exp $ SHA1 (gyp-0.1pre1718.tar.gz) = 4610a802515e8e78c4baf5cd0c289ee2431f5a2d RMD160 (gyp-0.1pre1718.tar.gz) = d6704f9c671cfe00e0025544482a22f014dcb062 Size (gyp-0.1pre1718.tar.gz) = 511521 bytes SHA1 (patch-gyptest.py) = 65dcdb2a0fe57157ec2326cb01908ccdd3f59a20 SHA1 (patch-pylib_gyp_common.py) = 03d52e3a27e064479e6438d88c8c8081bb20f754 -SHA1 (patch-pylib_gyp_generator_make.py) = d201298031d7d3d51414a3c1023f0c0efb6c6df7 +SHA1 (patch-pylib_gyp_generator_make.py) = b02737fa8e54a84600aa03e5785f8e0986ffcdb8 SHA1 (patch-setup.py) = 25bf3cd827dd1b4453ed6260802fa8ae7d7b467b diff --git a/devel/gyp/patches/patch-pylib_gyp_generator_make.py b/devel/gyp/patches/patch-pylib_gyp_generator_make.py index 2f16539f1d7..53ce541d5aa 100644 --- a/devel/gyp/patches/patch-pylib_gyp_generator_make.py +++ b/devel/gyp/patches/patch-pylib_gyp_generator_make.py @@ -1,8 +1,19 @@ -$NetBSD: patch-pylib_gyp_generator_make.py,v 1.1 2013/01/18 11:32:45 ryoon Exp $ +$NetBSD: patch-pylib_gyp_generator_make.py,v 1.2 2014/01/24 13:28:30 fhajny Exp $ ---- pylib/gyp/generator/make.py.orig 2012-12-15 10:46:06.000000000 +0000 +Force platform libtool na Darwin, see +https://code.google.com/p/gyp/issues/detail?id=354&q=libtool +--- pylib/gyp/generator/make.py.orig 2013-09-06 23:07:36.000000000 +0000 +++ pylib/gyp/generator/make.py -@@ -328,7 +328,7 @@ sed -e "s|^$(notdir $@)|$@|" $(depfile). +@@ -161,7 +161,7 @@ cmd_solink_module = $(LINK.$(TOOLSET)) - + + LINK_COMMANDS_MAC = """\ + quiet_cmd_alink = LIBTOOL-STATIC $@ +-cmd_alink = rm -f $@ && ./gyp-mac-tool filter-libtool libtool $(GYP_LIBTOOLFLAGS) -static -o $@ $(filter %.o,$^) ++cmd_alink = rm -f $@ && ./gyp-mac-tool filter-libtool /usr/bin/libtool $(GYP_LIBTOOLFLAGS) -static -o $@ $(filter %.o,$^) + + quiet_cmd_link = LINK($(TOOLSET)) $@ + cmd_link = $(LINK.$(TOOLSET)) $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o "$@" $(LD_INPUTS) $(LIBS) +@@ -324,7 +324,7 @@ sed -e "s|^$(notdir $@)|$@|" $(depfile). # We remove slashes and replace spaces with new lines; # remove blank lines; # delete the first line and append a colon to the remaining lines. |