summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authoradam <adam>2014-07-26 06:19:38 +0000
committeradam <adam>2014-07-26 06:19:38 +0000
commit3c6a272fce681318b3520873e0aff1248f8aaaf9 (patch)
tree4dcd62ff2aea2cbd72b2cb9d4b0af7181c4af305 /lang
parentb6f62ef840f8cc03c8620f425c05d059b6651155 (diff)
downloadpkgsrc-3c6a272fce681318b3520873e0aff1248f8aaaf9.tar.gz
Reverting some changes which made building on Darwin to fail.
Diffstat (limited to 'lang')
-rw-r--r--lang/python27/distinfo4
-rw-r--r--lang/python27/patches/patch-al6
2 files changed, 5 insertions, 5 deletions
diff --git a/lang/python27/distinfo b/lang/python27/distinfo
index 830ec69b7ba..fef789c319f 100644
--- a/lang/python27/distinfo
+++ b/lang/python27/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.45 2014/07/17 15:26:49 ryoon Exp $
+$NetBSD: distinfo,v 1.46 2014/07/26 06:19:38 adam Exp $
SHA1 (Python-2.7.8.tar.xz) = 9c6281eeace0c3646fa556c8087bb1b7e033c9c4
RMD160 (Python-2.7.8.tar.xz) = 04d7d55ea65074a9b419e5d0920414e54691d907
@@ -24,7 +24,7 @@ SHA1 (patch-ab) = 0d0ae9802dfe3b85659adb16793affd8c4ffce43
SHA1 (patch-ad) = de730b9f5a5efb56afa8bed05824b5f6579242ec
SHA1 (patch-ae) = ff6d8c6164fe3c6dc4fb33d88eb8a49d5c5442f6
SHA1 (patch-ah) = ae3ce0656d890ca34292920bf0185f94ba847139
-SHA1 (patch-al) = 43457e0749366e65bc139d0905ca95c6d6d79ecf
+SHA1 (patch-al) = 4bd68f7995f5b76c3d62f370f31568930055c76f
SHA1 (patch-am) = 366ce0b130cc9b6d6c5354769da05bb4b5845e01
SHA1 (patch-an) = 6098fbf0fc31422196cc40d3a227934523db11ca
SHA1 (patch-ao) = 3a1cd2b255340fd23fc1fce8680e692581ffcec1
diff --git a/lang/python27/patches/patch-al b/lang/python27/patches/patch-al
index 6600f581cd1..a45790eb505 100644
--- a/lang/python27/patches/patch-al
+++ b/lang/python27/patches/patch-al
@@ -1,4 +1,4 @@
-$NetBSD: patch-al,v 1.14 2014/07/17 15:26:49 ryoon Exp $
+$NetBSD: patch-al,v 1.15 2014/07/26 06:19:38 adam Exp $
- recognize MirBSD, Interix
- remove special-case library version hack for FreeBSD
@@ -52,7 +52,7 @@ $NetBSD: patch-al,v 1.14 2014/07/17 15:26:49 ryoon Exp $
cur_target="${cur_target_major}.${cur_target_minor}"
- if test ${cur_target_major} -eq 10 && \
- test ${cur_target_minor} -ge 3
-+ if test false
++ if false
then
cur_target=10.3
if test ${enable_universalsdk}; then
@@ -64,7 +64,7 @@ $NetBSD: patch-al,v 1.14 2014/07/17 15:26:49 ryoon Exp $
- LDSHARED="$LDSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
- LDCXXSHARED="$LDCXXSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
+ BLDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BUILDPYTHON)'
-+ DSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
++ LDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
+ LDCXXSHARED="$LDCXXSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
fi ;;
Darwin/*)