diff options
| author | doko@ubuntu.com <doko@ubuntu.com> | 2013-03-21 20:31:41 (GMT) |
|---|---|---|
| committer | doko@ubuntu.com <doko@ubuntu.com> | 2013-03-21 20:31:41 (GMT) |
| commit | 1621d77fc8fb2385d26c7de39f55df60426ec6ec (patch) | |
| tree | 0a31742c8b8aed6453b95f92a77f50f66d5085cd /Makefile.pre.in | |
| parent | bd2d30cf31c61843645a96a377aa0573052c4972 (diff) | |
| parent | d5537d071cc2acada7220431a0eea5931c2e8a2d (diff) | |
| download | cpython-1621d77fc8fb2385d26c7de39f55df60426ec6ec.zip cpython-1621d77fc8fb2385d26c7de39f55df60426ec6ec.tar.gz cpython-1621d77fc8fb2385d26c7de39f55df60426ec6ec.tar.bz2 | |
- Issue #16754: Fix the incorrect shared library extension on linux. Introduce
two makefile macros SHLIB_SUFFIX and EXT_SUFFIX. SO now has the value of
SHLIB_SUFFIX again (as in 2.x and 3.1). The SO macro is removed in 3.4.
Diffstat (limited to 'Makefile.pre.in')
| -rw-r--r-- | Makefile.pre.in | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index 50ddd8a..6709f4a 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -125,7 +125,9 @@ INCLUDEPY= $(INCLUDEDIR)/python$(LDVERSION) CONFINCLUDEPY= $(CONFINCLUDEDIR)/python$(LDVERSION) # Symbols used for using shared libraries -SO= @SO@ +SHLIB_SUFFIX= @SHLIB_SUFFIX@ +EXT_SUFFIX= @EXT_SUFFIX@ +SO= $(SHLIB_SUFFIX) LDSHARED= @LDSHARED@ $(PY_LDFLAGS) BLDSHARED= @BLDSHARED@ $(PY_LDFLAGS) LDCXXSHARED= @LDCXXSHARED@ @@ -652,6 +654,11 @@ Python/dynload_shlib.o: $(srcdir)/Python/dynload_shlib.c Makefile -DSOABI='"$(SOABI)"' \ -o $@ $(srcdir)/Python/dynload_shlib.c +Python/dynload_hpux.o: $(srcdir)/Python/dynload_hpux.c Makefile + $(CC) -c $(PY_CORE_CFLAGS) \ + -DSHLIB_EXT='"$(EXT_SUFFIX)"' \ + -o $@ $(srcdir)/Python/dynload_hpux.c + Python/sysmodule.o: $(srcdir)/Python/sysmodule.c Makefile $(CC) -c $(PY_CORE_CFLAGS) \ -DABIFLAGS='"$(ABIFLAGS)"' \ @@ -1186,7 +1193,7 @@ libainstall: all python-config done @if test -d $(LIBRARY); then :; else \ if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \ - if test "$(SO)" = .dll; then \ + if test "$(SHLIB_SUFFIX)" = .dll; then \ $(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \ else \ $(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \ |