Changeset View
Changeset View
Standalone View
Standalone View
lang/python32/files/patch-Makefile.pre.in
# Description: INSTALL_SHARED sometimes is not properly handled in the env | # Description: INSTALL_SHARED sometimes is not properly handled in the env | ||||
# Submitted by: mva | # Submitted by: mva | ||||
# Description: Remove duplicate CFLAGS, CPPFLAGS, LDFLAGS by stripping CONFIGURE_* | # Description: Remove duplicate CFLAGS, CPPFLAGS, LDFLAGS by stripping CONFIGURE_* | ||||
# Submitted by: koobs (r326729) | # Submitted by: koobs (r326729) | ||||
# TODO: Upstream | # TODO: Upstream | ||||
# Description: Run ranlib before installing the library read-only | |||||
# Submitted by: antoine@ (r350207) | |||||
# TODO: Upstream | |||||
--- Makefile.pre.in.orig 2013-05-15 18:33:51.000000000 +0200 | --- Makefile.pre.in.orig 2013-05-15 18:33:51.000000000 +0200 | ||||
+++ Makefile.pre.in 2014-07-18 20:54:36.000000000 +0200 | +++ Makefile.pre.in 2014-07-18 20:54:36.000000000 +0200 | ||||
@@ -60,7 +60,7 @@ | @@ -60,7 +60,7 @@ | ||||
# Shared libraries must be installed with executable mode on some systems; | # Shared libraries must be installed with executable mode on some systems; | ||||
# rather than figuring out exactly which, we always give them executable mode. | # rather than figuring out exactly which, we always give them executable mode. | ||||
# Also, making them read-only seems to be a good idea... | # Also, making them read-only seems to be a good idea... | ||||
-INSTALL_SHARED= ${INSTALL} -m 555 | -INSTALL_SHARED= ${INSTALL} -m 555 | ||||
+INSTALL_SHARED?= ${INSTALL} -m 555 | +INSTALL_SHARED?= ${INSTALL} -m 555 | ||||
▲ Show 20 Lines • Show All 51 Lines • ▼ Show 20 Lines | |||||
- rm -f $(DESTDIR)$(BINDIR)/python$(VERSION)-config; \ | - rm -f $(DESTDIR)$(BINDIR)/python$(VERSION)-config; \ | ||||
- (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(LDVERSION)-config python$(VERSION)-config); \ | - (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(LDVERSION)-config python$(VERSION)-config); \ | ||||
- rm -f $(DESTDIR)$(LIBPC)/python-$(LDVERSION).pc; \ | - rm -f $(DESTDIR)$(LIBPC)/python-$(LDVERSION).pc; \ | ||||
- (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python-$(LDVERSION).pc); \ | - (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python-$(LDVERSION).pc); \ | ||||
- fi | - fi | ||||
-rm -f $(DESTDIR)$(BINDIR)/python3-config | -rm -f $(DESTDIR)$(BINDIR)/python3-config | ||||
(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python3-config) | (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python3-config) | ||||
-rm -f $(DESTDIR)$(LIBPC)/python3.pc | -rm -f $(DESTDIR)$(LIBPC)/python3.pc | ||||
@@ -1108,8 +1102,8 @@ | |||||
if test "$(SHLIB_SUFFIX)" = .dll; then \ | |||||
$(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \ | |||||
else \ | |||||
+ $(RANLIB) $(LIBRARY) ; \ | |||||
$(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \ | |||||
- $(RANLIB) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \ | |||||
fi; \ | |||||
else \ | |||||
echo Skip install of $(LIBRARY) - use make frameworkinstall; \ | |||||
@@ -1126,6 +1120,12 @@ | @@ -1126,6 +1120,12 @@ | ||||
$(INSTALL_SCRIPT) $(srcdir)/Modules/makesetup $(DESTDIR)$(LIBPL)/makesetup | $(INSTALL_SCRIPT) $(srcdir)/Modules/makesetup $(DESTDIR)$(LIBPL)/makesetup | ||||
$(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh | $(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh | ||||
$(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(LDVERSION)-config | $(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(LDVERSION)-config | ||||
+ -if test "$(VERSION)" != "$(LDVERSION)"; then \ | + -if test "$(VERSION)" != "$(LDVERSION)"; then \ | ||||
+ rm -f $(DESTDIR)$(BINDIR)/python$(VERSION)-config; \ | + rm -f $(DESTDIR)$(BINDIR)/python$(VERSION)-config; \ | ||||
+ (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(LDVERSION)-config python$(VERSION)-config); \ | + (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(LDVERSION)-config python$(VERSION)-config); \ | ||||
+ rm -f $(DESTDIR)$(LIBPC)/python-$(LDVERSION).pc; \ | + rm -f $(DESTDIR)$(LIBPC)/python-$(LDVERSION).pc; \ | ||||
+ (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python-$(LDVERSION).pc); \ | + (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python-$(LDVERSION).pc); \ | ||||
+ fi | + fi | ||||
rm python-config | rm python-config | ||||
@if [ -s Modules/python.exp -a \ | @if [ -s Modules/python.exp -a \ | ||||
"`echo $(MACHDEP) | sed 's/^\(...\).*/\1/'`" = "aix" ]; then \ | "`echo $(MACHDEP) | sed 's/^\(...\).*/\1/'`" = "aix" ]; then \ |