From 59a487e52457d7ba3c7d8f8ca490c16ef1125cb7 Mon Sep 17 00:00:00 2001
From: Jan Holesovsky <kendy@suse.cz>
Date: Thu, 31 Mar 2011 00:54:36 +0200
Subject: Fix 64bit build with Java (conflicting libjpeg).

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

diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index da2721476c70..1c0354ecb22f 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 \
-- 
cgit