FreeBSD Mail Archives

Date:      Mon, 8 Jun 2015 05:59:14 +0000 (UTC)
From:      Antoine Brodin <antoine@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r388831 - in head: Mk/Uses audio/liblscp audio/mac/files devel/pcre/files devel/synfig graphics/gthumb graphics/pixie/files graphics/synfigstudio math/yacas multimedia/subtitleeditor ne...
Message-ID:  <201506080559.t585xETY073478@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help

Author: antoine
Date: Mon Jun  8 05:59:13 2015
New Revision: 388831
URL: https://svnweb.freebsd.org/changeset/ports/388831

Log:
  Make ports using libtool treat elftoolchain's strip the same as GNU strip
  Any strip on any FreeBSD version should be able to handle stripping requested
  by libtool
  
  PR:		198611
  Reviewed by:	emaste
  Exp-run:	self

Deleted:
  head/devel/pcre/files/patch-configure
Modified:
  head/Mk/Uses/libtool.mk
  head/audio/liblscp/Makefile
  head/audio/mac/files/patch-configure
  head/devel/synfig/Makefile
  head/graphics/gthumb/Makefile
  head/graphics/pixie/files/patch-configure
  head/graphics/synfigstudio/Makefile
  head/math/yacas/Makefile
  head/multimedia/subtitleeditor/Makefile
  head/net-im/gloox/Makefile
  head/net/nanomsg/Makefile
  head/science/gwyddion/Makefile
  head/sysutils/powerman/Makefile

Modified: head/Mk/Uses/libtool.mk
==============================================================================
--- head/Mk/Uses/libtool.mk	Mon Jun  8 05:46:09 2015	(r388830)
+++ head/Mk/Uses/libtool.mk	Mon Jun  8 05:59:13 2015	(r388831)
@@ -33,6 +33,7 @@ patch-libtool:
 		-e '/gcc_ver=\\`/s/gcc /$$CC /'				\
 		-e '/link_all_deplibs[0-9A-Z_]*=/s/=unknown/=no/'	\
 		-e '/objformat=/s/echo aout/echo elf/'			\
+		-e '/STRIP -V/s/"GNU strip"/"strip"/'			\
 		-e "/freebsd-elf\\*)/,/;;/ {				\
 		    /deplibs_check_method=/s/=.*/=pass_all/;		\
 		    /library_names_spec=.*\\.so/			\

Modified: head/audio/liblscp/Makefile
==============================================================================
--- head/audio/liblscp/Makefile	Mon Jun  8 05:46:09 2015	(r388830)
+++ head/audio/liblscp/Makefile	Mon Jun  8 05:59:13 2015	(r388831)
@@ -18,8 +18,4 @@ GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
-post-patch:
-	@${REINPLACE_CMD} -e \
-		's|"GNU strip"|"strip"|' ${WRKSRC}/configure
-
 .include <bsd.port.mk>

Modified: head/audio/mac/files/patch-configure
==============================================================================
--- head/audio/mac/files/patch-configure	Mon Jun  8 05:46:09 2015	(r388830)
+++ head/audio/mac/files/patch-configure	Mon Jun  8 05:59:13 2015	(r388831)
@@ -9,12 +9,3 @@
  ac_ext=cpp
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -11215,7 +11215,7 @@ striplib=
- old_striplib=
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
- $as_echo_n "checking whether stripping libraries is possible... " >&6; }
--if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
-+if test -n "$STRIP" && $STRIP -V 2>&1 | $EGREP "GNU|elftoolchain" >/dev/null; then
-   test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

Modified: head/devel/synfig/Makefile
==============================================================================
--- head/devel/synfig/Makefile	Mon Jun  8 05:46:09 2015	(r388830)
+++ head/devel/synfig/Makefile	Mon Jun  8 05:59:13 2015	(r388831)
@@ -37,7 +37,6 @@ post-patch:
 	@${REINPLACE_CMD} -e \
 		'/optimization_flags/s|CXXFLAGS=|#CXXFLAGS=| ; \
 		 /optimization_flags/s|CFLAGS=|#CFLAGS=| ; \
-		 s|"GNU strip"|"strip"| ; \
 		 s|el_GR|el| ; \
 		 s|ja_JP|ja| ; \
 		 s|no_NO|no| ; \

Modified: head/graphics/gthumb/Makefile
==============================================================================
--- head/graphics/gthumb/Makefile	Mon Jun  8 05:46:09 2015	(r388830)
+++ head/graphics/gthumb/Makefile	Mon Jun  8 05:59:13 2015	(r388831)
@@ -93,8 +93,7 @@ YELP_RUN_DEPENDS=	yelp:${PORTSDIR}/x11/y
 
 post-patch:
 	@${REINPLACE_CMD} -e \
-		's|"GNU strip"|"strip"| ; \
-		 s|-Wl,--as-needed|| ; \
+		's|-Wl,--as-needed|| ; \
 		 /^[[:blank:]]zlib/d ; \
 		 /webkit2gtk/s|-4.0|-3.0|' ${WRKSRC}/configure
 

Modified: head/graphics/pixie/files/patch-configure
==============================================================================
--- head/graphics/pixie/files/patch-configure	Mon Jun  8 05:46:09 2015	(r388830)
+++ head/graphics/pixie/files/patch-configure	Mon Jun  8 05:59:13 2015	(r388831)
@@ -1,14 +1,5 @@
 --- configure.orig
 +++ configure
-@@ -12199,7 +12199,7 @@
- old_striplib=
- { $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
- $as_echo_n "checking whether stripping libraries is possible... " >&6; }
--if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
-+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "strip" >/dev/null; then
-   test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-   { $as_echo "$as_me:$LINENO: result: yes" >&5
 @@ -18418,10 +18418,10 @@
    if test x$FLTK_CONFIG != xno ; then
    	if test x$STATIC_FLTK != xtrue ; then

Modified: head/graphics/synfigstudio/Makefile
==============================================================================
--- head/graphics/synfigstudio/Makefile	Mon Jun  8 05:46:09 2015	(r388830)
+++ head/graphics/synfigstudio/Makefile	Mon Jun  8 05:59:13 2015	(r388831)
@@ -33,7 +33,6 @@ post-patch:
 	@${REINPLACE_CMD} -e \
 		'/optimization_flags/s|CXXFLAGS=|#CXXFLAGS=| ; \
 		 /optimization_flags/s|CFLAGS=|#CFLAGS=| ; \
-		 s|"GNU strip"|"strip"| ; \
 		 /DATADIRNAME/s|lib|share| ; \
 		 s|<tr1/|<| ; \
 		 s|::tr1||' \

Modified: head/math/yacas/Makefile
==============================================================================
--- head/math/yacas/Makefile	Mon Jun  8 05:46:09 2015	(r388830)
+++ head/math/yacas/Makefile	Mon Jun  8 05:59:13 2015	(r388831)
@@ -35,8 +35,6 @@ CPPFLAGS+=	-D_GLIBCXX_USE_C99
 
 post-patch:
 	@${REINPLACE_CMD} -e \
-		's|"GNU strip"|"strip"|' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e \
 		's|%%DATADIR%%|${DATADIR}|' ${WRKSRC}/src/yacasmain.cpp
 #	Can't use USES=shebangfix here, cause the path appears several
 #	times in the file.

Modified: head/multimedia/subtitleeditor/Makefile
==============================================================================
--- head/multimedia/subtitleeditor/Makefile	Mon Jun  8 05:46:09 2015	(r388830)
+++ head/multimedia/subtitleeditor/Makefile	Mon Jun  8 05:59:13 2015	(r388831)
@@ -36,8 +36,4 @@ OPENGL_LIB_DEPENDS=	libgtkglextmm-x11-1.
 OPENGL_USE=		gl=glu
 OPENGL_CONFIGURE_ENABLE=gl
 
-post-patch:
-	@${REINPLACE_CMD} -e \
-		's|"GNU strip"|"strip"|' ${WRKSRC}/configure
-
 .include <bsd.port.mk>

Modified: head/net-im/gloox/Makefile
==============================================================================
--- head/net-im/gloox/Makefile	Mon Jun  8 05:46:09 2015	(r388830)
+++ head/net-im/gloox/Makefile	Mon Jun  8 05:59:13 2015	(r388831)
@@ -26,8 +26,7 @@ PORTSCOUT=	skipv:1.0.x
 
 post-patch:
 	@${REINPLACE_CMD} -e \
-		's|"GNU strip"|"strip"| ; \
-		 s| -ansi||' ${WRKSRC}/configure
+		 's| -ansi||' ${WRKSRC}/configure
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's| -pedantic|| ; \
 		 s| -pipe||'

Modified: head/net/nanomsg/Makefile
==============================================================================
--- head/net/nanomsg/Makefile	Mon Jun  8 05:46:09 2015	(r388830)
+++ head/net/nanomsg/Makefile	Mon Jun  8 05:59:13 2015	(r388831)
@@ -25,10 +25,6 @@ PORTDOCS=	AUTHORS ChangeLog README
 
 OPTIONS_DEFINE=	DOCS
 
-post-patch:
-	@${REINPLACE_CMD} -e 's,GREP "GNU strip",EGREP "GNU|elftoolchain",' \
-		${WRKSRC}/configure
-
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}

Modified: head/science/gwyddion/Makefile
==============================================================================
--- head/science/gwyddion/Makefile	Mon Jun  8 05:46:09 2015	(r388830)
+++ head/science/gwyddion/Makefile	Mon Jun  8 05:59:13 2015	(r388831)
@@ -49,8 +49,6 @@ UNIQUE_CONFIGURE_WITH=	unique
 
 post-patch:
 	@${REINPLACE_CMD} -e \
-		's|"GNU strip"|"strip"|' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e \
 		's|thumbnailer \\|thumbnailer| ; \
 		 s|devel-docs$$||' ${WRKSRC}/Makefile.in
 

Modified: head/sysutils/powerman/Makefile
==============================================================================
--- head/sysutils/powerman/Makefile	Mon Jun  8 05:46:09 2015	(r388830)
+++ head/sysutils/powerman/Makefile	Mon Jun  8 05:59:13 2015	(r388831)
@@ -27,8 +27,6 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
-	@${REINPLACE_CMD} -e 's,GREP "GNU strip",EGREP "GNU|elftoolchain",' \
-		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e \
 		'/^install-data-am/s|:.*|:|' ${WRKSRC}/scripts/Makefile.in

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506080559.t585xETY073478>

Header And Logo

Peripheral Links

Site Navigation

Header And Logo

Peripheral Links

Search

Site Navigation