traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge 11347.

This commit is contained in:
Martin v. Löwis 2011-05-09 07:41:32 +02:00
parent 37c02c9697 48e14d3fda
commit 4e9da47d8f
4 changed files with 767 additions and 678 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.pre.in
View File

@ -75,6 +75,7 @@ PY_CFLAGS= $(BASECFLAGS) $(OPT) $(CONFIGURE_CFLAGS) $(CFLAGS) $(EXTRA_CFLAGS)
# environment variables # environment variables
PY_CPPFLAGS= -I. -IInclude -I$(srcdir)/Include $(CONFIGURE_CPPFLAGS) $(CPPFLAGS) PY_CPPFLAGS= -I. -IInclude -I$(srcdir)/Include $(CONFIGURE_CPPFLAGS) $(CPPFLAGS)
PY_LDFLAGS= $(CONFIGURE_LDFLAGS) $(LDFLAGS) PY_LDFLAGS= $(CONFIGURE_LDFLAGS) $(LDFLAGS)
NO_AS_NEEDED= @NO_AS_NEEDED@
LDLAST= @LDLAST@ LDLAST= @LDLAST@
SGI_ABI= @SGI_ABI@ SGI_ABI= @SGI_ABI@
CCSHARED= @CCSHARED@ CCSHARED= @CCSHARED@
@ -459,7 +460,7 @@ libpython$(LDVERSION).so: $(LIBRARY_OBJS)
fi fi
libpython3.so: libpython$(LDVERSION).so libpython3.so: libpython$(LDVERSION).so
$(BLDSHARED) -o $@ -Wl,-hl$@ $^ $(BLDSHARED) $(NO_AS_NEEDED) -o $@ -Wl,-h$@ $^
libpython$(LDVERSION).dylib: $(LIBRARY_OBJS) libpython$(LDVERSION).dylib: $(LIBRARY_OBJS)
$(CC) -dynamiclib -Wl,-single_module $(PY_LDFLAGS) -undefined dynamic_lookup -Wl,-install_name,$(prefix)/lib/libpython$(LDVERSION).dylib -Wl,-compatibility_version,$(VERSION) -Wl,-current_version,$(VERSION) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \ $(CC) -dynamiclib -Wl,-single_module $(PY_LDFLAGS) -undefined dynamic_lookup -Wl,-install_name,$(prefix)/lib/libpython$(LDVERSION).dylib -Wl,-compatibility_version,$(VERSION) -Wl,-current_version,$(VERSION) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \

2
Misc/NEWS
View File

@ -578,6 +578,8 @@ Library
Build Build
----- -----
- Issue #11347: Use --as-needed when linking libpython3.so.
- Issue #11411: Fix 'make DESTDIR=' with a relative destination. - Issue #11411: Fix 'make DESTDIR=' with a relative destination.
- Issue #11268: Prevent Mac OS X Installer failure if Documentation - Issue #11268: Prevent Mac OS X Installer failure if Documentation

1428
configure vendored
View File

File diff suppressed because it is too large Load Diff

12
configure.in
View File

@ -518,6 +518,18 @@ then
fi fi
AC_MSG_CHECKING([for -Wl,--no-as-needed])
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -Wl,--no-as-needed"
AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
[NO_AS_NEEDED="-Wl,--no-as-needed"
AC_MSG_RESULT([yes])],
[NO_AS_NEEDED=""
AC_MSG_RESULT([no])])
LDFLAGS="$save_LDFLAGS"
AC_SUBST(NO_AS_NEEDED)
# checks for UNIX variants that set C preprocessor variables # checks for UNIX variants that set C preprocessor variables
AC_USE_SYSTEM_EXTENSIONS AC_USE_SYSTEM_EXTENSIONS