Date: Wed, 29 Aug 2012 18:42:58 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r303346 - in head/editors/libreoffice: . files Message-ID: <201208291842.q7TIgwVG095240@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Wed Aug 29 18:42:58 2012 New Revision: 303346 URL: http://svn.freebsd.org/changeset/ports/303346 Log: Work around rpath/origin and visibility issues. Modified: head/editors/libreoffice/Makefile head/editors/libreoffice/files/patch-testtools__source__bridgetest__makefile.mk Modified: head/editors/libreoffice/Makefile ============================================================================== --- head/editors/libreoffice/Makefile Wed Aug 29 18:25:20 2012 (r303345) +++ head/editors/libreoffice/Makefile Wed Aug 29 18:42:58 2012 (r303346) @@ -233,6 +233,9 @@ MAKE_ENV+= USE_GMAKE=1 DESTDIR=${LODESTD CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/db${BDB_VER} LDFLAGS+= -L${LOCALBASE}/lib +# XXX Avoid -rpath pollution from bsd.openssl.mk. +CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" + .if ${PORT_OPTIONS:MPGSQL} USE_PGSQL= yes WANT_PGSQL_VER= 90+ @@ -373,6 +376,8 @@ post-extract: @${TOUCH} ${WRKSRC}/clone/repos_changed post-patch: + @${FIND} ${WRKSRC} -type f -print0 | \ + ${XARGS} -0 ${REINPLACE_CMD} -i '' -e 's#-Wl,-rpath,#-Wl,-z,origin -Wl,-rpath,#g' @${REINPLACE_CMD} -e 's#5.1 5.0#${BDB_VER}#g' \ -e 's,-ldb$$dash$$dbver,-l${BDB_LIB_NAME},g' \ -e 's,"Linux" \&\& test "z$$enable_graphite","FreeBSD" \&\& test "z$$enable_graphite",g' \ Modified: head/editors/libreoffice/files/patch-testtools__source__bridgetest__makefile.mk ============================================================================== --- head/editors/libreoffice/files/patch-testtools__source__bridgetest__makefile.mk Wed Aug 29 18:25:20 2012 (r303345) +++ head/editors/libreoffice/files/patch-testtools__source__bridgetest__makefile.mk Wed Aug 29 18:42:58 2012 (r303346) @@ -1,6 +1,14 @@ --- ./testtools/source/bridgetest/makefile.mk.orig 2012-08-08 09:00:06.000000000 -0400 -+++ ./testtools/source/bridgetest/makefile.mk 2012-08-22 16:18:28.000000000 -0400 -@@ -145,16 +145,6 @@ ++++ ./testtools/source/bridgetest/makefile.mk 2012-08-27 15:06:28.000000000 -0400 +@@ -31,7 +31,6 @@ + TARGET=bridgetest + USE_DEFFILE=TRUE + ENABLE_EXCEPTIONS=TRUE +-VISIBILITY_HIDDEN=TRUE + LIBTARGET=NO + + .INCLUDE: settings.mk +@@ -145,16 +144,6 @@ runtest : $(DLLDEST)$/uno_types.rdb $(DLLDEST)$/uno_services.rdb makefile.mk \ $(SHL1TARGETN) $(SHL2TARGETN) $(SHL3TARGETN)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208291842.q7TIgwVG095240>