mirror of
https://github.com/Stichting-MINIX-Research-Foundation/pkgsrc-ng.git
synced 2025-08-04 10:18:09 -04:00
147 lines
5.5 KiB
Plaintext
147 lines
5.5 KiB
Plaintext
--- configure.orig Sun Nov 10 07:36:41 2013
|
|
+++ configure Fri Apr 18 17:50:36 2014
|
|
@@ -3252,7 +3252,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
|
|
@@ -5351,15 +5351,10 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>confdefs.h
|
|
RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
|
|
INSTSONAME="$LDLIBRARY".$SOVERSION
|
|
;;
|
|
- Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*)
|
|
+ Linux*|GNU*|Minix*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*|Interix*|MirBSD*)
|
|
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
|
|
;;
|
|
hp*|HP*)
|
|
@@ -6046,7 +6041,7 @@ $as_echo "$CC" >&6; }
|
|
# Calculate the right deployment target for this build.
|
|
#
|
|
cur_target=`sw_vers -productVersion | sed 's/\(10\.[0-9]*\).*/\1/'`
|
|
- if test ${cur_target} '>' 10.2; then
|
|
+ if false; then
|
|
cur_target=10.3
|
|
if test ${enable_universalsdk}; then
|
|
if test "${UNIVERSAL_ARCHS}" = "all"; then
|
|
@@ -8222,9 +8217,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).
|
|
@@ -8248,15 +8243,15 @@ 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
|
|
;;
|
|
Linux*|GNU*|QNX*)
|
|
LDSHARED='$(CC) -shared'
|
|
- LDCXXSHARED='$(CXX) -shared';;
|
|
+ LDCXXSHARED='$(CXX) -shared'" ${LDFLAGS}";;
|
|
BSD/OS*/4*)
|
|
LDSHARED="gcc -shared"
|
|
LDCXXSHARED="g++ -shared";;
|
|
@@ -8284,9 +8279,15 @@ then
|
|
;;
|
|
esac
|
|
fi;;
|
|
- NetBSD*|DragonFly*)
|
|
+ MirBSD*)
|
|
+ LDSHARED='$(CC) -shared $(CCSHARED)'
|
|
+ LDCXXSHARED='$(CXX) -shared $(CCSHARED)';;
|
|
+ Minix*|NetBSD*|DragonFly*)
|
|
LDSHARED='$(CC) -shared'
|
|
LDCXXSHARED='$(CXX) -shared';;
|
|
+ Interix*)
|
|
+ LDSHARED='$(CC) -shared'" ${LDFLAGS}"
|
|
+ LDCXXSHARED='$(CXX) -shared'" ${LDFLAGS}";; # XXX tv needs image-base hack
|
|
OpenUNIX*|UnixWare*)
|
|
if test "$GCC" = "yes" ; then
|
|
LDSHARED='$(CC) -shared'
|
|
@@ -8330,7 +8331,8 @@ then
|
|
fi;;
|
|
Linux*|GNU*) CCSHARED="-fPIC";;
|
|
BSD/OS*/4*) CCSHARED="-fpic";;
|
|
- FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";;
|
|
+ FreeBSD*|Minix*|NetBSD*|OpenBSD*|MirBSD*|DragonFly*) CCSHARED="-fPIC";;
|
|
+ Interix*) CCSHARED="";;
|
|
OpenUNIX*|UnixWare*)
|
|
if test "$GCC" = "yes"
|
|
then CCSHARED="-fPIC"
|
|
@@ -8382,11 +8384,12 @@ then
|
|
OpenUNIX*|UnixWare*) LINKFORSHARED="-Wl,-Bexport";;
|
|
SCO_SV*) LINKFORSHARED="-Wl,-Bexport";;
|
|
ReliantUNIX*) LINKFORSHARED="-W1 -Blargedynsym";;
|
|
- FreeBSD*|NetBSD*|OpenBSD*|DragonFly*)
|
|
+ FreeBSD*|Minix*|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
|
|
@@ -10355,34 +10358,6 @@
|
|
if ac_fn_c_try_compile "$LINENO"; then :
|
|
|
|
$as_echo "#define HAVE_EPOLL 1" >>confdefs.h
|
|
-
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
-$as_echo "yes" >&6; }
|
|
-else
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
-$as_echo "no" >&6; }
|
|
-
|
|
-fi
|
|
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for kqueue" >&5
|
|
-$as_echo_n "checking for kqueue... " >&6; }
|
|
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
-/* end confdefs.h. */
|
|
-
|
|
-#include <sys/types.h>
|
|
-#include <sys/event.h>
|
|
-
|
|
-int
|
|
-main ()
|
|
-{
|
|
-int x=kqueue()
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
-_ACEOF
|
|
-if ac_fn_c_try_compile "$LINENO"; then :
|
|
-
|
|
-$as_echo "#define HAVE_KQUEUE 1" >>confdefs.h
|
|
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
$as_echo "yes" >&6; }
|