[Libreoffice-commits] .: svtools/Library_svt.mk

[Jan Holesovsky]

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

New commits:
commit a64ad88a4ce1993cfac8f4243b8ec7ef05bbc375
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Thu Mar 31 00:54:36 2011 +0200

    Fix 64bit build with Java (conflicting libjpeg).

diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index da27214..1c0354e 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -79,6 +79,9 @@ $(eval $(call gb_Library_add_linked_libs,svt,\
 $(eval $(call gb_Library_set_ldflags,svt,\
     $$(filter-out -L/usr/lib/jvm%,$$(LDFLAGS)) \
 ))
+$(eval $(call gb_Library_set_ldflags,svt,\
+    $$(filter-out -L/usr/lib64/jvm%,$$(LDFLAGS)) \
+))
 else
 $(eval $(call gb_Library_add_linked_static_libs,svt,\
     jpeglib \