157 lines
5.5 KiB
Plaintext
157 lines
5.5 KiB
Plaintext
$NetBSD: patch-configure,v 1.3 2015/04/24 03:24:32 rodent Exp $
|
|
|
|
Add support for MirBSD and Interix.
|
|
Don't make SO-ABI-dependent shared lib names on Linux.
|
|
Don't trim the library name on FreeBSD.
|
|
|
|
--- configure.orig 2014-10-12 07:03:54.000000000 +0000
|
|
+++ configure
|
|
@@ -3340,7 +3340,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
|
|
@@ -5602,15 +5602,10 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>
|
|
PY3LIBRARY=libpython3.so
|
|
fi
|
|
;;
|
|
- Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*)
|
|
+ Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*|MirBSD*)
|
|
LDLIBRARY='libpython$(LDVERSION).so'
|
|
BLDLIBRARY='-L. -lpython$(LDVERSION)'
|
|
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
|
|
if test "$with_pydebug" != yes
|
|
then
|
|
@@ -8473,8 +8468,8 @@ 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)'
|
|
+ BLDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BUILDPYTHON)'
|
|
+ LDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
|
|
LDCXXSHARED="$LDCXXSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
|
|
fi ;;
|
|
Darwin/*)
|
|
@@ -8499,9 +8494,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
|
|
fi
|
|
;;
|
|
@@ -8535,9 +8530,15 @@ then
|
|
;;
|
|
esac
|
|
fi;;
|
|
+ MirBSD*)
|
|
+ LDSHARED='$(CC) -shared $(CCSHARED)'
|
|
+ LDCXXSHARED='$(CXX) -shared $(CCSHARED)';;
|
|
NetBSD*|DragonFly*)
|
|
LDSHARED='$(CC) -shared'
|
|
LDCXXSHARED='$(CXX) -shared';;
|
|
+ Interix*) # XXX tv need image-base hack
|
|
+ LDSHARED='$(CC) -shared'
|
|
+ LDCXXSHARED='$(CXX) -shared';;
|
|
OpenUNIX*|UnixWare*)
|
|
if test "$GCC" = "yes" ; then
|
|
LDSHARED='$(CC) -shared'
|
|
@@ -8578,7 +8579,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"
|
|
@@ -8621,11 +8623,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
|
|
@@ -8823,6 +8826,48 @@ _ACEOF
|
|
|
|
fi
|
|
# Dynamic linking for HP-UX
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for RAND_egd in -lcrypto" >&5
|
|
+$as_echo_n "checking for RAND_egd in -lcrypto... " >&6; }
|
|
+if ${ac_cv_lib_crypto_RAND_egd+:} false; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
+else
|
|
+ ac_check_lib_save_LIBS=$LIBS
|
|
+LIBS="-lcrypto $LIBS"
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
+/* end confdefs.h. */
|
|
+
|
|
+/* Override any GCC internal prototype to avoid an error.
|
|
+ Use char because int might match the return type of a GCC
|
|
+ builtin and then its argument prototype would still apply. */
|
|
+#ifdef __cplusplus
|
|
+extern "C"
|
|
+#endif
|
|
+char RAND_egd ();
|
|
+int
|
|
+main ()
|
|
+{
|
|
+return RAND_egd ();
|
|
+ ;
|
|
+ return 0;
|
|
+}
|
|
+_ACEOF
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
+ ac_cv_lib_crypto_RAND_egd=yes
|
|
+else
|
|
+ ac_cv_lib_crypto_RAND_egd=no
|
|
+fi
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
+LIBS=$ac_check_lib_save_LIBS
|
|
+fi
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_RAND_egd" >&5
|
|
+$as_echo "$ac_cv_lib_crypto_RAND_egd" >&6; }
|
|
+if test "x$ac_cv_lib_crypto_RAND_egd" = xyes; then :
|
|
+
|
|
+$as_echo "#define HAVE_RAND_EGD 1" >>confdefs.h
|
|
+
|
|
+fi
|
|
+
|
|
|
|
# only check for sem_init if thread support is requested
|
|
if test "$with_threads" = "yes" -o -z "$with_threads"; then
|
|
@@ -13766,8 +13811,6 @@ $as_echo "$SOABI" >&6; }
|
|
|
|
|
|
case $ac_sys_system in
|
|
- Linux*|GNU*)
|
|
- EXT_SUFFIX=.${SOABI}${SHLIB_SUFFIX};;
|
|
*)
|
|
EXT_SUFFIX=${SHLIB_SUFFIX};;
|
|
esac
|