svn commit: r346312 - head/Mk/Uses

[Tijl Coosemans]

Author: tijl
Date: Thu Feb 27 09:51:45 2014
New Revision: 346312
URL: http://svnweb.freebsd.org/changeset/ports/346312
QAT: https://qat.redports.org/buildarchive/r346312/

Log:
  - Some ports ship with libtool 1.5.x + "anygcc" patch.  This modified
    version calls "gcc" in two places.  Replace that with $CC.
  - r346193 added -B${LOCALBASE}/bin in Uses/fortran.mk, just like
    compiler.mk, but libtool doesn't recognise this flag and discards it.
    Patch ltmain.sh so it passes the flag to the linker unmodified.
    This only works on libtool 2.x for now, but that's good enough to fix
    the PRs below and a linker error in math/octave on FreeBSD/i386 8.x.
    (When those ports set USES=libtool.)
  
  PR:		ports/186946, ports/187000
  Approved by:	bapt

Modified:
  head/Mk/Uses/libtool.mk

Modified: head/Mk/Uses/libtool.mk
==============================================================================
--- head/Mk/Uses/libtool.mk	Thu Feb 27 09:49:51 2014	(r346311)
+++ head/Mk/Uses/libtool.mk	Thu Feb 27 09:51:45 2014	(r346312)
@@ -19,12 +19,18 @@ _INCLUDE_USES_LIBTOOL_POST_MK=	yes
 patch-libtool:
 	@${FIND} ${WRKDIR} \( -name configure -or -name ltconfig \)	\
 		-type f | ${XARGS} ${REINPLACE_CMD}			\
+		-e '/gcc_dir=\\`/s/gcc /$$CC /'				\
+		-e '/gcc_ver=\\`/s/gcc /$$CC /'				\
 		-e '/link_all_deplibs[0-9A-Z_]*=/s/=unknown/=no/'	\
 		-e 's,freebsd\*),freebsd\*|dragonfly\*),g'		\
 		-e '/objformat=/s/echo aout/echo elf/'			\
 		-e "/freebsd-elf\\*)/,/;;/ {				\
 		    /deplibs_check_method=/s/=.*/=pass_all/; }"	
 
+	@${FIND} ${WRKDIR} -type f -name ltmain.sh |			\
+		${XARGS} ${REINPLACE_CMD}				\
+		-e 's/|-p|-pg|/|-B*|-p|-pg|/'
+
 .if ! ${libtool_ARGS:Moldver}
 	@${FIND} ${WRKDIR} \( -name configure -or -name ltconfig \)	\
 		-type f | ${XARGS} ${REINPLACE_CMD}			\