diff options
Diffstat (limited to 'lang/python34')
| -rw-r--r-- | lang/python34/Makefile | 4 | ||||
| -rw-r--r-- | lang/python34/files/patch-Makefile.pre.in | 14 |
2 files changed, 1 insertions, 17 deletions
diff --git a/lang/python34/Makefile b/lang/python34/Makefile index 066220fdb19a..0608595f0e3d 100644 --- a/lang/python34/Makefile +++ b/lang/python34/Makefile @@ -29,8 +29,7 @@ CONFIGURE_ARGS+= --enable-shared --without-ensurepip CONFIGURE_ENV+= OPT="" DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS}" # Null out OPT to respect user CFLAGS and remove optimizations INSTALL_TARGET= altinstall # Don't want cloberring of unprefixed files -SHAREMODE= 644 # Match upstream INSTALL_DATA=644, so we can STRIP shared libraries -MAKE_ARGS+= INSTALL_SHARED="${INSTALL_LIB}" # Override read-only for libraries, so we can STRIP them +MAKE_ARGS+= INSTALL_SHARED="${INSTALL_LIB}" # Strip shared library MAKE_ARGS+= LIBPC="${PREFIX}/libdata/pkgconfig" # Until pathfix gets support for files other than Makefile.in PLIST_SUB= ABI=${ABIFLAGS} \ @@ -104,7 +103,6 @@ post-install: .endif for i in ${STAGEDIR}${PREFIX}/lib/python3.4/lib-dynload/*.so; do \ ${STRIP_CMD} $$i; done # Strip shared extensions - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpython3.4${ABIFLAGS}.so.1 # Strip shared library regression-test: build @cd ${WRKSRC} && ${MAKE} TESTOPTS=-j${MAKE_JOBS_NUMBER} buildbottest diff --git a/lang/python34/files/patch-Makefile.pre.in b/lang/python34/files/patch-Makefile.pre.in index 3d941d04e953..c50727846803 100644 --- a/lang/python34/files/patch-Makefile.pre.in +++ b/lang/python34/files/patch-Makefile.pre.in @@ -2,10 +2,6 @@ # Submitted by: koobs (r326729) # 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 # Submitted by: antoine@ (r358029) # TODO: Upstream @@ -47,16 +43,6 @@ -rm -f $(DESTDIR)$(BINDIR)/python3-config (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python3-config) -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 @@ $(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh $(INSTALL_SCRIPT) python-config.py $(DESTDIR)$(LIBPL)/python-config.py |