From owner-svn-ports-head@FreeBSD.ORG Wed Aug 29 18:42:59 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4CFCC106566B; Wed, 29 Aug 2012 18:42:59 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1EB7C8FC0A; Wed, 29 Aug 2012 18:42:59 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7TIgwpF095243; Wed, 29 Aug 2012 18:42:58 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7TIgwVG095240; Wed, 29 Aug 2012 18:42:58 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201208291842.q7TIgwVG095240@svn.freebsd.org> From: Jung-uk Kim Date: Wed, 29 Aug 2012 18:42:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r303346 - in head/editors/libreoffice: . files X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Aug 2012 18:42:59 -0000 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)