Thu Jul 17 15:26:49 2014 UTC ()
Fix SCO OpenServer 5.0.7/3.2 build.


(ryoon)
diff -r1.44 -r1.45 pkgsrc/lang/python27/Makefile
diff -r1.44 -r1.45 pkgsrc/lang/python27/distinfo
diff -r0 -r1.1 pkgsrc/lang/python27/patches/patch-Lib_multiprocessing_process.py
diff -r0 -r1.1 pkgsrc/lang/python27/patches/patch-Modules_getaddrinfo.c
diff -r0 -r1.1 pkgsrc/lang/python27/patches/patch-Modules_mmapmodule.c
diff -r0 -r1.1 pkgsrc/lang/python27/patches/patch-Modules_posixmodule.c
diff -r0 -r1.4 pkgsrc/lang/python27/patches/patch-Modules_socketmodule.c
diff -r1.13 -r1.14 pkgsrc/lang/python27/patches/patch-al
cvs diff -r1.44 -r1.45 pkgsrc/lang/python27/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/python27/Makefile 2014/07/02 09:53:16 1.44
+++ pkgsrc/lang/python27/Makefile 2014/07/17 15:26:49 1.45
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.44 2014/07/02 09:53:16 adam Exp $ 1# $NetBSD: Makefile,v 1.45 2014/07/17 15:26:49 ryoon Exp $
2 2
3.include "dist.mk" 3.include "dist.mk"
4 4
5PKGNAME= python27-${PY_DISTVERSION} 5PKGNAME= python27-${PY_DISTVERSION}
6CATEGORIES= lang python 6CATEGORIES= lang python
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.python.org/ 9HOMEPAGE= http://www.python.org/
10COMMENT= Interpreted, interactive, object-oriented programming language 10COMMENT= Interpreted, interactive, object-oriented programming language
11LICENSE= python-software-foundation 11LICENSE= python-software-foundation
12 12
13CONFLICTS+= python-[0-9]* 13CONFLICTS+= python-[0-9]*
14 14
@@ -19,27 +19,28 @@ CONFIGURE_ARGS+= OPT=${CFLAGS:Q} @@ -19,27 +19,28 @@ CONFIGURE_ARGS+= OPT=${CFLAGS:Q}
19CONFIGURE_ARGS+= --with-system-ffi 19CONFIGURE_ARGS+= --with-system-ffi
20CONFIGURE_ARGS+= --with-dbmliborder=ndbm:bdb 20CONFIGURE_ARGS+= --with-dbmliborder=ndbm:bdb
21CONFIGURE_ENV+= MKDIR_P=${MKDIR:Q} 21CONFIGURE_ENV+= MKDIR_P=${MKDIR:Q}
22 22
23PKGCONFIG_OVERRIDE+= Misc/python.pc.in 23PKGCONFIG_OVERRIDE+= Misc/python.pc.in
24 24
25LDFLAGS+= -L${WRKSRC} 25LDFLAGS+= -L${WRKSRC}
26 26
27# $RANDOM usage there is fine 27# $RANDOM usage there is fine
28CHECK_PORTABILITY_SKIP= Tools/faqwiz/move-faqwiz.sh 28CHECK_PORTABILITY_SKIP= Tools/faqwiz/move-faqwiz.sh
29 29
30USE_LANGUAGES= c c++ 30USE_LANGUAGES= c c++
31 31
32PTHREAD_OPTS+= require 32PTHREAD_OPTS+= require
 33PTHREAD_AUTO_VARS= yes
33.include "../../mk/pthread.buildlink3.mk" 34.include "../../mk/pthread.buildlink3.mk"
34.if ${PTHREAD_TYPE} == "pth" 35.if ${PTHREAD_TYPE} == "pth"
35CONFIGURE_ARGS+= --with-pth 36CONFIGURE_ARGS+= --with-pth
36.endif 37.endif
37 38
38.include "../../mk/compiler.mk" 39.include "../../mk/compiler.mk"
39 40
40# Clang needs -fwrapv 41# Clang needs -fwrapv
41.if !empty(PKGSRC_COMPILER:Mclang) 42.if !empty(PKGSRC_COMPILER:Mclang)
42CFLAGS+= -fwrapv 43CFLAGS+= -fwrapv
43.endif 44.endif
44 45
45.include "../../mk/bsd.prefs.mk" 46.include "../../mk/bsd.prefs.mk"
@@ -64,26 +65,28 @@ CONFIGURE_ENV+= ac_cv_func_bind_textdom @@ -64,26 +65,28 @@ CONFIGURE_ENV+= ac_cv_func_bind_textdom
64.endif 65.endif
65 66
66.if ${OPSYS} == "Cygwin" || ${OPSYS} == "Darwin" || ${OPSYS} == "Interix" 67.if ${OPSYS} == "Cygwin" || ${OPSYS} == "Darwin" || ${OPSYS} == "Interix"
67PY_PLATNAME= ${LOWER_OPSYS} 68PY_PLATNAME= ${LOWER_OPSYS}
68USE_TOOLS+= gmake 69USE_TOOLS+= gmake
69.elif ${OPSYS} == "IRIX" 70.elif ${OPSYS} == "IRIX"
70PY_PLATNAME= ${LOWER_OPSYS:C/\..*//} 71PY_PLATNAME= ${LOWER_OPSYS:C/\..*//}
71.elif ${OPSYS} == "SunOS" 72.elif ${OPSYS} == "SunOS"
72PY_PLATNAME= sunos${OS_VERSION:C/\..*//} 73PY_PLATNAME= sunos${OS_VERSION:C/\..*//}
73.elif ${OPSYS} == "HPUX" 74.elif ${OPSYS} == "HPUX"
74PY_PLATNAME= hp-ux11 75PY_PLATNAME= hp-ux11
75.elif ${OPSYS} == "Linux" 76.elif ${OPSYS} == "Linux"
76PY_PLATNAME= linux2 77PY_PLATNAME= linux2
 78.elif ${OS_VARIANT} == "SCOOSR5"
 79PY_PLATNAME= sco_sv3
77.else 80.else
78PY_PLATNAME= ${LOWER_OPSYS}${OS_VERSION:C/\..*//} 81PY_PLATNAME= ${LOWER_OPSYS}${OS_VERSION:C/\..*//}
79.endif 82.endif
80PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME:Q} 83PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME:Q}
81 84
82.if (${MACHINE_ARCH} == "alpha") || (${MACHINE_ARCH} == "amd64") || \ 85.if (${MACHINE_ARCH} == "alpha") || (${MACHINE_ARCH} == "amd64") || \
83 (${MACHINE_ARCH} == "sparc64") || (${MACHINE_ARCH} == "x86_64") || \ 86 (${MACHINE_ARCH} == "sparc64") || (${MACHINE_ARCH} == "x86_64") || \
84 (${MACHINE_ARCH} == "powerpc64") || (defined(ABI) && ${ABI} == "64") 87 (${MACHINE_ARCH} == "powerpc64") || (defined(ABI) && ${ABI} == "64")
85IS_64BIT_PLATFORM?= yes 88IS_64BIT_PLATFORM?= yes
86.else 89.else
87IS_64BIT_PLATFORM?= no 90IS_64BIT_PLATFORM?= no
88.endif 91.endif
89 92
@@ -168,23 +171,29 @@ SUBST_FILES.sslbase= setup.py @@ -168,23 +171,29 @@ SUBST_FILES.sslbase= setup.py
168SUBST_VARS.sslbase= SSLBASE 171SUBST_VARS.sslbase= SSLBASE
169 172
170post-extract: 173post-extract:
171 ${LN} -s ${WRKSRC}/Lib/smtpd.py ${WRKSRC}/Tools/scripts/smtpd${PY_VER_SUFFIX}.py 174 ${LN} -s ${WRKSRC}/Lib/smtpd.py ${WRKSRC}/Tools/scripts/smtpd${PY_VER_SUFFIX}.py
172 ${MV} ${WRKSRC}/Tools/scripts/pydoc ${WRKSRC}/Tools/scripts/pydoc${PY_VER_SUFFIX} 175 ${MV} ${WRKSRC}/Tools/scripts/pydoc ${WRKSRC}/Tools/scripts/pydoc${PY_VER_SUFFIX}
173 ${MV} ${WRKSRC}/Tools/scripts/2to3 ${WRKSRC}/Tools/scripts/2to3-${PY_VER_SUFFIX} 176 ${MV} ${WRKSRC}/Tools/scripts/2to3 ${WRKSRC}/Tools/scripts/2to3-${PY_VER_SUFFIX}
174 177
175.if ${OPSYS} == "HPUX" 178.if ${OPSYS} == "HPUX"
176post-install: 179post-install:
177 ${LN} -fs ${DESTDIR}${PREFIX}/lib/libpython2.7.sl \ 180 ${LN} -fs ${DESTDIR}${PREFIX}/lib/libpython2.7.sl \
178 ${DESTDIR}${PREFIX}/lib/libpython2.7.sl.1.0 181 ${DESTDIR}${PREFIX}/lib/libpython2.7.sl.1.0
179.endif 182.endif
180 183
 184.if ${OS_VARIANT} == "SCOOSR5"
 185# SCO OpenServer 5.0.7/3.2 has no socklen_t in system headers, but has in
 186# GNU pth's header. It should be used in this case.
 187CONFIGURE_ENV+= ac_cv_type_socklen_t=yes
 188.endif
 189
181BUILDLINK_DEPMETHOD.readline= build 190BUILDLINK_DEPMETHOD.readline= build
182 191
183.include "../../archivers/bzip2/buildlink3.mk" 192.include "../../archivers/bzip2/buildlink3.mk"
184.include "../../devel/gettext-lib/buildlink3.mk" 193.include "../../devel/gettext-lib/buildlink3.mk"
185.include "../../devel/libffi/buildlink3.mk" 194.include "../../devel/libffi/buildlink3.mk"
186.include "../../devel/readline/buildlink3.mk" 195.include "../../devel/readline/buildlink3.mk"
187.include "../../devel/zlib/buildlink3.mk" 196.include "../../devel/zlib/buildlink3.mk"
188.include "../../security/openssl/buildlink3.mk" 197.include "../../security/openssl/buildlink3.mk"
189.include "../../mk/dlopen.buildlink3.mk" 198.include "../../mk/dlopen.buildlink3.mk"
190.include "../../mk/bsd.pkg.mk" 199.include "../../mk/bsd.pkg.mk"
cvs diff -r1.44 -r1.45 pkgsrc/lang/python27/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/python27/distinfo 2014/07/02 09:53:16 1.44
+++ pkgsrc/lang/python27/distinfo 2014/07/17 15:26:49 1.45
@@ -1,32 +1,37 @@ @@ -1,32 +1,37 @@
1$NetBSD: distinfo,v 1.44 2014/07/02 09:53:16 adam Exp $ 1$NetBSD: distinfo,v 1.45 2014/07/17 15:26:49 ryoon Exp $
2 2
3SHA1 (Python-2.7.8.tar.xz) = 9c6281eeace0c3646fa556c8087bb1b7e033c9c4 3SHA1 (Python-2.7.8.tar.xz) = 9c6281eeace0c3646fa556c8087bb1b7e033c9c4
4RMD160 (Python-2.7.8.tar.xz) = 04d7d55ea65074a9b419e5d0920414e54691d907 4RMD160 (Python-2.7.8.tar.xz) = 04d7d55ea65074a9b419e5d0920414e54691d907
5Size (Python-2.7.8.tar.xz) = 10525244 bytes 5Size (Python-2.7.8.tar.xz) = 10525244 bytes
6SHA1 (patch-Include_node.h) = 673d148b625711ac47e4bfeb0f5b0d5b31f94d7e 6SHA1 (patch-Include_node.h) = 673d148b625711ac47e4bfeb0f5b0d5b31f94d7e
7SHA1 (patch-Include_pyerrors.h) = 3eba043c83b1d1df4918524f7b53047a6ed372ae 7SHA1 (patch-Include_pyerrors.h) = 3eba043c83b1d1df4918524f7b53047a6ed372ae
8SHA1 (patch-Include_pyport.h) = 971c7c548b92595712d0d70a0917a0ccc83b6c7e 8SHA1 (patch-Include_pyport.h) = 971c7c548b92595712d0d70a0917a0ccc83b6c7e
9SHA1 (patch-Lib_distutils_unixccompiler.py) = 39b967dc2ae648143d5841f22602a21063b4d5ea 9SHA1 (patch-Lib_distutils_unixccompiler.py) = 39b967dc2ae648143d5841f22602a21063b4d5ea
 10SHA1 (patch-Lib_multiprocessing_process.py) = b47ad4cbeddbcfb4342c08c84d0d515a793815d4
10SHA1 (patch-Lib_poplib.py) = 5d7f64b028abd2fd43651f27a7f2ce7efe5b0859 11SHA1 (patch-Lib_poplib.py) = 5d7f64b028abd2fd43651f27a7f2ce7efe5b0859
11SHA1 (patch-Lib_smtplib.py) = f1118bbc53b4e292eb9a28ef3ef10eb4aa553bc3 12SHA1 (patch-Lib_smtplib.py) = f1118bbc53b4e292eb9a28ef3ef10eb4aa553bc3
12SHA1 (patch-Lib_test_test__poplib.py) = 1bdef76b687d042272e35c08521d4244d2c7fbe1 13SHA1 (patch-Lib_test_test__poplib.py) = 1bdef76b687d042272e35c08521d4244d2c7fbe1
13SHA1 (patch-Lib_test_test_smtplib.py) = 9e8a7f826c7d0f493746718b49fc27ac97c2cbb1 14SHA1 (patch-Lib_test_test_smtplib.py) = 9e8a7f826c7d0f493746718b49fc27ac97c2cbb1
14SHA1 (patch-Misc_NEWS) = c9171e10227567750db8e11881aca305cd8c3a42 15SHA1 (patch-Misc_NEWS) = c9171e10227567750db8e11881aca305cd8c3a42
15SHA1 (patch-Modules___ssl.c) = aaddaea5bcd6c84d3d896c7c37f710933b8228bc 16SHA1 (patch-Modules___ssl.c) = aaddaea5bcd6c84d3d896c7c37f710933b8228bc
 17SHA1 (patch-Modules_getaddrinfo.c) = 696c58c4c4bbb710fb1508d7d88864d0b08cfc79
16SHA1 (patch-Modules_getpath.c) = f68b38eb90f974b67ceab3922ce7f92eb77f25c3 18SHA1 (patch-Modules_getpath.c) = f68b38eb90f974b67ceab3922ce7f92eb77f25c3
 19SHA1 (patch-Modules_mmapmodule.c) = 87ea76e6d8263045c1ca794ff5c75ed631a74b6d
 20SHA1 (patch-Modules_posixmodule.c) = b8960592611499202bb5ff8521d619e0637177b6
 21SHA1 (patch-Modules_socketmodule.c) = 960ce4af2a142c471c707de446f2d390044bbc13
17SHA1 (patch-aa) = 990e4025bb6a37715e1f5df1831499f0ab08acfa 22SHA1 (patch-aa) = 990e4025bb6a37715e1f5df1831499f0ab08acfa
18SHA1 (patch-ab) = 0d0ae9802dfe3b85659adb16793affd8c4ffce43 23SHA1 (patch-ab) = 0d0ae9802dfe3b85659adb16793affd8c4ffce43
19SHA1 (patch-ad) = de730b9f5a5efb56afa8bed05824b5f6579242ec 24SHA1 (patch-ad) = de730b9f5a5efb56afa8bed05824b5f6579242ec
20SHA1 (patch-ae) = ff6d8c6164fe3c6dc4fb33d88eb8a49d5c5442f6 25SHA1 (patch-ae) = ff6d8c6164fe3c6dc4fb33d88eb8a49d5c5442f6
21SHA1 (patch-ah) = ae3ce0656d890ca34292920bf0185f94ba847139 26SHA1 (patch-ah) = ae3ce0656d890ca34292920bf0185f94ba847139
22SHA1 (patch-al) = d07699c6987da69fca911a15ab8011a82e43143d 27SHA1 (patch-al) = 43457e0749366e65bc139d0905ca95c6d6d79ecf
23SHA1 (patch-am) = 366ce0b130cc9b6d6c5354769da05bb4b5845e01 28SHA1 (patch-am) = 366ce0b130cc9b6d6c5354769da05bb4b5845e01
24SHA1 (patch-an) = 6098fbf0fc31422196cc40d3a227934523db11ca 29SHA1 (patch-an) = 6098fbf0fc31422196cc40d3a227934523db11ca
25SHA1 (patch-ao) = 3a1cd2b255340fd23fc1fce8680e692581ffcec1 30SHA1 (patch-ao) = 3a1cd2b255340fd23fc1fce8680e692581ffcec1
26SHA1 (patch-au) = 2a2a988ac92553d17eb898870d1adb3c30a59b66 31SHA1 (patch-au) = 2a2a988ac92553d17eb898870d1adb3c30a59b66
27SHA1 (patch-av) = a14eaf4d5db6fc3b79ed896fbfcc34ca98051af2 32SHA1 (patch-av) = a14eaf4d5db6fc3b79ed896fbfcc34ca98051af2
28SHA1 (patch-aw) = 15652e241f371a22c7300f46771825ea74514fa0 33SHA1 (patch-aw) = 15652e241f371a22c7300f46771825ea74514fa0
29SHA1 (patch-ax) = be7498a37a89c86d278d07c38666237215308498 34SHA1 (patch-ax) = be7498a37a89c86d278d07c38666237215308498
30SHA1 (patch-az) = 56a3adedfc87cbbb0307ccb4b452665f79bde582 35SHA1 (patch-az) = 56a3adedfc87cbbb0307ccb4b452665f79bde582
31SHA1 (patch-pyconfig.h.in) = c4544178ecceffb6ed911df39d3a64bff665cb34 36SHA1 (patch-pyconfig.h.in) = c4544178ecceffb6ed911df39d3a64bff665cb34
32SHA1 (patch-xa) = 25f02b03f1c5534e1d839a5489d5a046071f32c0 37SHA1 (patch-xa) = 25f02b03f1c5534e1d839a5489d5a046071f32c0
File Added: pkgsrc/lang/python27/patches/patch-Lib_multiprocessing_process.py
$NetBSD: patch-Lib_multiprocessing_process.py,v 1.1 2014/07/17 15:26:49 ryoon Exp $

--- Lib/multiprocessing/process.py.orig	2014-06-30 02:05:29.000000000 +0000
+++ Lib/multiprocessing/process.py
@@ -306,7 +306,15 @@ class _MainProcess(Process):
         self._popen = None
         self._counter = itertools.count(1)
         self._children = set()
-        self._authkey = AuthenticationString(os.urandom(32))
+        # Get randomness from urandom or the 'random' module.
+        # from http://bugs.python.org/issue6645
+        # for SCO OpenServer 5.0.7/3.2 and AIX
+        try:
+            self._authkey = AuthenticationString(os.urandom(32))
+        except:
+            import random
+            bytes = [chr(random.randrange(256)) for i in range(32)]
+            self._authkey = AuthenticationString(bytes)
         self._tempdir = None
 
 _current_process = _MainProcess()
File Added: pkgsrc/lang/python27/patches/patch-Modules_getaddrinfo.c
$NetBSD: patch-Modules_getaddrinfo.c,v 1.1 2014/07/17 15:26:49 ryoon Exp $

--- Modules/getaddrinfo.c.orig	2014-06-30 02:05:43.000000000 +0000
+++ Modules/getaddrinfo.c
@@ -66,6 +66,15 @@
 #define YES 1
 #define NO  0
 
+/* SCO OpenServer 5.0.7/3.2's sys/reg.h defines ERR. */
+#if defined(ERR)
+#undef ERR
+#endif
+
+# if defined(_SCO_DS)
+typedef int socklen_t;
+#endif
+
 #ifdef FAITH
 static int translate = NO;
 static struct in6_addr faith_prefix = IN6ADDR_GAI_ANY_INIT;
File Added: pkgsrc/lang/python27/patches/Attic/patch-Modules_mmapmodule.c
$NetBSD: patch-Modules_mmapmodule.c,v 1.1 2014/07/17 15:26:49 ryoon Exp $

--- Modules/mmapmodule.c.orig	2014-06-30 02:05:43.000000000 +0000
+++ Modules/mmapmodule.c
@@ -23,7 +23,7 @@
 
 #ifndef MS_WINDOWS
 #define UNIX
-# ifdef __APPLE__
+# if defined(__APPLE__) || defined(_SCO_DS)
 #  include <fcntl.h>
 # endif
 #endif
File Added: pkgsrc/lang/python27/patches/patch-Modules_posixmodule.c
$NetBSD: patch-Modules_posixmodule.c,v 1.1 2014/07/17 15:26:49 ryoon Exp $

--- Modules/posixmodule.c.orig	2014-06-30 02:05:43.000000000 +0000
+++ Modules/posixmodule.c
@@ -317,6 +317,10 @@ extern int lstat(const char *, struct st
 #define PARSE_PID "i"
 #define PyLong_FromPid PyInt_FromLong
 #define PyLong_AsPid PyInt_AsLong
+#elif SIZEOF_PID_T == SIZEOF_SHORT
+#define PARSE_PID "i"
+#define PyLong_FromPid PyInt_FromLong
+#define PyLong_AsPid PyInt_AsLong
 #elif SIZEOF_PID_T == SIZEOF_LONG
 #define PARSE_PID "l"
 #define PyLong_FromPid PyInt_FromLong
File Added: pkgsrc/lang/python27/patches/patch-Modules_socketmodule.c
$NetBSD: patch-Modules_socketmodule.c,v 1.4 2014/07/17 15:26:49 ryoon Exp $

--- Modules/socketmodule.c.orig	2014-06-30 02:05:43.000000000 +0000
+++ Modules/socketmodule.c
@@ -244,7 +244,7 @@ shutdown(how) -- shut down traffic in on
 /* Irix 6.5 fails to define this variable at all. This is needed
    for both GCC and SGI's compiler. I'd say that the SGI headers
    are just busted. Same thing for Solaris. */
-#if (defined(__sgi) || defined(sun)) && !defined(INET_ADDRSTRLEN)
+#if (defined(__sgi) || defined(sun) || defined(_SCO_DS)) && !defined(INET_ADDRSTRLEN)
 #define INET_ADDRSTRLEN 16
 #endif
cvs diff -r1.13 -r1.14 pkgsrc/lang/python27/patches/Attic/patch-al (expand / switch to unified diff)

--- pkgsrc/lang/python27/patches/Attic/patch-al 2014/07/02 09:53:16 1.13
+++ pkgsrc/lang/python27/patches/Attic/patch-al 2014/07/17 15:26:49 1.14
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-al,v 1.13 2014/07/02 09:53:16 adam Exp $ 1$NetBSD: patch-al,v 1.14 2014/07/17 15:26:49 ryoon Exp $
2 2
3- recognize MirBSD, Interix 3- recognize MirBSD, Interix
4- remove special-case library version hack for FreeBSD 4- remove special-case library version hack for FreeBSD
5- don't set Mac OS X target version: stick to the current one 5- don't set Mac OS X target version: stick to the current one
6- honor pkgsrc LDFLAGS 6- honor pkgsrc LDFLAGS
7- other stuff not previously commented (XXX) 7- other stuff not previously commented (XXX)
8 8
9--- configure.orig 2014-06-30 02:05:48.000000000 +0000 9--- configure.orig 2014-06-30 02:05:48.000000000 +0000
10+++ configure 10+++ configure
11@@ -3252,7 +3252,7 @@ case $ac_sys_system/$ac_sys_release in 11@@ -3252,7 +3252,7 @@ case $ac_sys_system/$ac_sys_release in
12 # Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish. 12 # Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish.
13 # In addition, Stefan Krah confirms that issue #1244610 exists through 13 # In addition, Stefan Krah confirms that issue #1244610 exists through
14 # OpenBSD 4.6, but is fixed in 4.7. 14 # OpenBSD 4.6, but is fixed in 4.7.
@@ -24,98 +24,115 @@ $NetBSD: patch-al,v 1.13 2014/07/02 09:5 @@ -24,98 +24,115 @@ $NetBSD: patch-al,v 1.13 2014/07/02 09:5
24- Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*) 24- Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*)
25+ Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*|Interix*|MirBSD*) 25+ Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*|Interix*|MirBSD*)
26 LDLIBRARY='libpython$(VERSION).so' 26 LDLIBRARY='libpython$(VERSION).so'
27 BLDLIBRARY='-L. -lpython$(VERSION)' 27 BLDLIBRARY='-L. -lpython$(VERSION)'
28 RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} 28 RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
29- case $ac_sys_system in 29- case $ac_sys_system in
30- FreeBSD*) 30- FreeBSD*)
31- SOVERSION=`echo $SOVERSION|cut -d "." -f 1` 31- SOVERSION=`echo $SOVERSION|cut -d "." -f 1`
32- ;; 32- ;;
33- esac 33- esac
34 INSTSONAME="$LDLIBRARY".$SOVERSION 34 INSTSONAME="$LDLIBRARY".$SOVERSION
35 ;; 35 ;;
36 hp*|HP*) 36 hp*|HP*)
37@@ -6050,8 +6045,7 @@ $as_echo "$CC" >&6; } 37@@ -5393,6 +5388,11 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>
 38 LDLIBRARY='libpython$(VERSION).so'
 39 RUNSHARED=LIBPATH=`pwd`${LIBPATH:+:${LIBPATH}}
 40 ;;
 41+ SCO_SV*)
 42+ LDLIBRARY='libpython$(VERSION).so'
 43+ RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
 44+ INSTSONAME="$LDLIBRARY".$SOVERSION
 45+ ;;
 46
 47 esac
 48 else # shared is disabled
 49@@ -6050,8 +6050,7 @@ $as_echo "$CC" >&6; }
38 cur_target_minor=`sw_vers -productVersion | \ 50 cur_target_minor=`sw_vers -productVersion | \
39 sed 's/\([0-9]*\)\.\([0-9]*\).*/\2/'` 51 sed 's/\([0-9]*\)\.\([0-9]*\).*/\2/'`
40 cur_target="${cur_target_major}.${cur_target_minor}" 52 cur_target="${cur_target_major}.${cur_target_minor}"
41- if test ${cur_target_major} -eq 10 && \ 53- if test ${cur_target_major} -eq 10 && \
42- test ${cur_target_minor} -ge 3 54- test ${cur_target_minor} -ge 3
43+ if false 55+ if test false
44 then 56 then
45 cur_target=10.3 57 cur_target=10.3
46 if test ${enable_universalsdk}; then 58 if test ${enable_universalsdk}; then
47@@ -8209,9 +8203,9 @@ then 59@@ -8209,9 +8208,9 @@ then
48 LDCXXSHARED="$LDCXXSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)' 60 LDCXXSHARED="$LDCXXSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
49 else 61 else
50 # No framework, use the Python app as bundle-loader 62 # No framework, use the Python app as bundle-loader
51- BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)' 63- BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)'
52- LDSHARED="$LDSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)' 64- LDSHARED="$LDSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
53- LDCXXSHARED="$LDCXXSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)' 65- LDCXXSHARED="$LDCXXSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
54+ BLDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BUILDPYTHON)' 66+ BLDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BUILDPYTHON)'
55+ LDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BINDIR)/python$(VERSION)$(EXE)' 67+ DSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
56+ LDCXXSHARED="$LDCXXSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BINDIR)/python$(VERSION)$(EXE)' 68+ LDCXXSHARED="$LDCXXSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
57 fi ;; 69 fi ;;
58 Darwin/*) 70 Darwin/*)
59 # Use -undefined dynamic_lookup whenever possible (10.3 and later). 71 # Use -undefined dynamic_lookup whenever possible (10.3 and later).
60@@ -8234,9 +8228,9 @@ then 72@@ -8234,9 +8233,9 @@ then
61 LDCXXSHARED="$LDCXXSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)' 73 LDCXXSHARED="$LDCXXSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
62 else 74 else
63 # No framework, use the Python app as bundle-loader 75 # No framework, use the Python app as bundle-loader
64- BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)' 76- BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)'
65- LDSHARED="$LDSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)' 77- LDSHARED="$LDSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
66- LDCXXSHARED="$LDCXXSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)' 78- LDCXXSHARED="$LDCXXSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
67+ BLDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BUILDPYTHON)' 79+ BLDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BUILDPYTHON)'
68+ LDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BINDIR)/python$(VERSION)$(EXE)' 80+ LDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
69+ LDCXXSHARED="$LDCXXSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BINDIR)/python$(VERSION)$(EXE)' 81+ LDCXXSHARED="$LDCXXSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
70 fi 82 fi
71 else 83 else
72 # building for OS X 10.3 and later 84 # building for OS X 10.3 and later
73@@ -8250,7 +8244,7 @@ then 85@@ -8250,7 +8249,7 @@ then
74 ;; 86 ;;
75 Linux*|GNU*|QNX*) 87 Linux*|GNU*|QNX*)
76 LDSHARED='$(CC) -shared' 88 LDSHARED='$(CC) -shared'
77- LDCXXSHARED='$(CXX) -shared';; 89- LDCXXSHARED='$(CXX) -shared';;
78+ LDCXXSHARED='$(CXX) -shared'" ${LDFLAGS}";; 90+ LDCXXSHARED='$(CXX) -shared'" ${LDFLAGS}";;
79 BSD/OS*/4*) 91 BSD/OS*/4*)
80 LDSHARED="gcc -shared" 92 LDSHARED="gcc -shared"
81 LDCXXSHARED="g++ -shared";; 93 LDCXXSHARED="g++ -shared";;
82@@ -8278,9 +8272,15 @@ then 94@@ -8278,6 +8277,9 @@ then
83 ;; 95 ;;
84 esac 96 esac
85 fi;; 97 fi;;
86+ MirBSD*) 98+ MirBSD*)
87+ LDSHARED='$(CC) -shared $(CCSHARED)' 99+ LDSHARED='$(CC) -shared $(CCSHARED)'
88+ LDCXXSHARED='$(CXX) -shared $(CCSHARED)';; 100+ LDCXXSHARED='$(CXX) -shared $(CCSHARED)';;
89 NetBSD*|DragonFly*) 101 NetBSD*|DragonFly*)
90 LDSHARED='$(CC) -shared' 102 LDSHARED='$(CC) -shared'
91 LDCXXSHARED='$(CXX) -shared';; 103 LDCXXSHARED='$(CXX) -shared';;
92+ Interix*) 104@@ -8324,7 +8326,8 @@ then
93+ LDSHARED='$(CC) -shared'" ${LDFLAGS}" 
94+ LDCXXSHARED='$(CXX) -shared'" ${LDFLAGS}";; # XXX tv needs image-base hack 
95 OpenUNIX*|UnixWare*) 
96 if test "$GCC" = "yes" ; then 
97 LDSHARED='$(CC) -shared' 
98@@ -8324,7 +8324,8 @@ then 
99 fi;; 105 fi;;
100 Linux*|GNU*) CCSHARED="-fPIC";; 106 Linux*|GNU*) CCSHARED="-fPIC";;
101 BSD/OS*/4*) CCSHARED="-fpic";; 107 BSD/OS*/4*) CCSHARED="-fpic";;
102- FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";; 108- FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";;
103+ FreeBSD*|NetBSD*|OpenBSD*|MirBSD*|DragonFly*) CCSHARED="-fPIC";; 109+ FreeBSD*|NetBSD*|OpenBSD*|MirBSD*|DragonFly*) CCSHARED="-fPIC";;
104+ Interix*) CCSHARED="";; 110+ Interix*) CCSHARED="";;
105 OpenUNIX*|UnixWare*) 111 OpenUNIX*|UnixWare*)
106 if test "$GCC" = "yes" 112 if test "$GCC" = "yes"
107 then CCSHARED="-fPIC" 113 then CCSHARED="-fPIC"
108@@ -8376,11 +8377,12 @@ then 114@@ -8376,11 +8379,12 @@ then
109 OpenUNIX*|UnixWare*) LINKFORSHARED="-Wl,-Bexport";; 115 OpenUNIX*|UnixWare*) LINKFORSHARED="-Wl,-Bexport";;
110 SCO_SV*) LINKFORSHARED="-Wl,-Bexport";; 116 SCO_SV*) LINKFORSHARED="-Wl,-Bexport";;
111 ReliantUNIX*) LINKFORSHARED="-W1 -Blargedynsym";; 117 ReliantUNIX*) LINKFORSHARED="-W1 -Blargedynsym";;
112- FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) 118- FreeBSD*|NetBSD*|OpenBSD*|DragonFly*)
113+ FreeBSD*|NetBSD*|OpenBSD*|MirBSD*|DragonFly*) 119+ FreeBSD*|NetBSD*|OpenBSD*|MirBSD*|DragonFly*)
114 if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ] 120 if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
115 then 121 then
116 LINKFORSHARED="-Wl,--export-dynamic" 122 LINKFORSHARED="-Wl,--export-dynamic"
117 fi;; 123 fi;;
118+ Interix*) LINKFORSHARED="-Wl,-E";; 124+ Interix*) LINKFORSHARED="-Wl,-E";;
119 SunOS/5*) case $CC in 125 SunOS/5*) case $CC in
120 *gcc*) 126 *gcc*)
121 if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null 127 if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null
 128@@ -10370,6 +10374,10 @@ int
 129 main ()
 130 {
 131 int x=kqueue()
 132+/* SCO OpenServer 5.0.7/3.2 has not kqueue, but detected as yes. */
 133+#if defined(_SCO_DS)
 134+#error no kqueue
 135+#endif
 136 ;
 137 return 0;
 138 }