diff options
author | wiz <wiz@pkgsrc.org> | 2014-05-20 09:13:37 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2014-05-20 09:13:37 +0000 |
commit | df62d092e22307774edd2ed79fe089fdef1f1ccf (patch) | |
tree | aefc454415c388295f127d2978390a82f5f1036d | |
parent | 108cd9ddf04bfbae8a289eb078803b558653719e (diff) | |
download | pkgsrc-df62d092e22307774edd2ed79fe089fdef1f1ccf.tar.gz |
Remove probably incomplete Interix support. I don't think anyone
tried this in the last X > 5 years. If I'm incorrect, let me know.
(trying to reduce diffs to upstream).
-rw-r--r-- | lang/python34/Makefile | 4 | ||||
-rw-r--r-- | lang/python34/distinfo | 4 | ||||
-rw-r--r-- | lang/python34/patches/patch-al | 28 |
3 files changed, 11 insertions, 25 deletions
diff --git a/lang/python34/Makefile b/lang/python34/Makefile index bf06bac0e00..eb1984b4b5f 100644 --- a/lang/python34/Makefile +++ b/lang/python34/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2014/05/20 08:59:31 wen Exp $ +# $NetBSD: Makefile,v 1.5 2014/05/20 09:13:37 wiz Exp $ .include "dist.mk" @@ -48,7 +48,7 @@ LIBS.SunOS+= -lrt PY_VER_SUFFIX= 3.4 -.if ${OPSYS} == "Darwin" || ${OPSYS} == "Interix" +.if ${OPSYS} == "Darwin" PY_PLATNAME= ${LOWER_OPSYS} USE_TOOLS+= gmake .elif ${OPSYS} == "IRIX" diff --git a/lang/python34/distinfo b/lang/python34/distinfo index aaac5fe91de..cbf2ef5cc07 100644 --- a/lang/python34/distinfo +++ b/lang/python34/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2014/05/20 08:59:31 wen Exp $ +$NetBSD: distinfo,v 1.9 2014/05/20 09:13:37 wiz Exp $ SHA1 (Python-3.4.1.tar.xz) = 143e098efe7ee7bec8a4904ec4b322f28a067a03 RMD160 (Python-3.4.1.tar.xz) = 276fda8bd4ef515da83645ddd5f01eb0f68522a5 @@ -6,7 +6,7 @@ Size (Python-3.4.1.tar.xz) = 14125788 bytes SHA1 (patch-Lib_distutils_unixccompiler.py) = 39cb8d1e1e3e76e2b6b5dbc1a6b5e0815300b2ce SHA1 (patch-aa) = 14359f8d0527eff08073c0aea60dfe8961d9255d SHA1 (patch-ah) = b3a1363f6d210f855f3769650e3891b0df5c531d -SHA1 (patch-al) = 9920f04aed35d66dfc9509344ad159c918510376 +SHA1 (patch-al) = 1867e7145d8ab008338461ee6c662d653479443d SHA1 (patch-am) = dbce46a877a01ecef01767cdfb0c3a2137431833 SHA1 (patch-an) = c9b571eb54fdf0b1e93524a6de6780e8c4119221 SHA1 (patch-ao) = bc7bb76ca7b3b8302dd966fad85171236c1f06e6 diff --git a/lang/python34/patches/patch-al b/lang/python34/patches/patch-al index 1d8c476d970..b2b613a8e7a 100644 --- a/lang/python34/patches/patch-al +++ b/lang/python34/patches/patch-al @@ -1,15 +1,13 @@ -$NetBSD: patch-al,v 1.3 2014/05/20 08:59:31 wen Exp $ +$NetBSD: patch-al,v 1.4 2014/05/20 09:13:37 wiz Exp $ MirBSD support http://bugs.python.org/issue21458 -Interix support - Changes for consistency across pkgsrc platforms. XXX: Not sure what the BLDSHARED changes are about. ---- configure.orig 2014-05-20 15:08:33.000000000 +0000 +--- configure.orig 2014-05-19 05:19:40.000000000 +0000 +++ configure @@ -3354,7 +3354,7 @@ case $ac_sys_system/$ac_sys_release in # Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish. @@ -25,7 +23,7 @@ XXX: Not sure what the BLDSHARED changes are about. fi ;; - Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*) -+ Linux*|GNU*|NetBSD*|FreeBSD*|Interix*|DragonFly*|OpenBSD*|MirBSD*) ++ Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*|MirBSD*) LDLIBRARY='libpython$(LDVERSION).so' BLDLIBRARY='-L. -lpython$(LDVERSION)' RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} @@ -61,7 +59,7 @@ XXX: Not sure what the BLDSHARED changes are about. fi fi ;; -@@ -8591,9 +8586,15 @@ then +@@ -8591,6 +8586,9 @@ then ;; esac fi;; @@ -71,23 +69,16 @@ XXX: Not sure what the BLDSHARED changes are about. NetBSD*|DragonFly*) LDSHARED='$(CC) -shared' LDCXXSHARED='$(CXX) -shared';; -+ Interix*) # XXX tv need image-base hack -+ LDSHARED='$(CC) -shared' -+ LDCXXSHARED='$(CXX) -shared';; - OpenUNIX*|UnixWare*) - if test "$GCC" = "yes" ; then - LDSHARED='$(CC) -shared' -@@ -8634,7 +8635,8 @@ then +@@ -8634,7 +8632,7 @@ then fi;; Linux*|GNU*) CCSHARED="-fPIC";; BSD/OS*/4*) CCSHARED="-fpic";; - FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";; + FreeBSD*|NetBSD*|OpenBSD*|MirBSD*|DragonFly*) CCSHARED="-fPIC";; -+ Interix*) CCSHARED="";; OpenUNIX*|UnixWare*) if test "$GCC" = "yes" then CCSHARED="-fPIC" -@@ -8683,11 +8685,12 @@ then +@@ -8683,7 +8681,7 @@ then OpenUNIX*|UnixWare*) LINKFORSHARED="-Wl,-Bexport";; SCO_SV*) LINKFORSHARED="-Wl,-Bexport";; ReliantUNIX*) LINKFORSHARED="-W1 -Blargedynsym";; @@ -96,12 +87,7 @@ XXX: Not sure what the BLDSHARED changes are about. if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ] then LINKFORSHARED="-Wl,--export-dynamic" - fi;; -+ Interix*) LINKFORSHARED="-Wl,-E";; - SunOS/5*) case $CC in - *gcc*) - if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null -@@ -13917,8 +13920,6 @@ $as_echo "$SOABI" >&6; } +@@ -13917,8 +13915,6 @@ $as_echo "$SOABI" >&6; } case $ac_sys_system in |