From 676f77e17f3eeae724579961bcc9fdc447a13dba Mon Sep 17 00:00:00 2001
From: Alexpux <alexey.pawlow@gmail.com>
Date: Tue, 18 Mar 2014 09:56:36 +0400
Subject: [PATCH] Python3: Fix config stuff

---
 .../0500-add-python-config-sh.patch           | 24 +++++++++----------
 mingw-w64-python3/PKGBUILD                    | 11 +++++----
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/mingw-w64-python3/0500-add-python-config-sh.patch b/mingw-w64-python3/0500-add-python-config-sh.patch
index bcec2a01de..799c4ec6e3 100644
--- a/mingw-w64-python3/0500-add-python-config-sh.patch
+++ b/mingw-w64-python3/0500-add-python-config-sh.patch
@@ -1,14 +1,3 @@
-diff -Naur a/Makefile.pre.in b/Makefile.pre.in
---- a/Makefile.pre.in	2014-03-18 00:06:33.408200000 +0400
-+++ b/Makefile.pre.in	2014-03-18 00:07:09.647000000 +0400
-@@ -1347,6 +1347,7 @@
- 	$(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh
- 	$(INSTALL_SCRIPT) python-config.py $(DESTDIR)$(LIBPL)/python-config.py
- 	$(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(LDVERSION)-config
-+	$(INSTALL_SCRIPT) Misc/python-config.sh $(DESTDIR)$(BINDIR)/python$(LDVERSION)-config.sh
- 	@if [ -s Modules/python.exp -a \
- 		"`echo $(MACHDEP) | sed 's/^\(...\).*/\1/'`" = "aix" ]; then \
- 		echo; echo "Installing support files for building shared extension modules on AIX:"; \
 diff -Naur a/Misc/python-config.sh.in b/Misc/python-config.sh.in
 --- a/Misc/python-config.sh.in	2014-03-17 06:31:30.000000000 +0400
 +++ b/Misc/python-config.sh.in	2014-03-18 00:07:09.647000000 +0400
@@ -69,7 +58,7 @@ diff -Naur a/Misc/python-config.sh.in b/Misc/python-config.sh.in
  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,6 +51,10 @@
+@@ -40,13 +51,17 @@
  LIBC="@LIBC@"
  SYSLIBS="$LIBM $LIBC"
  ABIFLAGS="@ABIFLAGS@"
@@ -79,7 +68,16 @@ diff -Naur a/Misc/python-config.sh.in b/Misc/python-config.sh.in
 +fi
  LIBS="@LIBS@ $SYSLIBS -lpython${VERSION}${ABIFLAGS}"
  BASECFLAGS="@BASECFLAGS@"
- LDLIBRARY="@LDLIBRARY@"
+-LDLIBRARY="@LDLIBRARY@"
+-LINKFORSHARED="@LINKFORSHARED@"
+ OPT="@OPT@"
+ PY_ENABLE_SHARED="@PY_ENABLE_SHARED@"
+ LDVERSION="@LDVERSION@"
++LDLIBRARY="@LDLIBRARY@"
++LINKFORSHARED="@LINKFORSHARED@"
+ LIBDEST=${prefix}/lib/python${VERSION}
+ LIBPL=$(echo "@LIBPL@" | sed "s#$prefix_build#$prefix_real#")
+ SO="@SO@"
 @@ -59,33 +74,33 @@
  do
      case $ARG in
diff --git a/mingw-w64-python3/PKGBUILD b/mingw-w64-python3/PKGBUILD
index 8206edeacd..5e79e52fe1 100644
--- a/mingw-w64-python3/PKGBUILD
+++ b/mingw-w64-python3/PKGBUILD
@@ -273,7 +273,6 @@ package() {
 	MSYSTEM=MINGW \
 	MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
 	make install DESTDIR="$pkgdir"
-	#mv "${pkgdir}${MINGW_PREFIX}"/bin/smtpd.py "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/
 
 	rm "${pkgdir}${MINGW_PREFIX}"/bin/2to3
 	cp -f "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/config-${_pybasever}m/libpython${_pybasever}m.dll.a "${pkgdir}${MINGW_PREFIX}"/lib/libpython${_pybasever}m.dll.a
@@ -294,14 +293,16 @@ package() {
 		sed -e "s|${MINGW_PREFIX}/bin/python${_pybasever}.exe|/usr/bin/env python${_pybasever}.exe|g" -i "${pkgdir}${MINGW_PREFIX}"/bin/$fscripts
 	done
 	
-	sed -i "s|#!${pkgdir}${MINGW_PREFIX}/bin/python${_pybasever}m.exe|#!/usr/bin/env python${_pybasever}.exe|" "${pkgdir}${MINGW_PREFIX}"/bin/python${_pybasever}-config
-	sed -i "s|#!${pkgdir}${MINGW_PREFIX}/bin/python${_pybasever}m.exe|#!/usr/bin/env python${_pybasever}.exe|" "${pkgdir}${MINGW_PREFIX}"/bin/python3-config
+	sed -i "s|#!${pkgdir}${MINGW_PREFIX}/bin/python${_pybasever}m.exe|#!/usr/bin/env python${_pybasever}.exe|" "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/config-${_pybasever}m/python-config.py
 
 	# fix permissons
 	find ${pkgdir}${MINGW_PREFIX} -type f \( -name "*.dll" -o -name "*.exe" \) | xargs chmod 0755
 
 	# Fix up two instances of MSYS2 paths in python-config.sh in-case the final consumer of the results are native executables.
-	sed -i "s|${MINGW_PREFIX}|${PREFIX_WIN}|" "${pkgdir}${MINGW_PREFIX}"/bin/python${_pybasever}m-config.sh
+	sed -e "s|${MINGW_PREFIX}|${PREFIX_WIN}|" \
+		-i "${pkgdir}${MINGW_PREFIX}"/bin/python${_pybasever}m-config \
+		-i "${pkgdir}${MINGW_PREFIX}"/bin/python${_pybasever}-config \
+		-i "${pkgdir}${MINGW_PREFIX}"/bin/python3-config
 
 	# replace paths in sysconfig
 	sed -i "s|${pkgdir}${MINGW_PREFIX}|${MINGW_PREFIX}|g" \
@@ -355,7 +356,7 @@ md5sums=('77c22725e14af3d71022cbfdebff4903'
          '42599deb4b9d17dee0e7dd69825f1ee8'
          'a62230c7e33437293f66756470af0f84'
          '96a83a59e3303fcdd2c31e8e0145cb13'
-         '46381090051650a0dbb44f1cf44bf2a8'
+         '9f1642aaea17a3db85601a516d562a55'
          '4c85b279c7a8533afea5ee3dc50b8b58'
          '00ba9836a283b90bc3d7d5c28de35285'
          '91f55b90a82f36adf35b1ce804bf3e61'