diff options
| author | tv <tv@pkgsrc.org> | 2005-01-24 21:46:33 +0000 |
|---|---|---|
| committer | tv <tv@pkgsrc.org> | 2005-01-24 21:46:33 +0000 |
| commit | a374e2c5f72c75829b02488895b6f367ec06f194 (patch) | |
| tree | d4b8c6fae99bd34c3b6a0bbdfe23c35dcf78aa6b /lang/python24 | |
| parent | 688de62aea266bfa0941b72c7ee3587e330ffc65 (diff) | |
| download | pkgsrc-a374e2c5f72c75829b02488895b6f367ec06f194.tar.gz | |
Pull in first-stab Interix support from lang/python23.
Diffstat (limited to 'lang/python24')
| -rw-r--r-- | lang/python24/distinfo | 4 | ||||
| -rw-r--r-- | lang/python24/patches/patch-al | 37 |
2 files changed, 35 insertions, 6 deletions
diff --git a/lang/python24/distinfo b/lang/python24/distinfo index da5f21e713e..635519ed2e9 100644 --- a/lang/python24/distinfo +++ b/lang/python24/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2004/12/30 21:56:21 minskim Exp $ +$NetBSD: distinfo,v 1.5 2005/01/24 21:46:33 tv Exp $ SHA1 (Python-2.4.tar.bz2) = 80c06f491a4b2a629e868540150faf22c5d0e41e Size (Python-2.4.tar.bz2) = 7840762 bytes @@ -13,5 +13,5 @@ SHA1 (patch-ah) = 6f5cff1f9f2482c59ef442bf019a1f3ad9fe21e8 SHA1 (patch-ai) = 6435c5a7269c14d94eab6fb9777b9d059507e7b8 SHA1 (patch-aj) = e471737ade95423039661b475f2dd0fc27aa9dac SHA1 (patch-ak) = f2e1d4087a94490bd3589a8c829ec72e04f31f72 -SHA1 (patch-al) = 1b91dab1575079c70851150ff0e3ad3d45fe7123 +SHA1 (patch-al) = 2cd3088f1d8b4e827c89fa75c2f7663f842451af SHA1 (patch-am) = aa71ec2f9cc8f434ff38b19df23b5dd433e13e5a diff --git a/lang/python24/patches/patch-al b/lang/python24/patches/patch-al index 0718eed750f..8100f85f9be 100644 --- a/lang/python24/patches/patch-al +++ b/lang/python24/patches/patch-al @@ -1,6 +1,6 @@ -$NetBSD: patch-al,v 1.4 2004/12/30 21:56:21 minskim Exp $ +$NetBSD: patch-al,v 1.5 2005/01/24 21:46:33 tv Exp $ ---- configure.orig 2004-11-06 19:24:12.000000000 -0600 +--- configure.orig 2004-11-06 20:24:12.000000000 -0500 +++ configure @@ -1479,6 +1479,8 @@ case $ac_sys_system/$ac_sys_release in # Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish. @@ -11,6 +11,15 @@ $NetBSD: patch-al,v 1.4 2004/12/30 21:56:21 minskim Exp $ # On Solaris 2.6, sys/wait.h is inconsistent in the usage # of union __?sigval. Reported by Stuart Bishop. SunOS/5.6) +@@ -3392,7 +3394,7 @@ _ACEOF + RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} + INSTSONAME="$LDLIBRARY".$SOVERSION + ;; +- Linux*|GNU*|NetBSD*|FreeBSD*) ++ Linux*|GNU*|NetBSD*|FreeBSD*|Interix*) + LDLIBRARY='libpython$(VERSION).so' + BLDLIBRARY='-L. -lpython$(VERSION)' + RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} @@ -3418,6 +3420,14 @@ _ACEOF BLDLIBRARY='-L. -lpython$(VERSION)' RUNSHARED=DLL_PATH=`pwd`:${DLL_PATH:-/atheos/sys/libs:/atheos/autolnk/lib} @@ -88,15 +97,35 @@ $NetBSD: patch-al,v 1.4 2004/12/30 21:56:21 minskim Exp $ BSD/OS*/4*) LDSHARED="gcc -shared";; OpenBSD*|FreeBSD*) if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ] -@@ -10370,6 +10388,7 @@ then +@@ -10338,7 +10356,8 @@ then + else + LDSHARED="ld -Bshareable ${LDFLAGS}" + fi;; +- NetBSD*) LDSHARED="cc -shared ${LDFLAGS}";; ++ NetBSD*) LDSHARED='$(CC) -shared ${LDFLAGS}';; ++ Interix*) LDSHARED='$(CC) -shared ${LDFLAGS}';; # XXX tv needs image-base hack + OpenUNIX*|UnixWare*) + if test "$GCC" = "yes" + then LDSHARED='$(CC) -shared' +@@ -10370,7 +10389,9 @@ then fi;; Linux*|GNU*) CCSHARED="-fPIC";; BSD/OS*/4*) CCSHARED="-fpic";; + Darwin/7*) CCSHARED="-fPIC -fno-common";; FreeBSD*|NetBSD*|OpenBSD*) CCSHARED="-fPIC";; ++ Interix*) CCSHARED="";; OpenUNIX*|UnixWare*) if test "$GCC" = "yes" -@@ -14297,6 +14316,7 @@ cat >>conftest.$ac_ext <<_ACEOF + then CCSHARED="-fPIC" +@@ -10428,6 +10449,7 @@ then + 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 +@@ -14297,6 +14319,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include "confdefs.h" |