Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 24 Feb 2014 13:13:37 +0000 (UTC)
From:      Pietro Cerutti <gahr@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r345834 - head/devel/meta-cvs
Message-ID:  <201402241313.s1ODDbc6024140@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gahr
Date: Mon Feb 24 13:13:37 2014
New Revision: 345834
URL: http://svnweb.freebsd.org/changeset/ports/345834
QAT: https://qat.redports.org/buildarchive/r345834/

Log:
  - Better way of finding out libc's real name
  
  Obtained from:	bapt, jlh

Modified:
  head/devel/meta-cvs/Makefile

Modified: head/devel/meta-cvs/Makefile
==============================================================================
--- head/devel/meta-cvs/Makefile	Mon Feb 24 13:13:31 2014	(r345833)
+++ head/devel/meta-cvs/Makefile	Mon Feb 24 13:13:37 2014	(r345834)
@@ -31,15 +31,11 @@ PORTDOCS=	*
 .include <bsd.port.options.mk>
 
 post-patch:
-#	libc.so is now a symlink, see
+#	libc.so is now a symlink, let's find out the real name of the libc
+#	shared library. See:
 #	http://svnweb.freebsd.org/base/head/lib/libc/libc.ldscript?revision=251668&view=markup
-	(if [ -h /usr/lib/libc.so ]; then \
-	    rep=libc.so; \
-	else \
-	    rep=`${SED} -e '1d; s|^.*\(/lib/libc\.so\.[0-9]*\).*$$|\1|' /usr/lib/libc.so`; \
-	fi; \
-	${REINPLACE_CMD} -e "s|libc.so.6|$$rep|" ${WRKSRC}/code/clisp-ffi.lisp)
-
+	rep=$$(${BASENAME} $$(${LDCONFIG} -r | ${AWK} '/libc.so/ { print $$3 }')); \
+	    ${REINPLACE_CMD} -e "s|libc.so.6|$$rep|" ${WRKSRC}/code/clisp-ffi.lisp
 	${REINPLACE_CMD} -e '232s|make|${GMAKE}|g' ${WRKSRC}/configure
 	${REINPLACE_CMD} -e 's|type -P|which|g;s|$$(prefix)/lib|${DATADIR}|g' ${WRKSRC}/Makefile
 



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