Date: Thu, 11 Feb 2016 15:40:53 +0000 (UTC) From: Don Lewis <truckman@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r408688 - in head/editors/openoffice-devel: . files Message-ID: <201602111540.u1BFerCr014490@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: truckman Date: Thu Feb 11 15:40:53 2016 New Revision: 408688 URL: https://svnweb.freebsd.org/changeset/ports/408688 Log: Unbreak PDF Import extension when building with modern boost. Similar to the patch by amdmi3, link the extension with -lboost_system, but only do this in the --with-system-boost case. Doing this unconditionally would break building with the bundled boost because only the boost headers are available and the boost libraries are not built. This is still a bit pessimal because -lboost_system may be used when it is not strictly necessary (when the system boost is old), but it is likely that this is only relevant to FreeBSD and we are in the process of upgrading boost. This fix should be acceptable upstream. Re-enable the PDF Import extension by default. When the PDF Import extension is enabled, promote boost from BUILD_DEPENDS to LIB_DEPENDS. Tested with PDFIMPORT both on and off. Also tested with PDFIMPORT on, --with-system-boost disabled, and boost removed from *_DEPENDS. PR: 207073, 199601 Added: head/editors/openoffice-devel/files/patch-sdext_source_pdfimport_makefile.mk (contents, props changed) Modified: head/editors/openoffice-devel/Makefile Modified: head/editors/openoffice-devel/Makefile ============================================================================== --- head/editors/openoffice-devel/Makefile Thu Feb 11 15:28:13 2016 (r408687) +++ head/editors/openoffice-devel/Makefile Thu Feb 11 15:40:53 2016 (r408688) @@ -3,7 +3,7 @@ PORTNAME= apache-openoffice PORTVERSION= ${AOOVERSION1}.${AOOVERSION2}.${SVNREVISION} -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 4 CATEGORIES= editors java MASTER_SITES= https://dist.apache.org/repos/dist/dev/openoffice/${AOOVERSION}-${AOORC}-r${SVNREVISION}/source/ \ @@ -55,7 +55,6 @@ BUILD_DEPENDS= \ ${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \ zip:${PORTSDIR}/archivers/zip \ ant:${PORTSDIR}/devel/apache-ant \ - ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs \ dmake:${PORTSDIR}/devel/dmake \ epm:${PORTSDIR}/devel/epm \ ${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \ @@ -149,7 +148,7 @@ CPE_PRODUCT= ${PORTNAME:S|apache-||} CPE_VENDOR= apache OPTIONS_DEFINE= CUPS GNOME GNOMEVFS MMEDIA PDFIMPORT SDK WIKI_PUBLISHER CCACHE -OPTIONS_DEFAULT= CUPS GNOME GNOMEVFS MMEDIA WIKI_PUBLISHER +OPTIONS_DEFAULT= CUPS GNOME GNOMEVFS MMEDIA PDFIMPORT WIKI_PUBLISHER GNOME_DESC= GConf + screensaver presentation control via DBUS GNOMEVFS_DESC= GNOME Virtual File System MMEDIA_DESC= Multimedia backend for impress @@ -176,6 +175,8 @@ MMEDIA_USE= GSTREAMER=yes SDK_CONFIGURE_ENABLE= odk PDFIMPORT_CONFIGURE_ENABLE= pdfimport +PDFIMPORT_LIB_DEPENDS= libboost_system.so:${PORTSDIR}/devel/boost-libs +PDFIMPORT_BUILD_DEPENDS_OFF= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs WIKI_PUBLISHER_CONFIGURE_ENABLE= wiki-publisher Added: head/editors/openoffice-devel/files/patch-sdext_source_pdfimport_makefile.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/openoffice-devel/files/patch-sdext_source_pdfimport_makefile.mk Thu Feb 11 15:40:53 2016 (r408688) @@ -0,0 +1,13 @@ +--- sdext/source/pdfimport/makefile.mk.orig 2014-09-19 18:16:25 UTC ++++ sdext/source/pdfimport/makefile.mk +@@ -70,6 +70,10 @@ SHL1STDLIBS=\ + $(CPPULIB) \ + $(SALLIB) + ++.IF "$(SYSTEM_BOOST)" == "YES" ++ SHL1STDLIBS+=-lboost_system ++.ENDIF ++ + .IF "$(GUI)" == "UNX" + SHL1STDLIBS+=-lbasegfx_s + .ELSE
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602111540.u1BFerCr014490>