Befator-Inc-Firmen-Netzwerk/MINGW-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

python3: Update to 3.6.4

Browse Source
This commit is contained in:
Alexey Pavlov
2017-12-21 11:17:44 +03:00
parent 8c3577d623
commit 18dbeae777
7 changed files with 47 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
mingw-w64-python3/0500-add-python-config-sh.patch
View File

@@ -1,7 +1,7 @@
diff -Naur Python-3.5.2-orig/Misc/python-config.sh.in Python-3.5.2/Misc/python-config.sh.in
--- Python-3.5.2-orig/Misc/python-config.sh.in 2016-06-26 00:38:37.000000000 +0300
+++ Python-3.5.2/Misc/python-config.sh.in 2016-07-12 14:21:46.795800700 +0300
@@ -1,25 +1,37 @@
diff -Naur Python-3.6.4-orig/Misc/python-config.sh.in Python-3.6.4/Misc/python-config.sh.in
--- Python-3.6.4/Misc/python-config.sh.in.orig 2017-12-19 07:53:56.000000000 +0300
+++ Python-3.6.4/Misc/python-config.sh.in 2017-12-21 09:54:11.491534800 +0300
@@ -1,32 +1,44 @@
#!/bin/sh
-# Keep this script in sync with python-config.in
@@ -48,17 +48,15 @@ diff -Naur Python-3.5.2-orig/Misc/python-config.sh.in Python-3.5.2/Misc/python-c
fi
echo $RESULT
}
@@ -27,8 +39,7 @@
prefix_build="@prefix@"
prefix_real=$(installed_prefix "$0")
-# Use sed to fix paths from their built-to locations to their installed-to
-# locations.
+# Use sed to fix paths from their built to locations to their installed to locations.
prefix=$(echo "$prefix_build" | sed "s#$prefix_build#$prefix_real#")
exec_prefix_build="@exec_prefix@"
exec_prefix=$(echo "$exec_prefix_build" | sed "s#$exec_prefix_build#$prefix_real#")
@@ -40,13 +51,17 @@
+# Use sed to fix paths from their built-to locations to their installed to
# locations. Keep prefix & exec_prefix using their original values in case
# they are referenced in other configure variables, to prevent double
# substitution, issue #22140.
@@ -41,13 +53,17 @@
LIBC="@LIBC@"
SYSLIBS="$LIBM $LIBC"
ABIFLAGS="@ABIFLAGS@"
@@ -75,10 +73,10 @@ diff -Naur Python-3.5.2-orig/Misc/python-config.sh.in Python-3.5.2/Misc/python-c
LDVERSION="@LDVERSION@"
+LDLIBRARY="@LDLIBRARY@"
+LINKFORSHARED="@LINKFORSHARED@"
LIBDEST=${prefix}/lib/python${VERSION}
LIBPL=$(echo "@LIBPL@" | sed "s#$prefix_build#$prefix_real#")
LIBDEST=${prefix_real}/lib/python${VERSION}
LIBPL=$(echo "@LIBPL@" | sed "s#$prefix#$prefix_real#")
SO="@EXT_SUFFIX@"
@@ -59,33 +74,33 @@
@@ -60,33 +76,33 @@
do
case $ARG in
--help)
@@ -95,33 +93,33 @@ diff -Naur Python-3.5.2-orig/Misc/python-config.sh.in Python-3.5.2/Misc/python-c
done
-for ARG in "$@"
+for ARG in $*
+for ARG in "$*"
do
- case "$ARG" in
+ case $ARG in
--prefix)
- echo "$prefix"
+ echo -ne "$prefix"
- echo "$prefix_real"
+ echo -ne "$prefix_real"
;;
--exec-prefix)
- echo "$exec_prefix"
+ echo -ne "$exec_prefix "
- echo "$exec_prefix_real"
+ echo -ne "$exec_prefix_real "
;;
--includes)
- echo "$INCDIR $PLATINCDIR"
+ echo -ne "$INCDIR "
+ echo -ne "$INCDIR $PLATINCDIR"
;;
--cflags)
- echo "$INCDIR $PLATINCDIR $BASECFLAGS $CFLAGS $OPT"
+ echo -ne "$INCDIR $BASECFLAGS $CFLAGS $OPT "
+ echo -ne "$INCDIR $PLATINCDIR $BASECFLAGS $CFLAGS $OPT"
;;
--libs)
- echo "$LIBS"
+ echo -ne "$LIBS "
+ echo -ne "$LIBS"
;;
--ldflags)
LINKFORSHAREDUSED=
@@ -96,16 +111,16 @@
@@ -97,16 +113,16 @@
if [ "$PY_ENABLE_SHARED" = "0" ] ; then
LIBPLUSED="-L$LIBPL"
fi