138 lines
5.2 KiB
Text
138 lines
5.2 KiB
Text
$NetBSD: patch-al,v 1.17 2015/05/24 07:44:07 adam Exp $
|
|
|
|
- recognize MirBSD, Interix
|
|
- remove special-case library version hack for FreeBSD
|
|
- don't set Mac OS X target version: stick to the current one
|
|
- honor pkgsrc LDFLAGS
|
|
- other stuff not previously commented (XXX)
|
|
|
|
--- configure.orig 2015-05-23 16:09:25.000000000 +0000
|
|
+++ configure
|
|
@@ -3271,7 +3271,7 @@ case $ac_sys_system/$ac_sys_release in
|
|
# Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish.
|
|
# In addition, Stefan Krah confirms that issue #1244610 exists through
|
|
# OpenBSD 4.6, but is fixed in 4.7.
|
|
- OpenBSD/2.* | OpenBSD/3.* | OpenBSD/4.[0123456])
|
|
+ OpenBSD/2.* | OpenBSD/3.* | OpenBSD/4.[0123456] | MirBSD/*)
|
|
define_xopen_source=no
|
|
# OpenBSD undoes our definition of __BSD_VISIBLE if _XOPEN_SOURCE is
|
|
# also defined. This can be overridden by defining _BSD_SOURCE
|
|
@@ -5373,15 +5373,10 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>
|
|
RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
|
|
INSTSONAME="$LDLIBRARY".$SOVERSION
|
|
;;
|
|
- Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*)
|
|
+ Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*|Interix*|MirBSD*)
|
|
LDLIBRARY='libpython$(VERSION).so'
|
|
BLDLIBRARY='-L. -lpython$(VERSION)'
|
|
RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
|
|
- case $ac_sys_system in
|
|
- FreeBSD*)
|
|
- SOVERSION=`echo $SOVERSION|cut -d "." -f 1`
|
|
- ;;
|
|
- esac
|
|
INSTSONAME="$LDLIBRARY".$SOVERSION
|
|
;;
|
|
hp*|HP*)
|
|
@@ -5415,6 +5410,11 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>
|
|
LDLIBRARY='libpython$(VERSION).so'
|
|
RUNSHARED=LIBPATH=`pwd`${LIBPATH:+:${LIBPATH}}
|
|
;;
|
|
+ SCO_SV*)
|
|
+ LDLIBRARY='libpython$(VERSION).so'
|
|
+ RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
|
|
+ INSTSONAME="$LDLIBRARY".$SOVERSION
|
|
+ ;;
|
|
|
|
esac
|
|
else # shared is disabled
|
|
@@ -6072,8 +6072,7 @@ $as_echo "$CC" >&6; }
|
|
cur_target_minor=`sw_vers -productVersion | \
|
|
sed 's/\([0-9]*\)\.\([0-9]*\).*/\2/'`
|
|
cur_target="${cur_target_major}.${cur_target_minor}"
|
|
- if test ${cur_target_major} -eq 10 && \
|
|
- test ${cur_target_minor} -ge 3
|
|
+ if false
|
|
then
|
|
cur_target=10.3
|
|
if test ${enable_universalsdk}; then
|
|
@@ -8231,9 +8230,9 @@ then
|
|
LDCXXSHARED="$LDCXXSHARED "'$(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)'
|
|
- LDCXXSHARED="$LDCXXSHARED "'-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)'
|
|
+ LDCXXSHARED="$LDCXXSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
|
|
fi ;;
|
|
Darwin/*)
|
|
# Use -undefined dynamic_lookup whenever possible (10.3 and later).
|
|
@@ -8256,9 +8255,9 @@ then
|
|
LDCXXSHARED="$LDCXXSHARED "'$(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)'
|
|
- LDCXXSHARED="$LDCXXSHARED "'-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)'
|
|
+ LDCXXSHARED="$LDCXXSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
|
|
fi
|
|
else
|
|
# building for OS X 10.3 and later
|
|
@@ -8272,7 +8271,7 @@ then
|
|
;;
|
|
Linux*|GNU*|QNX*)
|
|
LDSHARED='$(CC) -shared'
|
|
- LDCXXSHARED='$(CXX) -shared';;
|
|
+ LDCXXSHARED='$(CXX) -shared'" ${LDFLAGS}";;
|
|
BSD/OS*/4*)
|
|
LDSHARED="gcc -shared"
|
|
LDCXXSHARED="g++ -shared";;
|
|
@@ -8300,6 +8299,9 @@ then
|
|
;;
|
|
esac
|
|
fi;;
|
|
+ MirBSD*)
|
|
+ LDSHARED='$(CC) -shared $(CCSHARED)'
|
|
+ LDCXXSHARED='$(CXX) -shared $(CCSHARED)';;
|
|
NetBSD*|DragonFly*)
|
|
LDSHARED='$(CC) -shared'
|
|
LDCXXSHARED='$(CXX) -shared';;
|
|
@@ -8346,7 +8348,8 @@ then
|
|
fi;;
|
|
Linux*|GNU*) CCSHARED="-fPIC";;
|
|
BSD/OS*/4*) CCSHARED="-fpic";;
|
|
- FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";;
|
|
+ FreeBSD*|NetBSD*|OpenBSD*|MirBSD*|DragonFly*) CCSHARED="-fPIC";;
|
|
+ Interix*) CCSHARED="";;
|
|
OpenUNIX*|UnixWare*)
|
|
if test "$GCC" = "yes"
|
|
then CCSHARED="-fPIC"
|
|
@@ -8398,11 +8401,12 @@ then
|
|
OpenUNIX*|UnixWare*) LINKFORSHARED="-Wl,-Bexport";;
|
|
SCO_SV*) LINKFORSHARED="-Wl,-Bexport";;
|
|
ReliantUNIX*) LINKFORSHARED="-W1 -Blargedynsym";;
|
|
- FreeBSD*|NetBSD*|OpenBSD*|DragonFly*)
|
|
+ FreeBSD*|NetBSD*|OpenBSD*|MirBSD*|DragonFly*)
|
|
if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
|
|
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
|
|
@@ -10457,6 +10461,10 @@ int
|
|
main ()
|
|
{
|
|
int x=kqueue()
|
|
+/* SCO OpenServer 5.0.7/3.2 has not kqueue, but detected as yes. */
|
|
+#if defined(_SCO_DS)
|
|
+#error no kqueue
|
|
+#endif
|
|
;
|
|
return 0;
|
|
}
|