Changeset View
Changeset View
Standalone View
Standalone View
lang/python34/files/patch-Makefile.pre.in
| # 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 | |||||
| # Description: Create symlinks for non-ABI-suffixed python*-config and ABI-suffixed python-*.pc | # Description: Create symlinks for non-ABI-suffixed python*-config and ABI-suffixed python-*.pc | ||||
| # Submitted by: antoine@ (r358029) | # Submitted by: antoine@ (r358029) | ||||
| # TODO: Upstream | # TODO: Upstream | ||||
| --- ./Makefile.pre.in.orig 2014-05-19 05:19:39.000000000 +0000 | --- ./Makefile.pre.in.orig 2014-05-19 05:19:39.000000000 +0000 | ||||
| +++ ./Makefile.pre.in 2014-06-15 12:12:17.000000000 +0000 | +++ ./Makefile.pre.in 2014-06-15 12:12:17.000000000 +0000 | ||||
| @@ -70,18 +70,15 @@ | @@ -70,18 +70,15 @@ | ||||
| OPT= @OPT@ | OPT= @OPT@ | ||||
| Show All 25 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 | ||||
| @@ -1314,8 +1305,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; \ | |||||
| @@ -1333,6 +1324,12 @@ | @@ -1333,6 +1324,12 @@ | ||||
| $(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh | $(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh | ||||
| $(INSTALL_SCRIPT) python-config.py $(DESTDIR)$(LIBPL)/python-config.py | $(INSTALL_SCRIPT) python-config.py $(DESTDIR)$(LIBPL)/python-config.py | ||||
| $(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 | ||||
| @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 \ | ||||
| echo; echo "Installing support files for building shared extension modules on AIX:"; \ | echo; echo "Installing support files for building shared extension modules on AIX:"; \ | ||||