rpms/openoffice.org/devel openoffice.org.spec, 1.670, 1.671 workspace.targetedaot.patch, 1.3, 1.4
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Sat Apr 22 17:21:45 UTC 2006
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15699
Modified Files:
openoffice.org.spec workspace.targetedaot.patch
Log Message:
whack targetedaot into shape
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.670
retrieving revision 1.671
diff -u -r1.670 -r1.671
--- openoffice.org.spec 22 Apr 2006 08:51:05 -0000 1.670
+++ openoffice.org.spec 22 Apr 2006 17:21:41 -0000 1.671
@@ -86,7 +86,7 @@
%endif
%if %{build_rhel4}
-%define extraflags %{javabitsflags} %{xmlsecflags} %{libwpdflags} %{icuflags} %{aggflags} %{stlflags} --with-ant-home=$MY_ANT_HOME
+%define extraflags %{javabitsflags} %{xmlsecflags} %{libwpdflags} %{icuflags} %{aggflags} %{stlflags} --with-ant-home=$MY_ANT_HOME --with-java=%{gij}
%else
%define extraflags %{javabitsflags} %{xmlsecflags} %{libwpdflags} %{icuflags} %{aggflags} %{stlflags}
%endif
@@ -1194,7 +1194,7 @@
export CC=gcc4
export CXX=g++4
%endif
-%configure --with-java=%{gij} --disable-crashdump --disable-epm --disable-qadevooo --disable-odk --disable-fontooo --disable-mathmldtd --disable-pasf --enable-symbols --enable-openldap --enable-evolution2 --enable-xsltproc --with-system-libs --with-system-python --with-system-mozilla --with-system-boost --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt --without-system-mspack --without-fonts --without-nas --without-gpc --without-ppds --without-afms --enable-atkbridge --with-images=industrial %{extraflags} %{withlang}
+%configure --disable-crashdump --disable-epm --disable-qadevooo --disable-odk --disable-fontooo --disable-mathmldtd --disable-pasf --enable-gcjaot --enable-symbols --enable-openldap --enable-atkbridge --enable-evolution2 --enable-xsltproc --with-system-libs --with-system-python --with-system-mozilla --with-system-boost --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt --without-system-mspack --without-fonts --without-nas --without-gpc --without-ppds --without-afms --with-images=industrial %{extraflags} %{withlang}
cd ..
./bootstrap
source Linux*Env.Set.sh
@@ -1229,13 +1229,15 @@
done
export ARCH_FLAGS
-
+%if %{build_rhel4}
# gcc#19870# gcj access problems, monsterous hack to force all java through
# a sed script which replaces private and protected with public, shudder!
+# ecj is not available on rhel4
cp %{SOURCE7} solenv/bin/gcj
chmod u+x solenv/bin/gcj
export TRUEJAVACOMPILER=$JAVACOMPILER
export JAVACOMPILER=`pwd`/solenv/bin/gcj
+%endif
%if %{internaljavabits}
export ARCH_FLAGS="$ARCH_FLAGS -fno-strict-aliasing"
workspace.targetedaot.patch:
bin/deliver.pl | 0
config_office/gconfigure.in | 59 ++++++++++++++++----------
config_office/gset_soenv.in | 7 ---
filter/gsource/config/fragments/makefile.mk | 4 +
filter/gsource/config/tools/merge/makefile.mk | 3 +
helpcontent2/gutil/target.pmk | 4 +
inc/settings.mk | 0
inc/target.mk | 0
inc/tg_jar.mk | 0
prj/d.lst | 0
solenv/gbin/deliver.pl | 19 --------
solenv/ginc/settings.mk | 4 -
solenv/ginc/target.mk | 6 ++
solenv/ginc/tg_jar.mk | 14 ++++++
source/com/sun/star/help/makefile.mk | 0
source/config/fragments/makefile.mk | 0
source/config/tools/merge/makefile.mk | 0
util/target.pmk | 0
xmlhelp/gprj/d.lst | 1
xmlhelp/gsource/com/sun/star/help/makefile.mk | 3 +
20 files changed, 75 insertions(+), 49 deletions(-)
Index: workspace.targetedaot.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace.targetedaot.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- workspace.targetedaot.patch 10 Mar 2006 18:54:59 -0000 1.3
+++ workspace.targetedaot.patch 22 Apr 2006 17:21:41 -0000 1.4
@@ -1,29 +1,165 @@
+Index: configure.in
+===================================================================
+RCS file: /cvs/tools/config_office/configure.in,v
+retrieving revision 1.161
+diff -u -r1.161 configure.in
+--- openoffice.org.orig/config_office/gconfigure.in 29 Mar 2006 12:47:51 -0000 1.161
++++ openoffice.org/config_office/gconfigure.in 22 Apr 2006 16:24:12 -0000
+@@ -340,6 +340,15 @@
+ or XML filters. Use --with-java=gij to enable gij/gcj
+ as java/javac replacements
+ ], if test "$withval" = "yes"; then WITH_JAVA=java; else WITH_JAVA=$withval; fi, WITH_JAVA=java)
++AC_ARG_ENABLE(gcjaot,
++[ --enable-gcjaot Build with[[out]] using Ahead of Time java compilation support.
++ If you have gcj installed then --with-aot will enable gcj ahead of time
++ support for a (hopefully) faster build. This does not require you to
++ use gcj to compile the java code contained in OpenOffice.org, this is an
++ additional step taken to compile to native binaries the java helpers used
++ during buildtime which have already been built to bytecode from the compiler
++ used in --with-java
++],,)
+ AC_ARG_WITH(ant-home,
+ [ --with-ant-home If you have installed Jakarta Ant on your system,
+ please supply the path here.
+@@ -386,7 +395,7 @@
+ [ --with-nmake-path For MS Visual Toolkit compiler users, please supply
+ the path pointing to the nmake.exe. The Platform SDK
+ provides one in the Win64 directory, usually something
+- like: /cygdrive/c/Programme/Microsoft SDK/Bin/Win64"
++ like: "/cygdrive/c/Programme/Microsoft SDK/Bin/Win64"
+
+ Usage: --with-nmake-path=<absolute path to nmake.exe>
+ ],,)
+@@ -2102,33 +2111,41 @@
+ fi
+
+ dnl ===================================================================
+-dnl Check for optional gcj-dbtool, use if compiler is gcj
++dnl Check for optional gcj for AOT
+ dnl ===================================================================
+-if test `$JAVACOMPILER --version 2>&1 | grep -c "gcj"` -gt 0; then
+- if test `echo $WITH_JAVA | grep -c "gij"` -eq 0; then
+- javacache="gcj-dbtool"
+- else
+- javacache=`echo $WITH_JAVA | $SED -e "s/gij/gcj-dbtool/g"`
+- fi
+- if test -z "$with_jdk_home"; then
+- AC_PATH_PROG(JAVACACHE, $javacache)
+- else
+- _javac_path="$with_jdk_home/bin/$javacache"
+- dnl Check if there is a gcj-dbtool at all.
+- if test -x "$_javac_path"; then
+- JAVACACHE=$_javac_path
+- fi
+- fi
+- if test -z "$JAVACACHE"; then
+- AC_MSG_WARN([$javacache not found set with_jdk_home])
+- fi
++if test "$SOLAR_JAVA" != ""; then
++ AC_MSG_CHECKING([whether to enable gcj aot compilation])
++ if test -n "$enable_gcjaot" && test "$enable_gcjaot" != "no"; then
++ AC_MSG_RESULT([yes])
++ if test `echo $WITH_JAVA | grep -c "gij"` -eq 0; then
++ gcjaot="gcj"
++ else
++ gcjaot=`echo $WITH_JAVA | $SED -e "s/gij/gcj/g"`
++ fi
++ AC_MSG_RESULT([$gcjaot])
++ if test -n "$with_jdk_home"; then
++ _javac_path="$with_jdk_home/bin/$gcjaot"
++ dnl Check if there is a gcj-dbtool at all.
++ if test -x "$_javac_path"; then
++ JAVAAOTCOMPILER=$_javac_path
++ fi
++ fi
++ if test -z "$JAVAAOTCOMPILER"; then
++ AC_PATH_PROG(JAVAAOTCOMPILER, $gcjaot)
++ fi
++ if test -z "$JAVAAOTCOMPILER,"; then
++ AC_MSG_WARN([$gcjaot not found, set with_jdk_home])
++ fi
++ else
++ AC_MSG_RESULT([no])
++ fi
+ fi
+
+ AC_SUBST(JAVA_HOME)
+ AC_SUBST(JDK)
+ AC_SUBST(JAVAINTERPRETER)
+ AC_SUBST(JAVACOMPILER)
+-AC_SUBST(JAVACACHE)
++AC_SUBST(JAVAAOTCOMPILER)
+ AC_SUBST(JAVADOC)
+
+ if test "$NEEDXSLTPROC" = "no" && test -z "$enable_xsltproc"; then
+Index: set_soenv.in
+===================================================================
+RCS file: /cvs/tools/config_office/set_soenv.in,v
+retrieving revision 1.97
+diff -u -r1.97 set_soenv.in
+--- openoffice.org.orig/config_office/gset_soenv.in 7 Apr 2006 08:02:29 -0000 1.97
++++ openoffice.org/config_office/gset_soenv.in 22 Apr 2006 16:24:14 -0000
+@@ -78,7 +78,7 @@
+ $UPD, $SOLARUPD, $WORK_STAMP, $TF_UCB,
+ $SOLARROOT, $SOLARSRC, $DEVROOT, $SOLARVER, $SOLARVERSION, $SOLARENV,
+ $STAR_INIROOT, $STAR_INIROOTOLD, $STAR_STANDLST, $STAR_SSCOMMON, $STAR_SSOLARINI,
+- $STAR_REGISTRY, $STAR_RESOURCEPATH, $DMAKEROOT, $CLASSPATH, $XCLASSPATH, $COMPATH, $GCJ_DATABASE,
++ $STAR_REGISTRY, $STAR_RESOURCEPATH, $DMAKEROOT, $CLASSPATH, $XCLASSPATH, $COMPATH,
+ $MSPDB_PATH, $MIDL_PATH, $CSC_PATH, $NMAKE_PATH,
+ $LD_LIBRARY_PATH, $PATH, $SOLARDEF, $SOLAREXTRAINC, $SOLAREXTRALIB, $SOLARLIB,
+ $SOLARINC, $LOCALINI, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $MULTITHREAD_OBJ, $PERL,
+@@ -895,8 +895,6 @@
+ # Location of the JDK supported standard classes.zip file.
+ # see above for why the change
+ $XCLASSPATH = '$JAVA_HOME'.$ds.'jre'.$LIB.$ds."rt.jar".$ps.'.';
+-# Location of gcj cache
+-$GCJ_DATABASE = '$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.$ds."openoffice.org.gcjdb";
+
+ # Paths to run time shared libraries.
+ if ($platform =~ m/solaris/)
+@@ -1655,8 +1653,6 @@
+ ToFile( "XCLASSPATH", $XCLASSPATH, "e" );
+ }
+ else {
+- ToFile( "GCJ_DATABASE", $GCJ_DATABASE, "e" );
+- ToFile( "JAVACACHE", '@JAVACACHE@', "e" );
+ ToFile( "AWTLIB", '@AWTLIB@', "e" );
+ }
+ if ( '@JDK@' ne '' )
+@@ -1664,6 +1660,7 @@
+ ToFile( "JDK", "@JDK@", "e" );
+ ToFile( "JAVAINTERPRETER", "@JAVAINTERPRETER@","e" );
+ ToFile( "JAVACOMPILER", "@JAVACOMPILER@", "e" );
++ ToFile( "JAVAAOTCOMPILER", '@JAVAAOTCOMPILER@',"e" );
+ ToFile( "JAVADOC", "@JAVADOC@", "e" );
+ }
+ if ( $platform =~ m/darwin/ )
Index: source/config/fragments/makefile.mk
===================================================================
RCS file: /cvs/framework/filter/source/config/fragments/makefile.mk,v
-retrieving revision 1.16.16.1
-diff -u -r1.16.16.1 makefile.mk
---- openoffice.org.orig/filter/source/config/fragments/makefile.mk 17 Jan 2006 11:03:31 -0000 1.16.16.1
-+++ openoffice.org/filter/source/config/fragments/makefile.mk 26 Jan 2006 11:09:31 -0000
+retrieving revision 1.17
+diff -u -r1.17 makefile.mk
+--- openoffice.org.orig/filter/gsource/config/fragments/makefile.mk 16 Mar 2006 11:08:21 -0000 1.17
++++ openoffice.org/filter/gsource/config/fragments/makefile.mk 22 Apr 2006 16:28:44 -0000
@@ -155,7 +155,11 @@
#cmc, hack to workaround the java build requirement
MERGE:=python ../tools/merge/pyAltFCFGMerge
.ELSE
-+.IF "$(JAVACACHE)" != ""
++.IF "$(JAVAAOTCOMPILER)" != ""
+MERGE := $(BIN)$/FCFGMerge
+.ELSE
MERGE := $(JAVAI) -jar $(CLASSDIR)$/FCFGMerge.jar
+.ENDIF
- XALAN_JAR*=$(SOLARBINDIR)$/xalan.jar
- PACKLANG := $(JAVAI) $(JAVACPS) $(XALAN_JAR) org.apache.xalan.xslt.Process -XSL langfilter.xsl
+ PACKLANG := $(JAVAI) $(JAVACPS) $(SOLARBINDIR)/xalan.jar org.apache.xalan.xslt.Process -XSL langfilter.xsl
.ENDIF
+
Index: source/config/tools/merge/makefile.mk
===================================================================
RCS file: /cvs/framework/filter/source/config/tools/merge/makefile.mk,v
retrieving revision 1.5
diff -u -r1.5 makefile.mk
---- openoffice.org.orig/filter/source/config/tools/merge/makefile.mk 8 Sep 2005 21:35:57 -0000 1.5
-+++ openoffice.org/filter/source/config/tools/merge/makefile.mk 26 Jan 2006 11:09:33 -0000
+--- openoffice.org.orig/filter/gsource/config/tools/merge/makefile.mk 8 Sep 2005 21:35:57 -0000 1.5
++++ openoffice.org/filter/gsource/config/tools/merge/makefile.mk 22 Apr 2006 16:29:21 -0000
@@ -75,6 +75,9 @@
JARTARGET = $(TARGET).jar
@@ -37,39 +173,27 @@
Index: util/target.pmk
===================================================================
RCS file: /cvs/documentation/helpcontent2/util/target.pmk,v
-retrieving revision 1.12
-diff -u -r1.12 target.pmk
---- openoffice.org.orig/helpcontent2/util/target.pmk 5 Jan 2006 14:44:39 -0000 1.12
-+++ openoffice.org/helpcontent2/util/target.pmk 26 Jan 2006 11:11:17 -0000
-@@ -42,6 +42,11 @@
-
- .IF "$(SYSTEM_DB)" != "YES"
- JAVA_LIBRARY_PATH= -Djava.library.path=$(SOLARSHAREDBIN)
-+.ELSE
-+.IF "$(JAVACACHE)" != ""
-+CLASSPATH!:=$(my_cp)
-+.EXPORT : CLASSPATH
-+.ENDIF
- .ENDIF
-
- .IF "$(JDK)" != "gcj"
-@@ -50,5 +55,8 @@
+retrieving revision 1.13
+diff -u -r1.13 target.pmk
+--- openoffice.org.orig/helpcontent2/gutil/target.pmk 16 Mar 2006 11:10:20 -0000 1.13
++++ openoffice.org/helpcontent2/gutil/target.pmk 22 Apr 2006 16:37:36 -0000
+@@ -50,5 +50,9 @@
$(LINKALLTARGETS) : $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/$$(@:b:s/_/./:e:s/.//)/$i) $(subst,LANGUAGE,$$(@:b:s/_/./:e:s/.//) $(LINKADDEDDEPS)) $(COMMONMISC)$/xhp_changed.flag
@+-$(MKDIR) -p $(@:d)
-+.IF "$(JAVACACHE)" != ""
++.IF "$(JAVAAOTCOMPILER)" != ""
+ HelpLinker @$(mktmp -mod $(LINKNAME) -hid $(PRJ)$/helpers/hid.lst -src $(COMMONMISC) -sty $(PRJ)$/source$/auxiliary$/embed.xsl -idx $(PRJ)$/source$/auxiliary$/index.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@)
-+.ELSE
- $(JAVAI) $(JAVA_VM_HEAP_SIZE) $(JAVA_LIBRARY_PATH) -cp $(my_cp) com.sun.star.help.HelpLinker @$(mktmp -mod $(LINKNAME) -hid $(PRJ)$/helpers/hid.lst -src $(COMMONMISC) -sty $(PRJ)$/source$/auxiliary$/embed.xsl -idx $(PRJ)$/source$/auxiliary$/index.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@)
--
++ .ELSE
+ $(JAVAI) $(JAVA_VM_HEAP_SIZE) $(JAVA_LIBRARY_PATH) -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl -Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl -cp $(my_cp) com.sun.star.help.HelpLinker @$(mktmp -mod $(LINKNAME) -hid $(PRJ)$/helpers/hid.lst -src $(COMMONMISC) -sty $(PRJ)$/source$/auxiliary$/embed.xsl -idx $(PRJ)$/source$/auxiliary$/index.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@)
+.ENDIF
+
Index: bin/deliver.pl
===================================================================
RCS file: /cvs/tools/solenv/bin/deliver.pl,v
retrieving revision 1.98
diff -u -r1.98 deliver.pl
---- openoffice.org.orig/solenv/bin/deliver.pl 13 Jan 2006 16:36:04 -0000 1.98
-+++ openoffice.org/solenv/bin/deliver.pl 26 Jan 2006 11:09:09 -0000
+--- openoffice.org.orig/solenv/gbin/deliver.pl 13 Jan 2006 16:36:04 -0000 1.98
++++ openoffice.org/solenv/gbin/deliver.pl 22 Apr 2006 16:38:19 -0000
@@ -744,19 +744,6 @@
return $rc;
};
@@ -113,39 +237,41 @@
Index: inc/settings.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/settings.mk,v
-retrieving revision 1.184
-diff -u -r1.184 settings.mk
---- openoffice.org.orig/solenv/inc/settings.mk 13 Jan 2006 16:36:21 -0000 1.184
-+++ openoffice.org/solenv/inc/settings.mk 26 Jan 2006 11:09:10 -0000
-@@ -188,7 +188,7 @@
+retrieving revision 1.188
+diff -u -r1.188 settings.mk
+--- openoffice.org.orig/solenv/ginc/settings.mk 9 Mar 2006 14:01:40 -0000 1.188
++++ openoffice.org/solenv/ginc/settings.mk 22 Apr 2006 16:39:26 -0000
+@@ -188,10 +188,6 @@
#required arguments
- .IF "$(JAVACACHE)" != ""
- JAVAC=$(JAVACOMPILER) --encoding=ISO-8859-15 -O2 -fno-assert -Wno-deprecated -C
--JAVAI=$(JAVAINTERPRETER) -Dgnu.gcj.precompiled.db.path=$(GCJ_DATABASE)
-+JAVAI=$(JAVAINTERPRETER)
- .ELSE
JAVAC=$(JAVACOMPILER)
JAVAI=$(JAVAINTERPRETER)
+-.IF "$(JAVACACHE)" != ""
+-JAVAC+=--encoding=UTF-8 -O2 -fno-assert -Wno-deprecated -C
+-JAVAI+=-Dgnu.gcj.precompiled.db.path=$(GCJ_DATABASE)
+-.ENDIF
+
+ #classpath and response
+ .IF "$(JDK)" == "J++"
Index: inc/target.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/target.mk,v
-retrieving revision 1.162
-diff -u -r1.162 target.mk
---- openoffice.org.orig/solenv/inc/target.mk 14 Dec 2005 15:37:20 -0000 1.162
-+++ openoffice.org/solenv/inc/target.mk 26 Jan 2006 11:09:12 -0000
+retrieving revision 1.165
+diff -u -r1.165 target.mk
+--- openoffice.org.orig/solenv/ginc/target.mk 7 Apr 2006 08:01:46 -0000 1.165
++++ openoffice.org/solenv/ginc/target.mk 22 Apr 2006 16:39:29 -0000
@@ -437,6 +437,11 @@
JARTARGETDEP=$(JARTARGET).dep
JARTARGETDEPN=$(MISC)$/$(JARTARGET).dep
.ENDIF # "$(NOJARDEP)$(NEW_JAR_PACK)"==""
+.IF "$(AOTTARGET)"!=""
-+.IF "$(JAVACACHE)" != ""
++.IF "$(JAVAAOTCOMPILER)" != ""
+AOTTARGETN=$(SOLARBINDIR)$/$(AOTTARGET)
-+.ENDIF # "$(JAVACACHE)" != ""
++.ENDIF # "$(JAVAAOTCOMPILER)" != ""
+.ENDIF # "$(AOTTARGET)"!=""
.ENDIF # "$(JARTARGET)"!=""
.ELSE # "$(SOLAR_JAVA)"!=""
JAVACLASSFILES:=
-@@ -1791,6 +1796,7 @@
+@@ -1790,6 +1795,7 @@
$(APP1TARGETN) $(APP2TARGETN) $(APP3TARGETN) \
$(APP4TARGETN) $(APP5TARGETN) $(APP6TARGETN) \
$(APP7TARGETN) $(APP8TARGETN) $(APP9TARGETN) \
@@ -158,9 +284,9 @@
RCS file: /cvs/tools/solenv/inc/tg_jar.mk,v
retrieving revision 1.18
diff -u -r1.18 tg_jar.mk
---- openoffice.org.orig/solenv/inc/tg_jar.mk 14 Dec 2005 15:37:35 -0000 1.18
-+++ openoffice.org/solenv/inc/tg_jar.mk 26 Jan 2006 11:09:12 -0000
-@@ -90,5 +108,19 @@
+--- openoffice.org.orig/solenv/ginc/tg_jar.mk 14 Dec 2005 15:37:35 -0000 1.18
++++ openoffice.org/solenv/ginc/tg_jar.mk 22 Apr 2006 16:39:30 -0000
+@@ -90,5 +90,19 @@
+cd $(CLASSDIR)$/$(TARGET) && zip -u -rX ..$/$(@:f) $(subst,$(CLASSDIR)$/$(TARGET)$/, $(JARMANIFEST)) $(CHECKZIPRESULT)
.ENDIF # "$(JARMANIFEST)"!=""
+cd $(CLASSDIR) && zip -u -rX $(@:f) $(subst,\,/ $(JARCLASSDIRS)) $(CHECKZIPRESULT)
@@ -170,10 +296,10 @@
+AOTLINKFLAGS=$(subst,.so, $(subst,$(SOLARLIBDIR)$/lib,-l $(AOTFILES)))
+
+$(SOLARLIBDIR)$/lib%.jar.so : $(SOLARBINDIR)$/%.jar
-+ $(JAVACOMPILER) -shared -fPIC -Wl,-Bsymbolic -O2 --no-bounds-check -fno-store-check -findirect-dispatch -fjni -o $@ $<
++ $(JAVAAOTCOMPILER) -shared -fPIC -Wl,-Bsymbolic -O2 --no-bounds-check -fno-store-check -findirect-dispatch -fjni -o $@ $<
+
+$(AOTTARGETN) : $(JARTARGETN) $(AOTFILES)
-+ $(JAVACOMPILER) --main=$(AOTCLASSNAME) -o $(BIN)$/$(AOTTARGET) \
++ $(JAVAAOTCOMPILER) --main=$(AOTCLASSNAME) -o $(BIN)$/$(AOTTARGET) \
+ -Wl,-Bsymbolic -O2 --no-bounds-check -fno-store-check -findirect-dispatch -fjni \
+ $(JAVACPS) $(CLASSPATH) $(JARTARGETN) $(SOLARLIB) -L$(LB) \
+ $(AOTLINKFLAGS)
@@ -185,8 +311,8 @@
RCS file: /cvs/util/xmlhelp/prj/d.lst,v
retrieving revision 1.13
diff -u -r1.13 d.lst
---- openoffice.org.orig/xmlhelp/prj/d.lst 16 Jan 2006 12:34:13 -0000 1.13
-+++ openoffice.org/xmlhelp/prj/d.lst 26 Jan 2006 10:57:58 -0000
+--- openoffice.org.orig/xmlhelp/gprj/d.lst 16 Jan 2006 12:34:13 -0000 1.13
++++ openoffice.org/xmlhelp/gprj/d.lst 22 Apr 2006 16:40:37 -0000
@@ -1,4 +1,5 @@
..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.*
+..\%__SRC%\bin\HelpLinker %_DEST%\bin%_EXT%\HelpLinker
@@ -196,10 +322,10 @@
Index: source/com/sun/star/help/makefile.mk
===================================================================
RCS file: /cvs/util/xmlhelp/source/com/sun/star/help/makefile.mk,v
-retrieving revision 1.21.2.1
-diff -u -r1.21.2.1 makefile.mk
---- openoffice.org.orig/xmlhelp/source/com/sun/star/help/makefile.mk 19 Jan 2006 14:48:36 -0000 1.21.2.1
-+++ openoffice.org/xmlhelp/source/com/sun/star/help/makefile.mk 26 Jan 2006 10:57:59 -0000
+retrieving revision 1.22
+diff -u -r1.22 makefile.mk
+--- openoffice.org.orig/xmlhelp/gsource/com/sun/star/help/makefile.mk 16 Mar 2006 11:17:16 -0000 1.22
++++ openoffice.org/xmlhelp/gsource/com/sun/star/help/makefile.mk 22 Apr 2006 16:40:45 -0000
@@ -96,6 +96,9 @@
JARCOMPRESS = TRUE
CUSTOMMANIFESTFILE = manifest
More information about the fedora-cvs-commits
mailing list