2014-02-20 11:38:16 +00:00
|
|
|
From 5ae1c74d453150a54a4b377d29a9228acf3e61fb Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
|
|
|
Date: Thu, 20 Feb 2014 11:35:28 +0000
|
|
|
|
|
Subject: [PATCH] gcj fixes
|
|
|
|
|
|
|
|
|
|
Change-Id: I99fe963bb2ca413b323c44a77ad2f48dd7c477f4
|
|
|
|
|
---
|
|
|
|
|
odk/CustomTarget_javadoc.mk | 1 -
|
|
|
|
|
odk/Package_javadoc.mk | 61 ----------------------------------------
|
|
|
|
|
scp2/source/ooo/common_brand.scp | 1 +
|
|
|
|
|
3 files changed, 1 insertion(+), 62 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/odk/CustomTarget_javadoc.mk b/odk/CustomTarget_javadoc.mk
|
|
|
|
|
index c5e3e67..8bd18b4 100644
|
2013-08-12 15:42:23 +00:00
|
|
|
--- a/odk/CustomTarget_javadoc.mk
|
|
|
|
|
+++ b/odk/CustomTarget_javadoc.mk
|
2014-02-20 11:38:16 +00:00
|
|
|
@@ -41,7 +41,6 @@ $(call gb_CustomTarget_get_workdir,odk/docs/java/ref)/javadoc_log.txt : \
|
2014-01-24 17:08:38 +00:00
|
|
|
-linkoffline ../../common/reg $(SRCDIR)/odk/docs/java-uno \
|
|
|
|
|
-linkoffline http://java.sun.com/j2se/1.5/docs/api $(SRCDIR)/odk/docs/java \
|
2013-08-12 15:42:23 +00:00
|
|
|
$(odk_JAVAPACKAGES) \
|
|
|
|
|
- $(if $(JAVADOCISGJDOC),,-notimestamp) \
|
|
|
|
|
> $@
|
2012-11-14 09:50:22 +00:00
|
|
|
|
2013-08-12 15:42:23 +00:00
|
|
|
# vim: set noet sw=4 ts=4:
|
2014-02-20 11:38:16 +00:00
|
|
|
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
|
|
|
|
|
index 2498822..d459997 100644
|
|
|
|
|
--- a/scp2/source/ooo/common_brand.scp
|
|
|
|
|
+++ b/scp2/source/ooo/common_brand.scp
|
|
|
|
|
@@ -1239,6 +1239,7 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Java_Classpath_Urls
|
|
|
|
|
Section = "Bootstrap";
|
|
|
|
|
Key = "URE_MORE_JAVA_CLASSPATH_URLS";
|
|
|
|
|
Value = "";
|
|
|
|
|
+ ValueList1 = "$ORIGIN/../ure-link/lib";
|
|
|
|
|
#ifdef SYSTEM_HSQLDB
|
|
|
|
|
ValueList1 = HSQLDB_JAR;
|
|
|
|
|
#endif
|
|
|
|
|
--
|
|
|
|
|
1.8.5.3
|
|
|
|
|
|
