diff options
| author | Don Lewis <truckman@FreeBSD.org> | 2016-02-11 15:40:53 +0000 |
|---|---|---|
| committer | Don Lewis <truckman@FreeBSD.org> | 2016-02-11 15:40:53 +0000 |
| commit | e0aa066aead36b2b70baf9aa06050f69383dfd56 (patch) | |
| tree | 472332d093b451b367f9ebe28f98da22dd25b887 /editors/openoffice-devel/files | |
| parent | - Add links for clang38 (diff) | |
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
Notes
Notes:
svn path=/head/; revision=408688
Diffstat (limited to 'editors/openoffice-devel/files')
| -rw-r--r-- | editors/openoffice-devel/files/patch-sdext_source_pdfimport_makefile.mk | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/editors/openoffice-devel/files/patch-sdext_source_pdfimport_makefile.mk b/editors/openoffice-devel/files/patch-sdext_source_pdfimport_makefile.mk new file mode 100644 index 000000000000..7c80a84efa1e --- /dev/null +++ b/editors/openoffice-devel/files/patch-sdext_source_pdfimport_makefile.mk @@ -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 |