CVS: crater/x11-apps/openoffice-src BUILD, 1.13, 1.14 DETAILS, 1.10, 1.11 PRE_BUILD, 1.7, 1.8 build-ooo, 1.8, 1.9

nhudson at lunar-linux.org nhudson at lunar-linux.org
Wed Aug 27 11:49:59 GMT 2003


Update of /var/cvs/lunar/crater/x11-apps/openoffice-src
In directory dbguin.lunar-linux.org:/tmp/cvs-serv2787

Modified Files:
	BUILD DETAILS PRE_BUILD build-ooo 
Log Message:

Ok using system gcc doesnt work, so I am fixing it back also back using cvs HEAD version of the build scripts.  CVS HEAD doesnt build mozilla so this should help out jmhodges and tchan with building.


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/crater/x11-apps/openoffice-src/BUILD,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- BUILD	24 Aug 2003 07:00:33 -0000	1.13
+++ BUILD	27 Aug 2003 11:49:57 -0000	1.14
@@ -3,7 +3,6 @@
 
   ./autogen.sh	--prefix=/usr \
 		--sysconfdir=/etc \
-                --system-gcc      \
  		$OPTS &&
 
   echo "applying patches"         &&

Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/crater/x11-apps/openoffice-src/DETAILS,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- DETAILS	24 Aug 2003 07:00:33 -0000	1.10
+++ DETAILS	27 Aug 2003 11:49:57 -0000	1.11
@@ -3,9 +3,13 @@
           SOURCE=$MODULE-$VERSION.tar.gz
           SOURCE2=RC3_030729.tar.bz2
           SOURCE3=ooo-icons-RC3-3.tar.gz
+          SOURCE4=gcc-3.2.2.tar.bz2
+          SOURCE5=j2sdk-1.4.1-01-linux-i586-gcc3.2.tar.bz2
       SOURCE_URL=cvs://:pserver:anonymous@anoncvs.gnome.org:/cvs/gnome:openoffice
      SOURCE2_URL=http://ooo.ximian.com/packages/RC3_030729/$SOURCE2
-     SOURCE3_URL=http://ooo.ximian.com/packages/$SOURCE6
+     SOURCE3_URL=http://ooo.ximian.com/packages/$SOURCE3
+     SOURCE4_URL=http://ooo.ximian.com/packages/RC3_030729/$SOURCE4
+     SOURCE5_URL=http://ooo.ximian.com/packages/RC3_030729/$SOURCE5
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/openoffice
       MAINTAINER=nhudson at lunar-linux.org
         WEB_SITE=http://ooo.ximian.com

Index: PRE_BUILD
===================================================================
RCS file: /var/cvs/lunar/crater/x11-apps/openoffice-src/PRE_BUILD,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- PRE_BUILD	24 Aug 2003 07:00:33 -0000	1.7
+++ PRE_BUILD	27 Aug 2003 11:49:57 -0000	1.8
@@ -4,6 +4,8 @@
   mkdir -p src
   cp $SOURCE_CACHE/$SOURCE2 src/ &&
   cp $SOURCE_CACHE/$SOURCE3 src/ &&
+  cp $SOURCE_CACHE/$SOURCE4 src/ &&
+  cp $SOURCE_CACHE/$SOURCE5 src/ &&
   mkdir build                    &&
   cd build/                      &&
   unpack $SOURCE2               

Index: build-ooo
===================================================================
RCS file: /var/cvs/lunar/crater/x11-apps/openoffice-src/build-ooo,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- build-ooo	24 Aug 2003 07:00:33 -0000	1.8
+++ build-ooo	27 Aug 2003 11:49:57 -0000	1.9
@@ -27,24 +27,16 @@
 mkdir -p $BUILDDIR/man/man1
 
 # Versions
-#GCC_VER=gcc-3.2.2
-#GCC_TARBALL=gcc-3.2.2.tar.bz2
-#GCC_UNTAR_OPTIONS=jxf
+GCC_VER=gcc-3.2.2
+GCC_TARBALL=gcc-3.2.2.tar.bz2
+GCC_UNTAR_OPTIONS=jxf
 
 # Versions
-#if test ${CVSTAG:0:3} == 'OOO'; then
-#    JDK_VER=j2sdk1.3.1
-#    JDK_TARBALL=j2sdk-1.3.1-FCS-linux-i386.tar.bz2
-#    JDK_UNTAR_OPTIONS=jxf
-
-#    OOO_ICONS_VER=ooo-icons-OOO_1_0_3-1
-#else
-#    JDK_VER=j2sdk1.4.1
-#    JDK_TARBALL=j2sdk-1.4.1-01-linux-i586-gcc3.2.tar.bz2
-#    JDK_UNTAR_OPTIONS=jxf
+JDK_VER=j2sdk1.4.1
+JDK_TARBALL=j2sdk-1.4.1-01-linux-i586-gcc3.2.tar.bz2
+JDK_UNTAR_OPTIONS=jxf
 
 OOO_ICONS_VER=ooo-icons-RC3-3
-#fi
 
 OOO_ICONS_TARBALL=$OOO_ICONS_VER.tar.gz
 OOO_ICONS_UNTAR_OPTIONS=xzf
@@ -82,21 +74,21 @@
 cd $BUILDDIR
 
 ## unpack the Jdk
-#PKG_VER=$JDK_VER
+PKG_VER=$JDK_VER
 
-#if test -f $BUILDDIR/$PKG_VER/$STAMP; then
-#	echo "Skipping $PKG_VER";
-#	ln -sfn $PKG_VER $BUILDDIR/jdk
-#else
-#	echo "Unpacking $PKG_VER";
-#	cd $BUILDDIR
-#	if test "z$WITH_SRC" = "z"; then
-#	    tar $JDK_UNTAR_OPTIONS $SRCDIR/$JDK_TARBALL || exit 1;
-#	fi
-# Link it into where we expect it in the path
-#	ln -sfn $PKG_VER $BUILDDIR/jdk
-#	touch $BUILDDIR/$PKG_VER/$STAMP || exit 1;
-#fi
+if test -f $BUILDDIR/$PKG_VER/$STAMP; then
+	echo "Skipping $PKG_VER";
+	ln -sfn $PKG_VER $BUILDDIR/jdk
+else
+	echo "Unpacking $PKG_VER";
+	cd $BUILDDIR
+	if test "z$WITH_SRC" = "z"; then
+	    tar $JDK_UNTAR_OPTIONS $SRCDIR/$JDK_TARBALL || exit 1;
+	fi
+ Link it into where we expect it in the path
+	ln -sfn $PKG_VER $BUILDDIR/jdk
+	touch $BUILDDIR/$PKG_VER/$STAMP || exit 1;
+fi
 
 PKG_VER=$OOO_ICONS_VER
 
@@ -113,22 +105,22 @@
 fi
 
 # build gcc
-#PKG_VER=$GCC_VER
+PKG_VER=$GCC_VER
                                                                                 
 # -- evil cut --
-#if test -f $BUILDDIR/$PKG_VER/$STAMP; then
-#        echo "Skipping $PKG_VER";
-#else
-#        echo "Building $PKG_VER";
-#        cd $BUILDDIR
-#        if test "z$WITH_SRC" = "z"; then
-#            tar $GCC_UNTAR_OPTIONS $SRCDIR/$GCC_TARBALL || exit 1;
-#        fi
-#        cd $PKG_VER
-#        ./configure --prefix=$BUILDDIR --enable-static --disable-shared --enable-languages=c++ || exit 1;
-#        make && make install || exit 1;
-#        touch $BUILDDIR/$PKG_VER/$STAMP
-#fi
+if test -f $BUILDDIR/$PKG_VER/$STAMP; then
+        echo "Skipping $PKG_VER";
+else
+        echo "Building $PKG_VER";
+        cd $BUILDDIR
+        if test "z$WITH_SRC" = "z"; then
+            tar $GCC_UNTAR_OPTIONS $SRCDIR/$GCC_TARBALL || exit 1;
+        fi
+        cd $PKG_VER
+        ./configure --prefix=$BUILDDIR --enable-static --disable-shared --enable-languages=c++ || exit 1;
+        make && make install || exit 1;
+        touch $BUILDDIR/$PKG_VER/$STAMP
+fi
 # -- cut --
 
         echo "Removing custom icons";




More information about the Lunar-commits mailing list