diff options
| author | Antoine Brodin <antoine@FreeBSD.org> | 2014-09-04 19:26:24 +0000 |
|---|---|---|
| committer | Antoine Brodin <antoine@FreeBSD.org> | 2014-09-04 19:26:24 +0000 |
| commit | 228ab588738952bd42427886fd5368181243ba6e (patch) | |
| tree | 7fe589d0d1b0e6d00b7aa9cd05fc46ca15de7655 /lang/python32 | |
| parent | - Drop .la files, no dependees require them (diff) | |
Change INSTALL_DATA to install with mode 644
Remove patches and hacks that were used to work around the previous
situation
This allows to stage more ports as a regular user
Differential Revision: https://reviews.freebsd.org/D703
Reviewed by and discussed with: bapt
With hat: portmgr
Notes
Notes:
svn path=/head/; revision=367307
Diffstat (limited to 'lang/python32')
| -rw-r--r-- | lang/python32/Makefile | 6 | ||||
| -rw-r--r-- | lang/python32/files/patch-Makefile.pre.in | 14 |
2 files changed, 2 insertions, 18 deletions
diff --git a/lang/python32/Makefile b/lang/python32/Makefile index f97ce815b92d..d6f21c1889be 100644 --- a/lang/python32/Makefile +++ b/lang/python32/Makefile @@ -27,8 +27,7 @@ CONFIGURE_ARGS+= --enable-shared CONFIGURE_ENV+= OPT="" # 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} \ @@ -118,10 +117,9 @@ post-install: # Upstream Issue: http://bugs.python.org/issue17975 ${RM} -f ${STAGEDIR}${PREFIX}/lib/libpython3.so .endif - # Strip shared extensions and shared library + # Strip shared extensions for i in ${STAGEDIR}${PREFIX}/lib/python3.2/lib-dynload/*.so; do \ ${STRIP_CMD} $$i; done - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpython3.2${ABIFLAGS}.so.1 regression-test: build @cd ${WRKSRC} && ${MAKE} TESTOPTS=-j${MAKE_JOBS_NUMBER} buildbottest diff --git a/lang/python32/files/patch-Makefile.pre.in b/lang/python32/files/patch-Makefile.pre.in index e6747e02c186..b728834507c3 100644 --- a/lang/python32/files/patch-Makefile.pre.in +++ b/lang/python32/files/patch-Makefile.pre.in @@ -5,10 +5,6 @@ # Submitted by: koobs (r326729) # 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 2014-07-18 20:54:36.000000000 +0200 @@ -60,7 +60,7 @@ @@ -76,16 +72,6 @@ -rm -f $(DESTDIR)$(BINDIR)/python3-config (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python3-config) -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 @@ $(INSTALL_SCRIPT) $(srcdir)/Modules/makesetup $(DESTDIR)$(LIBPL)/makesetup $(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh |