[Libreoffice-commits] core.git: Branch 'aoo/trunk' - svtools/Library_svt.mk

[Pedro Giffuni]

 svtools/Library_svt.mk |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 352796f225e035babb7083f69dbfbcd52ec89b4b
Author: Pedro Giffuni <pfg at apache.org>
Date:   Wed Jul 8 20:57:46 2015 +0000

    jpeg build fixes
    
    Mostly visible when using external jpeg.
    
    Author:		Don Lewis (truckman at FreeBSD)

diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index a5013c9..f9f5485 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -76,6 +76,12 @@ $(eval $(call gb_Library_add_linked_libs,svt,\
 $(eval $(call gb_Library_set_ldflags,svt,\
     $$(filter-out -L/usr/lib/jvm%,$$(LDFLAGS)) \
 ))
+ifeq ($(OS),FREEBSD)
+# JDK jpeg library on FreeBSD lives under ${JAVA_HOME}/jre/lib/${ARCH}/
+$(eval $(call gb_Library_set_ldflags,svt,\
+    $$(filter-out -L$$(JAVA_HOME)/jre/lib/%,$$(LDFLAGS)) \
+))
+endif
 ifeq ($(GUIBASE),os2)
 # YD FIXME above is not working... needs ldflags hack...
 $(eval $(call gb_Library_set_ldflags,svt,\