[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/openoffice.org/FC-4 openoffice.org-1.9.88.NONE.gcc3gcj4.patch, 1.3, 1.4



Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv14111

Modified Files:
	openoffice.org-1.9.88.NONE.gcc3gcj4.patch 
Log Message:
rh#172149# gcj sed script not being used for ant driven stuff

openoffice.org-1.9.88.NONE.gcc3gcj4.patch:
 bean/native/unix/makefile.mk                 |    7 +++++++
 inc/ant.mk                                   |    0 
 jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx |    2 ++
 native/unix/makefile.mk                      |    0 
 solenv/inc/ant.mk                            |    4 ++--
 5 files changed, 11 insertions(+), 2 deletions(-)

Index: openoffice.org-1.9.88.NONE.gcc3gcj4.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org-1.9.88.NONE.gcc3gcj4.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openoffice.org-1.9.88.NONE.gcc3gcj4.patch	1 Apr 2005 11:45:25 -0000	1.3
+++ openoffice.org-1.9.88.NONE.gcc3gcj4.patch	2 Nov 2005 13:20:13 -0000	1.4
@@ -31,3 +31,28 @@
          "gij",
          "bin/gij",
      };
+Index: inc/ant.mk
+===================================================================
+RCS file: /cvs/tools/solenv/inc/ant.mk,v
+retrieving revision 1.28
+diff -u -p -u -r1.28 ant.mk
+--- openoffice.org.orig/solenv/inc/ant.mk	8 Sep 2005 09:33:09 -0000	1.28
++++ openoffice.org/solenv/inc/ant.mk	2 Nov 2005 13:17:14 -0000
+@@ -39,7 +39,7 @@
+ JDK_VERSION=140
+ JAVA_HOME=$(JDK14PATH)
+ 
+-PATH!:=$(JDK14PATH)$/bin$(PATH_SEPERATOR)$(PATH)
++#PATH!:=$(JDK14PATH)$/bin$(PATH_SEPERATOR)$(PATH)
+ XCLASSPATH:=$(JDK14PATH)$/jre/lib/rt.jar
+ CLASSPATH:=$(XCLASSPATH)
+ .ENDIF
+@@ -62,7 +62,7 @@ ANT_HOME*:=$(COMMON_BUILD_TOOLS)$/apache
+ ANT_LIB*:=$(ANT_HOME)$/lib
+ 
+ ANT_CLASSPATH:=$(ANT_LIB)$/xercesImpl.jar$(PATH_SEPERATOR)$(ANT_LIB)$/xml-apis.jar$(PATH_SEPERATOR)$(ANT_LIB)$/ant.jar
+-PATH!:=$(ANT_HOME)$/bin$(PATH_SEPERATOR)$(PATH)
++#PATH!:=$(ANT_HOME)$/bin$(PATH_SEPERATOR)$(PATH)
+ 
+ .IF "$(ANT)" == ""
+ ANT*:=$(ANT_HOME)$/bin$/ant


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]