diff options
author | adam <adam@pkgsrc.org> | 2014-06-02 06:12:03 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2014-06-02 06:12:03 +0000 |
commit | 9194599d661a77d9c3064b21d04d39e1855f4a2b (patch) | |
tree | 344c4c14b60467b897821c779c170c107aec9d9c /lang/python27 | |
parent | 54c33e74fc05c95e63a7b8b895df9da9005a7453 (diff) | |
download | pkgsrc-9194599d661a77d9c3064b21d04d39e1855f4a2b.tar.gz |
Changes 2.7.7:
This is a regularly scheduled 2.7 series bugfix and includes numerous bugfixes (http://hg.python.org/cpython/raw-file/f89216059edf/Misc/NEWS) over 2.7.6.
Diffstat (limited to 'lang/python27')
-rw-r--r-- | lang/python27/Makefile | 3 | ||||
-rw-r--r-- | lang/python27/PLIST.common | 79 | ||||
-rw-r--r-- | lang/python27/dist.mk | 4 | ||||
-rw-r--r-- | lang/python27/distinfo | 12 | ||||
-rw-r--r-- | lang/python27/patches/patch-Modules_readline.c | 44 | ||||
-rw-r--r-- | lang/python27/patches/patch-Modules_socketmodule.c | 19 | ||||
-rw-r--r-- | lang/python27/patches/patch-al | 24 |
7 files changed, 98 insertions, 87 deletions
diff --git a/lang/python27/Makefile b/lang/python27/Makefile index 5740de92225..2f89596fba8 100644 --- a/lang/python27/Makefile +++ b/lang/python27/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.40 2014/04/13 15:06:20 bsiegert Exp $ +# $NetBSD: Makefile,v 1.41 2014/06/02 06:12:03 adam Exp $ .include "dist.mk" PKGNAME= python27-${PY_DISTVERSION} -PKGREVISION= 3 CATEGORIES= lang python MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/lang/python27/PLIST.common b/lang/python27/PLIST.common index 77ea62672ed..f18e963d505 100644 --- a/lang/python27/PLIST.common +++ b/lang/python27/PLIST.common @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.common,v 1.9 2014/03/12 12:40:57 obache Exp $ +@comment $NetBSD: PLIST.common,v 1.10 2014/06/02 06:12:03 adam Exp $ bin/2to3-${PY_VER_SUFFIX} bin/pydoc${PY_VER_SUFFIX} bin/python${PY_VER_SUFFIX} @@ -1565,6 +1565,13 @@ lib/python${PY_VER_SUFFIX}/idlelib/IOBinding.pyc lib/python${PY_VER_SUFFIX}/idlelib/IOBinding.pyo lib/python${PY_VER_SUFFIX}/idlelib/Icons/folder.gif lib/python${PY_VER_SUFFIX}/idlelib/Icons/idle.icns +lib/python${PY_VER_SUFFIX}/idlelib/Icons/idle.ico +lib/python${PY_VER_SUFFIX}/idlelib/Icons/idle_16.gif +lib/python${PY_VER_SUFFIX}/idlelib/Icons/idle_16.png +lib/python${PY_VER_SUFFIX}/idlelib/Icons/idle_32.gif +lib/python${PY_VER_SUFFIX}/idlelib/Icons/idle_32.png +lib/python${PY_VER_SUFFIX}/idlelib/Icons/idle_48.gif +lib/python${PY_VER_SUFFIX}/idlelib/Icons/idle_48.png lib/python${PY_VER_SUFFIX}/idlelib/Icons/minusnode.gif lib/python${PY_VER_SUFFIX}/idlelib/Icons/openfolder.gif lib/python${PY_VER_SUFFIX}/idlelib/Icons/plusnode.gif @@ -1683,6 +1690,52 @@ lib/python${PY_VER_SUFFIX}/idlelib/idle.py lib/python${PY_VER_SUFFIX}/idlelib/idle.pyc lib/python${PY_VER_SUFFIX}/idlelib/idle.pyo lib/python${PY_VER_SUFFIX}/idlelib/idle.pyw +lib/python${PY_VER_SUFFIX}/idlelib/idle_test/README.txt +lib/python${PY_VER_SUFFIX}/idlelib/idle_test/__init__.py +lib/python${PY_VER_SUFFIX}/idlelib/idle_test/__init__.pyc +lib/python${PY_VER_SUFFIX}/idlelib/idle_test/__init__.pyo +lib/python${PY_VER_SUFFIX}/idlelib/idle_test/htest.py +lib/python${PY_VER_SUFFIX}/idlelib/idle_test/htest.pyc +lib/python${PY_VER_SUFFIX}/idlelib/idle_test/htest.pyo +lib/python${PY_VER_SUFFIX}/idlelib/idle_test/mock_idle.py +lib/python${PY_VER_SUFFIX}/idlelib/idle_test/mock_idle.pyc +lib/python${PY_VER_SUFFIX}/idlelib/idle_test/mock_idle.pyo +lib/python${PY_VER_SUFFIX}/idlelib/idle_test/mock_tk.py +lib/python${PY_VER_SUFFIX}/idlelib/idle_test/mock_tk.pyc +lib/python${PY_VER_SUFFIX}/idlelib/idle_test/mock_tk.pyo +lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_calltips.py +lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_calltips.pyc +lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_calltips.pyo +lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_config_name.py +lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_config_name.pyc +lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_config_name.pyo +lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_delegator.py +lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_delegator.pyc +lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_delegator.pyo +lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_formatparagraph.py +lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_formatparagraph.pyc +lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_formatparagraph.pyo +lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_grep.py +lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_grep.pyc +lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_grep.pyo +lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_idlehistory.py +lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_idlehistory.pyc +lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_idlehistory.pyo +lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_pathbrowser.py +lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_pathbrowser.pyc +lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_pathbrowser.pyo +lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_rstrip.py +lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_rstrip.pyc +lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_rstrip.pyo +lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_searchengine.py +lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_searchengine.pyc +lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_searchengine.pyo +lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_text.py +lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_text.pyc +lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_text.pyo +lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_warning.py +lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_warning.pyc +lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_warning.pyo lib/python${PY_VER_SUFFIX}/idlelib/idlever.py lib/python${PY_VER_SUFFIX}/idlelib/idlever.pyc lib/python${PY_VER_SUFFIX}/idlelib/idlever.pyo @@ -1901,6 +1954,12 @@ lib/python${PY_VER_SUFFIX}/lib-tk/test/test_tkinter/test_loadtk.pyo lib/python${PY_VER_SUFFIX}/lib-tk/test/test_tkinter/test_text.py lib/python${PY_VER_SUFFIX}/lib-tk/test/test_tkinter/test_text.pyc lib/python${PY_VER_SUFFIX}/lib-tk/test/test_tkinter/test_text.pyo +lib/python${PY_VER_SUFFIX}/lib-tk/test/test_tkinter/test_variables.py +lib/python${PY_VER_SUFFIX}/lib-tk/test/test_tkinter/test_variables.pyc +lib/python${PY_VER_SUFFIX}/lib-tk/test/test_tkinter/test_variables.pyo +lib/python${PY_VER_SUFFIX}/lib-tk/test/test_tkinter/test_widgets.py +lib/python${PY_VER_SUFFIX}/lib-tk/test/test_tkinter/test_widgets.pyc +lib/python${PY_VER_SUFFIX}/lib-tk/test/test_tkinter/test_widgets.pyo lib/python${PY_VER_SUFFIX}/lib-tk/test/test_ttk/__init__.py lib/python${PY_VER_SUFFIX}/lib-tk/test/test_ttk/__init__.pyc lib/python${PY_VER_SUFFIX}/lib-tk/test/test_ttk/__init__.pyo @@ -1919,6 +1978,9 @@ lib/python${PY_VER_SUFFIX}/lib-tk/test/test_ttk/test_style.pyo lib/python${PY_VER_SUFFIX}/lib-tk/test/test_ttk/test_widgets.py lib/python${PY_VER_SUFFIX}/lib-tk/test/test_ttk/test_widgets.pyc lib/python${PY_VER_SUFFIX}/lib-tk/test/test_ttk/test_widgets.pyo +lib/python${PY_VER_SUFFIX}/lib-tk/test/widget_tests.py +lib/python${PY_VER_SUFFIX}/lib-tk/test/widget_tests.pyc +lib/python${PY_VER_SUFFIX}/lib-tk/test/widget_tests.pyo lib/python${PY_VER_SUFFIX}/lib-tk/tkColorChooser.py lib/python${PY_VER_SUFFIX}/lib-tk/tkColorChooser.pyc lib/python${PY_VER_SUFFIX}/lib-tk/tkColorChooser.pyo @@ -2594,6 +2656,7 @@ lib/python${PY_VER_SUFFIX}/test/autotest.pyc lib/python${PY_VER_SUFFIX}/test/autotest.pyo lib/python${PY_VER_SUFFIX}/test/bad_coding.py lib/python${PY_VER_SUFFIX}/test/bad_coding2.py +lib/python${PY_VER_SUFFIX}/test/bad_coding3.py lib/python${PY_VER_SUFFIX}/test/badcert.pem lib/python${PY_VER_SUFFIX}/test/badkey.pem lib/python${PY_VER_SUFFIX}/test/badsyntax_future3.py @@ -2806,6 +2869,17 @@ lib/python${PY_VER_SUFFIX}/test/gdb_sample.pyo lib/python${PY_VER_SUFFIX}/test/greyrgb.uue lib/python${PY_VER_SUFFIX}/test/https_svn_python_org_root.pem lib/python${PY_VER_SUFFIX}/test/ieee754.txt +lib/python${PY_VER_SUFFIX}/test/imghdrdata/python.bmp +lib/python${PY_VER_SUFFIX}/test/imghdrdata/python.gif +lib/python${PY_VER_SUFFIX}/test/imghdrdata/python.jpg +lib/python${PY_VER_SUFFIX}/test/imghdrdata/python.pbm +lib/python${PY_VER_SUFFIX}/test/imghdrdata/python.pgm +lib/python${PY_VER_SUFFIX}/test/imghdrdata/python.png +lib/python${PY_VER_SUFFIX}/test/imghdrdata/python.ppm +lib/python${PY_VER_SUFFIX}/test/imghdrdata/python.ras +lib/python${PY_VER_SUFFIX}/test/imghdrdata/python.sgi +lib/python${PY_VER_SUFFIX}/test/imghdrdata/python.tiff +lib/python${PY_VER_SUFFIX}/test/imghdrdata/python.xbm lib/python${PY_VER_SUFFIX}/test/infinite_reload.py lib/python${PY_VER_SUFFIX}/test/infinite_reload.pyc lib/python${PY_VER_SUFFIX}/test/infinite_reload.pyo @@ -3430,6 +3504,9 @@ lib/python${PY_VER_SUFFIX}/test/test_imaplib.pyo lib/python${PY_VER_SUFFIX}/test/test_imgfile.py lib/python${PY_VER_SUFFIX}/test/test_imgfile.pyc lib/python${PY_VER_SUFFIX}/test/test_imgfile.pyo +lib/python${PY_VER_SUFFIX}/test/test_imghdr.py +lib/python${PY_VER_SUFFIX}/test/test_imghdr.pyc +lib/python${PY_VER_SUFFIX}/test/test_imghdr.pyo lib/python${PY_VER_SUFFIX}/test/test_imp.py lib/python${PY_VER_SUFFIX}/test/test_imp.pyc lib/python${PY_VER_SUFFIX}/test/test_imp.pyo diff --git a/lang/python27/dist.mk b/lang/python27/dist.mk index 09363592516..aae659f9a1c 100644 --- a/lang/python27/dist.mk +++ b/lang/python27/dist.mk @@ -1,6 +1,6 @@ -# $NetBSD: dist.mk,v 1.6 2013/11/12 18:57:25 adam Exp $ +# $NetBSD: dist.mk,v 1.7 2014/06/02 06:12:03 adam Exp $ -PY_DISTVERSION= 2.7.6 +PY_DISTVERSION= 2.7.7 DISTNAME= Python-${PY_DISTVERSION} EXTRACT_SUFX= .tar.xz DISTINFO_FILE= ${.CURDIR}/../../lang/python27/distinfo diff --git a/lang/python27/distinfo b/lang/python27/distinfo index 5bcf8055a35..586ad0494a2 100644 --- a/lang/python27/distinfo +++ b/lang/python27/distinfo @@ -1,21 +1,19 @@ -$NetBSD: distinfo,v 1.39 2014/05/21 00:31:07 obache Exp $ +$NetBSD: distinfo,v 1.40 2014/06/02 06:12:03 adam Exp $ -SHA1 (Python-2.7.6.tar.xz) = 8321636af2acbeaa68fc635d7dda7369ed446a80 -RMD160 (Python-2.7.6.tar.xz) = 8efc73a01a466d8fa16c5c1734c89be79c2c538a -Size (Python-2.7.6.tar.xz) = 10431288 bytes +SHA1 (Python-2.7.7.tar.xz) = 5f82557cac5abf18d1df6f8bb2029aa335b321f4 +RMD160 (Python-2.7.7.tar.xz) = 988da9490e8d66a2456accdce5dbe9ba875d5a18 +Size (Python-2.7.7.tar.xz) = 10496500 bytes SHA1 (patch-Include_node.h) = 673d148b625711ac47e4bfeb0f5b0d5b31f94d7e SHA1 (patch-Include_pyerrors.h) = 3eba043c83b1d1df4918524f7b53047a6ed372ae SHA1 (patch-Lib_distutils_unixccompiler.py) = 39b967dc2ae648143d5841f22602a21063b4d5ea SHA1 (patch-Modules___ssl.c) = aaddaea5bcd6c84d3d896c7c37f710933b8228bc SHA1 (patch-Modules_getpath.c) = f68b38eb90f974b67ceab3922ce7f92eb77f25c3 -SHA1 (patch-Modules_readline.c) = 0afcbd1c8bdf3648177bed760e6cccf54c857451 -SHA1 (patch-Modules_socketmodule.c) = a8a4da9381a9485f7e999ae7db4aa715adfacfa5 SHA1 (patch-aa) = 990e4025bb6a37715e1f5df1831499f0ab08acfa SHA1 (patch-ab) = 0d0ae9802dfe3b85659adb16793affd8c4ffce43 SHA1 (patch-ad) = de730b9f5a5efb56afa8bed05824b5f6579242ec SHA1 (patch-ae) = ff6d8c6164fe3c6dc4fb33d88eb8a49d5c5442f6 SHA1 (patch-ah) = ae3ce0656d890ca34292920bf0185f94ba847139 -SHA1 (patch-al) = dd8bed847f797b97df1a9ad7ffe17645b0f08925 +SHA1 (patch-al) = cd73fa968177a6e99737f2f6b095c1cb2da1b8b0 SHA1 (patch-am) = 366ce0b130cc9b6d6c5354769da05bb4b5845e01 SHA1 (patch-an) = 6098fbf0fc31422196cc40d3a227934523db11ca SHA1 (patch-ao) = 3a1cd2b255340fd23fc1fce8680e692581ffcec1 diff --git a/lang/python27/patches/patch-Modules_readline.c b/lang/python27/patches/patch-Modules_readline.c deleted file mode 100644 index b42c8fd9351..00000000000 --- a/lang/python27/patches/patch-Modules_readline.c +++ /dev/null @@ -1,44 +0,0 @@ -$NetBSD: patch-Modules_readline.c,v 1.2 2014/03/27 06:26:24 obache Exp $ - -* fixes for readline-6.3 - http://bugs.python.org/issue20374 - ---- Modules/readline.c.orig 2013-11-10 07:36:41.000000000 +0000 -+++ Modules/readline.c -@@ -750,7 +750,11 @@ on_hook(PyObject *func) - } - - static int -+#if defined(_RL_FUNCTION_TYPEDEF) - on_startup_hook(void) -+#else -+on_startup_hook() -+#endif - { - return on_hook(startup_hook); - } -@@ -852,7 +856,7 @@ on_completion(const char *text, int stat - * before calling the normal completer */ - - static char ** --flex_complete(char *text, int start, int end) -+flex_complete(const char *text, int start, int end) - { - #ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER - rl_completion_append_character ='\0'; -@@ -911,12 +915,12 @@ setup_readline(void) - rl_bind_key_in_map ('\t', rl_complete, emacs_meta_keymap); - rl_bind_key_in_map ('\033', rl_complete, emacs_meta_keymap); - /* Set our hook functions */ -- rl_startup_hook = (Function *)on_startup_hook; -+ rl_startup_hook = on_startup_hook; - #ifdef HAVE_RL_PRE_INPUT_HOOK -- rl_pre_input_hook = (Function *)on_pre_input_hook; -+ rl_pre_input_hook = on_pre_input_hook; - #endif - /* Set our completion function */ -- rl_attempted_completion_function = (CPPFunction *)flex_complete; -+ rl_attempted_completion_function = flex_complete; - /* Set Python word break characters */ - completer_word_break_characters = - rl_completer_word_break_characters = diff --git a/lang/python27/patches/patch-Modules_socketmodule.c b/lang/python27/patches/patch-Modules_socketmodule.c deleted file mode 100644 index 546681abfad..00000000000 --- a/lang/python27/patches/patch-Modules_socketmodule.c +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-Modules_socketmodule.c,v 1.2 2014/05/10 08:38:04 obache Exp $ - -Fix CVE-2014-1912. Patch taken from here: - -http://hg.python.org/cpython/rev/87673659d8f7 - ---- Modules/socketmodule.c.orig 2013-11-10 07:36:41.000000000 +0000 -+++ Modules/socketmodule.c 2014-02-09 08:41:25.000000000 +0000 -@@ -2742,6 +2742,10 @@ - if (recvlen == 0) { - /* If nbytes was not specified, use the buffer's length */ - recvlen = buflen; -+ } else if (recvlen > buflen) { -+ PyErr_SetString(PyExc_ValueError, -+ "nbytes is greater than the length of the buffer"); -+ goto error; - } - - readlen = sock_recvfrom_guts(s, buf.buf, recvlen, flags, &addr); diff --git a/lang/python27/patches/patch-al b/lang/python27/patches/patch-al index 02fb2ddb171..8f00e3bab6a 100644 --- a/lang/python27/patches/patch-al +++ b/lang/python27/patches/patch-al @@ -1,4 +1,4 @@ -$NetBSD: patch-al,v 1.11 2013/09/13 13:18:20 adam Exp $ +$NetBSD: patch-al,v 1.12 2014/06/02 06:12:03 adam Exp $ - recognize MirBSD, Interix - remove special-case library version hack for FreeBSD @@ -6,9 +6,9 @@ $NetBSD: patch-al,v 1.11 2013/09/13 13:18:20 adam Exp $ - honor pkgsrc LDFLAGS - other stuff not previously commented (XXX) ---- configure.orig 2013-04-06 14:02:41.000000000 +0000 +--- configure.orig 2014-05-31 18:58:40.000000000 +0000 +++ configure -@@ -3243,7 +3243,7 @@ case $ac_sys_system/$ac_sys_release in +@@ -3252,7 +3252,7 @@ case $ac_sys_system/$ac_sys_release in # Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish. # In addition, Stefan Krah confirms that issue #1244610 exists through # OpenBSD 4.6, but is fixed in 4.7. @@ -17,15 +17,15 @@ $NetBSD: patch-al,v 1.11 2013/09/13 13:18:20 adam Exp $ define_xopen_source=no # OpenBSD undoes our definition of __BSD_VISIBLE if _XOPEN_SOURCE is # also defined. This can be overridden by defining _BSD_SOURCE -@@ -5342,15 +5342,10 @@ $as_echo "#define Py_ENABLE_SHARED 1" >> - RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} +@@ -5351,15 +5351,10 @@ $as_echo "#define Py_ENABLE_SHARED 1" >> + RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} INSTSONAME="$LDLIBRARY".$SOVERSION ;; - Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*) + Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*|Interix*|MirBSD*) LDLIBRARY='libpython$(VERSION).so' BLDLIBRARY='-L. -lpython$(VERSION)' - RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} + RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} - case $ac_sys_system in - FreeBSD*) - SOVERSION=`echo $SOVERSION|cut -d "." -f 1` @@ -34,7 +34,7 @@ $NetBSD: patch-al,v 1.11 2013/09/13 13:18:20 adam Exp $ INSTSONAME="$LDLIBRARY".$SOVERSION ;; hp*|HP*) -@@ -6037,7 +6032,7 @@ $as_echo "$CC" >&6; } +@@ -6046,7 +6041,7 @@ $as_echo "$CC" >&6; } # Calculate the right deployment target for this build. # cur_target=`sw_vers -productVersion | sed 's/\(10\.[0-9]*\).*/\1/'` @@ -43,7 +43,7 @@ $NetBSD: patch-al,v 1.11 2013/09/13 13:18:20 adam Exp $ cur_target=10.3 if test ${enable_universalsdk}; then if test "${UNIVERSAL_ARCHS}" = "all"; then -@@ -8214,9 +8209,9 @@ then +@@ -8203,9 +8198,9 @@ then LDCXXSHARED="$LDCXXSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)' else # No framework, use the Python app as bundle-loader @@ -56,7 +56,7 @@ $NetBSD: patch-al,v 1.11 2013/09/13 13:18:20 adam Exp $ fi ;; Darwin/*) # Use -undefined dynamic_lookup whenever possible (10.3 and later). -@@ -8240,15 +8235,15 @@ then +@@ -8229,15 +8224,15 @@ then LDCXXSHARED="$LDCXXSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)' else # No framework, use the Python app as bundle-loader @@ -76,7 +76,7 @@ $NetBSD: patch-al,v 1.11 2013/09/13 13:18:20 adam Exp $ BSD/OS*/4*) LDSHARED="gcc -shared" LDCXXSHARED="g++ -shared";; -@@ -8276,9 +8271,15 @@ then +@@ -8265,9 +8260,15 @@ then ;; esac fi;; @@ -92,7 +92,7 @@ $NetBSD: patch-al,v 1.11 2013/09/13 13:18:20 adam Exp $ OpenUNIX*|UnixWare*) if test "$GCC" = "yes" ; then LDSHARED='$(CC) -shared' -@@ -8322,7 +8323,8 @@ then +@@ -8311,7 +8312,8 @@ then fi;; Linux*|GNU*) CCSHARED="-fPIC";; BSD/OS*/4*) CCSHARED="-fpic";; @@ -102,7 +102,7 @@ $NetBSD: patch-al,v 1.11 2013/09/13 13:18:20 adam Exp $ OpenUNIX*|UnixWare*) if test "$GCC" = "yes" then CCSHARED="-fPIC" -@@ -8374,11 +8376,12 @@ then +@@ -8363,11 +8365,12 @@ then OpenUNIX*|UnixWare*) LINKFORSHARED="-Wl,-Bexport";; SCO_SV*) LINKFORSHARED="-Wl,-Bexport";; ReliantUNIX*) LINKFORSHARED="-W1 -Blargedynsym";; |