[packages/python3.git] / python3-ac_fixes.patch

--- Python-2.5b2/configure.in.orig	2006-07-06 11:13:35.000000000 +0100
+++ Python-2.5b2/configure.in	2006-07-12 16:30:30.000000000 +0100
@@ -753,13 +753,13 @@
 	    if test "$Py_DEBUG" = 'true' ; then
 		# Optimization messes up debuggers, so turn it off for
 		# debug builds.
-		OPT="-g -Wall $STRICT_PROTO"
+		OPT="-g $CPPFLAGS $CFLAGS -Wall $STRICT_PROTO"
 	    else
-		OPT="-g $WRAP -O3 -Wall $STRICT_PROTO"
+		OPT="-g $WRAP $CPPFLAGS $CFLAGS -Wall $STRICT_PROTO"
 	    fi
 	    ;;
 	*)
-	    OPT="-O3 -Wall $STRICT_PROTO"
+	    OPT="$CPPFLAGS $CFLAGS -Wall $STRICT_PROTO"
 	    ;;
 	esac
 	case $ac_sys_system in
--- Python-2.5c1.orig/Makefile.pre.in	2006-07-30 17:20:10.000000000 +0100
+++ Python-2.5c1/Makefile.pre.in	2006-08-25 17:51:05.000000000 +0100
@@ -852,7 +852,7 @@
 	$(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh
 	# Substitution happens here, as the completely-expanded BINDIR
 	# is not available in configure
-	sed -e "s,@EXENAME@,$(BINDIR)/python$(VERSION)$(EXE)," < $(srcdir)/Misc/python-config.in >python-config
+	sed -e "s,@EXENAME@,$(BINDIR)/python$(EXE)," < $(srcdir)/Misc/python-config.in >python-config
 	$(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(VERSION)-config
 	rm python-config
 	@if [ -s Modules/python.exp -a \
Commit	Line	Data
e684db95 AM	1	--- Python-2.5b2/configure.in.orig 2006-07-06 11:13:35.000000000 +0100
	2	+++ Python-2.5b2/configure.in 2006-07-12 16:30:30.000000000 +0100
	3	@@ -753,13 +753,13 @@
	4	if test "$Py_DEBUG" = 'true' ; then
	5	# Optimization messes up debuggers, so turn it off for
	6	# debug builds.
	7	- OPT="-g -Wall $STRICT_PROTO"
	8	+ OPT="-g $CPPFLAGS $CFLAGS -Wall $STRICT_PROTO"
	9	else
8c6dc2b8	10	- OPT="-g $WRAP -O3 -Wall $STRICT_PROTO"
8c6dc2b8	11	+ OPT="-g $WRAP $CPPFLAGS $CFLAGS -Wall $STRICT_PROTO"
e684db95 AM	12	fi
	13	;;
	14	*)
	15	- OPT="-O3 -Wall $STRICT_PROTO"
	16	+ OPT="$CPPFLAGS $CFLAGS -Wall $STRICT_PROTO"
	17	;;
	18	esac
	19	case $ac_sys_system in
	20	--- Python-2.5c1.orig/Makefile.pre.in 2006-07-30 17:20:10.000000000 +0100
	21	+++ Python-2.5c1/Makefile.pre.in 2006-08-25 17:51:05.000000000 +0100
	22	@@ -852,7 +852,7 @@
	23	$(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh
	24	# Substitution happens here, as the completely-expanded BINDIR
	25	# is not available in configure
	26	- sed -e "s,@EXENAME@,$(BINDIR)/python$(VERSION)$(EXE)," < $(srcdir)/Misc/python-config.in >python-config
	27	+ sed -e "s,@EXENAME@,$(BINDIR)/python$(EXE)," < $(srcdir)/Misc/python-config.in >python-config
	28	$(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(VERSION)-config
	29	rm python-config
	30	@if [ -s Modules/python.exp -a \