Python3: Fix config stuff

This commit is contained in:
Alexpux
2014-03-18 09:56:36 +04:00
parent a774cb2411
commit 676f77e17f
2 changed files with 17 additions and 18 deletions

View File

@@ -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