summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.pre.in9
-rwxr-xr-xconfigure11
-rw-r--r--configure.in10
-rw-r--r--pyconfig.h.in3
4 files changed, 32 insertions, 1 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in
index 3a179f6..323f68d 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -166,6 +166,7 @@ DIST= $(DISTFILES) $(DISTDIRS)
LIBRARY= @LIBRARY@
LDLIBRARY= @LDLIBRARY@
BLDLIBRARY= @BLDLIBRARY@
+PY3LIBRARY= @PY3LIBRARY@
DLLLIBRARY= @DLLLIBRARY@
LDLIBRARYDIR= @LDLIBRARYDIR@
INSTSONAME= @INSTSONAME@
@@ -420,7 +421,7 @@ coverage:
# Build the interpreter
-$(BUILDPYTHON): Modules/python.o $(LIBRARY) $(LDLIBRARY)
+$(BUILDPYTHON): Modules/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
$(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Modules/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
platform: $(BUILDPYTHON)
@@ -454,6 +455,9 @@ libpython$(LDVERSION).so: $(LIBRARY_OBJS)
$(BLDSHARED) -o $@ $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
fi
+libpython3.so: libpython$(LDVERSION).so
+ $(BLDSHARED) -o $@ -Wl,-hl$@ $^
+
libpython$(VERSION).dylib: $(LIBRARY_OBJS)
$(CC) -dynamiclib -Wl,-single_module $(PY_LDFLAGS) -undefined dynamic_lookup -Wl,-install_name,$(prefix)/lib/libpython$(VERSION).dylib -Wl,-compatibility_version,$(VERSION) -Wl,-current_version,$(VERSION) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
@@ -851,6 +855,9 @@ altbininstall: $(BUILDPYTHON)
(cd $(DESTDIR)$(LIBDIR); $(LN) -sf $(INSTSONAME) $(LDLIBRARY)) \
fi \
fi; \
+ if test -n "$(PY3LIBRARY)"; then \
+ $(INSTALL_SHARED) $(PY3LIBRARY) $(DESTDIR)$(LIBDIR)/$(PY3LIBRARY); \
+ fi; \
else true; \
fi
diff --git a/configure b/configure
index 2846170..8d01bc1 100755
--- a/configure
+++ b/configure
@@ -647,6 +647,7 @@ LDVERSION
RUNSHARED
INSTSONAME
LDLIBRARYDIR
+PY3LIBRARY
BLDLIBRARY
DLLLIBRARY
LDLIBRARY
@@ -4710,6 +4711,7 @@ $as_echo "$LIBRARY" >&6; }
+
LDLIBRARY="$LIBRARY"
BLDLIBRARY='$(LDLIBRARY)'
INSTSONAME='$(LDLIBRARY)'
@@ -4906,6 +4908,10 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>confdefs.h
BLDLIBRARY='-Wl,-R,$(LIBDIR) -L. -lpython$(LDVERSION)'
RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
INSTSONAME="$LDLIBRARY".$SOVERSION
+ if test $with_pydebug == no
+ then
+ PY3LIBRARY=libpython3.so
+ fi
;;
Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*)
LDLIBRARY='libpython$(LDVERSION).so'
@@ -4917,6 +4923,11 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>confdefs.h
;;
esac
INSTSONAME="$LDLIBRARY".$SOVERSION
+ PY3LIBRARY=libpython3.so
+ if test $with_pydebug == no
+ then
+ PY3LIBRARY=libpython3.so
+ fi
;;
hp*|HP*)
case `uname -m` in
diff --git a/configure.in b/configure.in
index fe030b3..dad37c5 100644
--- a/configure.in
+++ b/configure.in
@@ -608,6 +608,7 @@ AC_MSG_RESULT($LIBRARY)
AC_SUBST(LDLIBRARY)
AC_SUBST(DLLLIBRARY)
AC_SUBST(BLDLIBRARY)
+AC_SUBST(PY3LIBRARY)
AC_SUBST(LDLIBRARYDIR)
AC_SUBST(INSTSONAME)
AC_SUBST(RUNSHARED)
@@ -737,6 +738,10 @@ if test $enable_shared = "yes"; then
BLDLIBRARY='-Wl,-R,$(LIBDIR) -L. -lpython$(LDVERSION)'
RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
INSTSONAME="$LDLIBRARY".$SOVERSION
+ if test $with_pydebug == no
+ then
+ PY3LIBRARY=libpython3.so
+ fi
;;
Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*)
LDLIBRARY='libpython$(LDVERSION).so'
@@ -748,6 +753,11 @@ if test $enable_shared = "yes"; then
;;
esac
INSTSONAME="$LDLIBRARY".$SOVERSION
+ PY3LIBRARY=libpython3.so
+ if test $with_pydebug == no
+ then
+ PY3LIBRARY=libpython3.so
+ fi
;;
hp*|HP*)
case `uname -m` in
diff --git a/pyconfig.h.in b/pyconfig.h.in
index 9fbcef8..f86621b 100644
--- a/pyconfig.h.in
+++ b/pyconfig.h.in
@@ -497,6 +497,9 @@
/* Define to 1 if you have the `pause' function. */
#undef HAVE_PAUSE
+/* Define if the OS supports pipe2() */
+#undef HAVE_PIPE2
+
/* Define to 1 if you have the `plock' function. */
#undef HAVE_PLOCK