Wed Jan 25 21:40:24 2017 UTC ()
Fix packaging on NetBSD (and hopefully other platforms)

* Always include a platform string in a config directory name


(ryoon)
diff -r1.4 -r1.5 pkgsrc/lang/python36/distinfo
diff -r1.2 -r1.3 pkgsrc/lang/python36/patches/patch-configure
cvs diff -r1.4 -r1.5 pkgsrc/lang/python36/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/python36/Attic/distinfo 2017/01/25 19:35:49 1.4
+++ pkgsrc/lang/python36/Attic/distinfo 2017/01/25 21:40:24 1.5
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1$NetBSD: distinfo,v 1.4 2017/01/25 19:35:49 adam Exp $ 1$NetBSD: distinfo,v 1.5 2017/01/25 21:40:24 ryoon Exp $
2 2
3SHA1 (Python-3.6.0.tar.xz) = 18ebf7d726782967d967dc00e3aa08b334fbdd5c 3SHA1 (Python-3.6.0.tar.xz) = 18ebf7d726782967d967dc00e3aa08b334fbdd5c
4RMD160 (Python-3.6.0.tar.xz) = 984a38d1eec379ac8921479a86259ca0161734af 4RMD160 (Python-3.6.0.tar.xz) = 984a38d1eec379ac8921479a86259ca0161734af
5SHA512 (Python-3.6.0.tar.xz) = 9d06bee9172bc0bfd2d280fd1c27ea712f3258cfbfd2e2aeb734d0a6710998d5deeefc5d6e72251750dd9493d35461511ceaa187a29dea700ca238ff6ac1dbb2 5SHA512 (Python-3.6.0.tar.xz) = 9d06bee9172bc0bfd2d280fd1c27ea712f3258cfbfd2e2aeb734d0a6710998d5deeefc5d6e72251750dd9493d35461511ceaa187a29dea700ca238ff6ac1dbb2
6Size (Python-3.6.0.tar.xz) = 16805836 bytes 6Size (Python-3.6.0.tar.xz) = 16805836 bytes
7SHA1 (patch-Include_py__curses.h) = 14359f8d0527eff08073c0aea60dfe8961d9255d 7SHA1 (patch-Include_py__curses.h) = 14359f8d0527eff08073c0aea60dfe8961d9255d
8SHA1 (patch-Lib_distutils_command_install.py) = 6fc6f5d918b7581fc62cd0fe55857ee932c3a341 8SHA1 (patch-Lib_distutils_command_install.py) = 6fc6f5d918b7581fc62cd0fe55857ee932c3a341
9SHA1 (patch-Lib_distutils_sysconfig.py) = 23d8e9e63924e0b7be21355bd83d20eff25c9c21 9SHA1 (patch-Lib_distutils_sysconfig.py) = 23d8e9e63924e0b7be21355bd83d20eff25c9c21
10SHA1 (patch-Lib_distutils_unixccompiler.py) = e7aa684fa186de7a01486c3d8bfa177afdd22ef9 10SHA1 (patch-Lib_distutils_unixccompiler.py) = e7aa684fa186de7a01486c3d8bfa177afdd22ef9
11SHA1 (patch-Lib_sysconfig.py) = 81df54149caba826062fb78e68fdd4328ea98b2a 11SHA1 (patch-Lib_sysconfig.py) = 81df54149caba826062fb78e68fdd4328ea98b2a
12SHA1 (patch-Makefile.pre.in) = 99b33ba203eb2c9c626377f1bac03c723d467553 12SHA1 (patch-Makefile.pre.in) = 99b33ba203eb2c9c626377f1bac03c723d467553
13SHA1 (patch-Modules___cursesmodule.c) = 2ab2779e0418a4529987641c254686ba05d28593 13SHA1 (patch-Modules___cursesmodule.c) = 2ab2779e0418a4529987641c254686ba05d28593
14SHA1 (patch-Modules_makesetup) = a06786eebffadecedba5e3a50a9785fb47613567 14SHA1 (patch-Modules_makesetup) = a06786eebffadecedba5e3a50a9785fb47613567
15SHA1 (patch-Modules_nismodule.c) = 1bafe9b06359586d027a77011b103877590d947d 15SHA1 (patch-Modules_nismodule.c) = 1bafe9b06359586d027a77011b103877590d947d
16SHA1 (patch-Python_thread__pthread.h) = fb81eaa604b4ed7c1b64c3f4731d58a8aee257be 16SHA1 (patch-Python_thread__pthread.h) = fb81eaa604b4ed7c1b64c3f4731d58a8aee257be
17SHA1 (patch-configure) = 7bbebbb5716a0740035b5028434154d4d4ccfc88 17SHA1 (patch-configure) = 49ac8c326f6ff10f44d2be4bc5186ac85ad7f4d7
 18SHA1 (patch-configure.ac) = 2051bfa1b1fdabef79cc8825185b156ce6163889
18SHA1 (patch-setup.py) = f3fd3c3e5bc2e002dcee8239d153360a7247844b 19SHA1 (patch-setup.py) = f3fd3c3e5bc2e002dcee8239d153360a7247844b
cvs diff -r1.2 -r1.3 pkgsrc/lang/python36/patches/Attic/patch-configure (expand / switch to unified diff)

--- pkgsrc/lang/python36/patches/Attic/patch-configure 2017/01/25 19:35:49 1.2
+++ pkgsrc/lang/python36/patches/Attic/patch-configure 2017/01/25 21:40:24 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-configure,v 1.2 2017/01/25 19:35:49 adam Exp $ 1$NetBSD: patch-configure,v 1.3 2017/01/25 21:40:24 ryoon Exp $
2 2
3Simplify _sysconfigdata to include only platform name. 3Simplify _sysconfigdata to include only platform name.
4 4
5MirBSD support 5MirBSD support
6http://bugs.python.org/issue21458 6http://bugs.python.org/issue21458
7 7
8Changes for consistency across pkgsrc platforms. 8Changes for consistency across pkgsrc platforms.
9 9
10Fix linking on Darwin. 10Fix linking on Darwin.
11 11
12--- configure.orig 2016-12-23 02:21:22.000000000 +0000 12--- configure.orig 2016-12-23 02:21:22.000000000 +0000
13+++ configure 13+++ configure
14@@ -2928,7 +2928,7 @@ $as_echo_n "checking for python interpre 14@@ -2928,7 +2928,7 @@ $as_echo_n "checking for python interpre
@@ -89,13 +89,26 @@ Fix linking on Darwin. @@ -89,13 +89,26 @@ Fix linking on Darwin.
89+ FreeBSD*|NetBSD*|OpenBSD*|MirBSD*|DragonFly*) 89+ FreeBSD*|NetBSD*|OpenBSD*|MirBSD*|DragonFly*)
90 if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ] 90 if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
91 then 91 then
92 LINKFORSHARED="-Wl,--export-dynamic" 92 LINKFORSHARED="-Wl,--export-dynamic"
93@@ -14882,8 +14885,6 @@ $as_echo "$SOABI" >&6; } 93@@ -14882,8 +14885,6 @@ $as_echo "$SOABI" >&6; }
94  94
95  95
96 case $ac_sys_system in 96 case $ac_sys_system in
97- Linux*|GNU*|Darwin) 97- Linux*|GNU*|Darwin)
98- EXT_SUFFIX=.${SOABI}${SHLIB_SUFFIX};; 98- EXT_SUFFIX=.${SOABI}${SHLIB_SUFFIX};;
99 *) 99 *)
100 EXT_SUFFIX=${SHLIB_SUFFIX};; 100 EXT_SUFFIX=${SHLIB_SUFFIX};;
101 esac 101 esac
 102@@ -14895,11 +14896,7 @@ LDVERSION='$(VERSION)$(ABIFLAGS)'
 103 $as_echo "$LDVERSION" >&6; }
 104
 105
 106-if test x$PLATFORM_TRIPLET = x; then
 107- LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}"
 108-else
 109- LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}"
 110-fi
 111+LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}"
 112
 113
 114 # Check whether right shifting a negative integer extends the sign bit