ef04a1530c
patch-al: Remove hunk that shouldn't ever appear in patches (as pkglint warns). distinfo: regen
92 lines
3.3 KiB
Text
92 lines
3.3 KiB
Text
$NetBSD: patch-al,v 1.3 2008/06/27 20:08:20 wiz Exp $
|
|
|
|
--- configure.orig 2008-02-13 13:17:17.000000000 -0600
|
|
+++ configure
|
|
@@ -2019,6 +2019,8 @@ _ACEOF
|
|
# Marc Recht
|
|
NetBSD/1.5 | NetBSD/1.5.* | NetBSD/1.6 | NetBSD/1.6.* | NetBSD/1.6A-S)
|
|
define_xopen_source=no;;
|
|
+ NetBSD/1.5 | NetBSD/1.5.* | NetBSD/1.6 | NetBSD/1.6.* | NetBSD/1.6[A-S])
|
|
+ define_xopen_source=no;;
|
|
# On Solaris 2.6, sys/wait.h is inconsistent in the usage
|
|
# of union __?sigval. Reported by Stuart Bishop.
|
|
SunOS/5.6)
|
|
@@ -4018,17 +4020,18 @@ _ACEOF
|
|
RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
|
|
INSTSONAME="$LDLIBRARY".$SOVERSION
|
|
;;
|
|
- Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*)
|
|
+ Linux*|GNU*|NetBSD*|FreeBSD*|Interix*|DragonFly*)
|
|
LDLIBRARY='libpython$(VERSION).so'
|
|
BLDLIBRARY='-L. -lpython$(VERSION)'
|
|
RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
|
|
- case $ac_sys_system in
|
|
- FreeBSD*)
|
|
- SOVERSION=`echo $SOVERSION|cut -d "." -f 1`
|
|
- ;;
|
|
- esac
|
|
INSTSONAME="$LDLIBRARY".$SOVERSION
|
|
;;
|
|
+ Darwin*)
|
|
+ LDLIBRARY='libpython$(VERSION).dylib'
|
|
+ BLDLIBRARY='-L. -lpython$(VERSION)'
|
|
+ RUNSHARED=DYLD_FALLBACK_LIBRARY_PATH=`pwd`:${DYLD_FALLBACK_LIBRARY_PATH}
|
|
+ INSTSONAME="$LDLIBRARY"
|
|
+ ;;
|
|
hp*|HP*)
|
|
case `uname -m` in
|
|
ia64)
|
|
@@ -4538,7 +4541,12 @@ echo "${ECHO_T}$ac_cv_no_strict_aliasing
|
|
;;
|
|
# is there any other compiler on Darwin besides gcc?
|
|
Darwin*)
|
|
- BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -mno-fused-madd"
|
|
+ if [[ `/usr/bin/arch` = 'ppc' ]]
|
|
+ then
|
|
+ BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -mno-fused-madd -fno-common"
|
|
+ else
|
|
+ BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -fno-common"
|
|
+ fi
|
|
if test "${enable_universalsdk}"; then
|
|
BASECFLAGS="-arch ppc -arch i386 -isysroot ${UNIVERSALSDK} ${BASECFLAGS}"
|
|
fi
|
|
@@ -11540,12 +11548,12 @@ then
|
|
LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
|
|
else
|
|
# No framework, use the Python app as bundle-loader
|
|
- BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)'
|
|
- LDSHARED="$LDSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
|
|
+ BLDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BUILDPYTHON)'
|
|
+ LDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
|
|
fi
|
|
fi
|
|
;;
|
|
- Linux*|GNU*) LDSHARED='$(CC) -shared';;
|
|
+ Linux*|GNU*) LDSHARED='$(CC) -shared'" ${LDFLAGS}";;
|
|
BSD/OS*/4*) LDSHARED="gcc -shared";;
|
|
FreeBSD*)
|
|
if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
|
|
@@ -11569,6 +11577,7 @@ then
|
|
esac
|
|
fi;;
|
|
NetBSD*|DragonFly*) LDSHARED="cc -shared ${LDFLAGS}";;
|
|
+ Interix*) LDSHARED='$(CC) -shared'" ${LDFLAGS}";; # XXX tv needs image-base hack
|
|
OpenUNIX*|UnixWare*)
|
|
if test "$GCC" = "yes"
|
|
then LDSHARED='$(CC) -shared'
|
|
@@ -11604,6 +11613,7 @@ then
|
|
Linux*|GNU*) CCSHARED="-fPIC";;
|
|
BSD/OS*/4*) CCSHARED="-fpic";;
|
|
FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";;
|
|
+ Interix*) CCSHARED="";;
|
|
OpenUNIX*|UnixWare*)
|
|
if test "$GCC" = "yes"
|
|
then CCSHARED="-fPIC"
|
|
@@ -11661,6 +11671,7 @@ then
|
|
then
|
|
LINKFORSHARED="-Wl,--export-dynamic"
|
|
fi;;
|
|
+ Interix*) LINKFORSHARED="-Wl,-E";;
|
|
SunOS/5*) case $CC in
|
|
*gcc*)
|
|
if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null
|