You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by pf...@apache.org on 2015/07/08 22:57:47 UTC
svn commit: r1689959 - /openoffice/trunk/main/svtools/Library_svt.mk
Author: pfg
Date: Wed Jul 8 20:57:46 2015
New Revision: 1689959
URL: http://svn.apache.org/r1689959
Log:
jpeg build fixes
Mostly visible when using external jpeg.
Author: Don Lewis (truckman at FreeBSD)
Modified:
openoffice/trunk/main/svtools/Library_svt.mk
Modified: openoffice/trunk/main/svtools/Library_svt.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svtools/Library_svt.mk?rev=1689959&r1=1689958&r2=1689959&view=diff
==============================================================================
--- openoffice/trunk/main/svtools/Library_svt.mk (original)
+++ openoffice/trunk/main/svtools/Library_svt.mk Wed Jul 8 20:57:46 2015
@@ -76,6 +76,12 @@ $(eval $(call gb_Library_add_linked_libs
$(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,\