[ooo-build-commit] 2 commits - bin/unpack patches/dev300

[Tor Lillqvist]

 bin/unpack                        |   38 ++++++++++++--------------------------
 patches/dev300/apply              |    3 +++
 patches/dev300/win32-interix.diff |   22 ++++++++++++++++++++++
 3 files changed, 37 insertions(+), 26 deletions(-)

New commits:
commit b090e9e3ac9fe68720602e1a95119bcc4d69fa3a
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Sep 28 11:42:06 2009 +0300

    Minor experimental Interix fix
    
    * patches/dev300/something.diff: New patch. Recongnize Interix in
      upstream config.guess and configure.in.
    
    * patches/dev300/apply: Add it to Fixes.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 994a1c1..3bcd4d1 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3049,6 +3049,9 @@ win32-sdk7.diff, tml
 # Build also against DirectX SDK August 2009
 win32-dxsdk-200908.diff, tml
 
+# Experimental support for Interix
+win32-interix.diff, tml
+
 [ Fixes ]
 # fix problem with calling private and protected members in layout code
 sfx2-privateprotectedpublic.diff
commit 59e63059315146e334ccd34bc8c1b994a7cc7751
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Sep 28 11:36:42 2009 +0300

    Minor cleanup
    
    * bin/unpack: Drop unnecessary repeated cd commands to the same
      BUILDDIR. Remove duplicated Ant unpack sequence, have it outside
      Win32 conditional.

diff --git a/bin/unpack b/bin/unpack
index 736e0f4..fe9a69b 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -371,7 +371,6 @@ fi
 if test "z$BUILD_WIN32" != "z"; then
 
     # gdiplus.dll
-    cd $BUILDDIR;
     if test -f $OOBUILDDIR/external/gdiplus/gdiplus.dll; then
     	echo "Already have gdiplus.dll"
     else
@@ -379,7 +378,6 @@ if test "z$BUILD_WIN32" != "z"; then
     fi
 
     # dbghelp
-    cd $BUILDDIR;
     if test -f $OOBUILDDIR/external/dbghelp/DbgHelp.Dll; then
 	echo "Already have dbghelp";
     else
@@ -402,7 +400,6 @@ if test "z$BUILD_WIN32" != "z"; then
 	NovellWin32*|GoOoWin32*)
 	    ;;
 	*)
-	    cd $BUILDDIR;
 	    if test -f $OOBUILDDIR/external/unicows/unicows.dll; then
 		echo "Already have unicows";
 	    else
@@ -421,19 +418,6 @@ if test "z$BUILD_WIN32" != "z"; then
 	    ;;
     esac
 
-    cd $BUILDDIR;
-    APACHE_ANT='apache-ant-1.7.0'
-    APACHE_ANT_TARBALL=$APACHE_ANT-bin.tar.gz
-    if test -f $SRCDIR/$APACHE_ANT_TARBALL; then
-	$echo_n "Extracting ant $echo_c"
-	(gunzip -dc $SRCDIR/$APACHE_ANT_TARBALL | $GNUTAR xpf - )|| exit 1;
-	echo "done";
-    else
-	echo "Don't need to unpack ant";
-    fi
-
-    cd $BUILDDIR;
-
     # Bypass the Mozilla source bits for now
     if false; then
 
@@ -602,19 +586,21 @@ else
         $GNUCP $SRCDIR/$BUILD_MOZILLA_SOURCE $OOBUILDDIR/moz/download/ || exit 1
     fi
 
-    cd $BUILDDIR;
-    APACHE_ANT='apache-ant-1.7.0'
-    APACHE_ANT_TARBALL=$APACHE_ANT-bin.tar.gz
-    if test -f $SRCDIR/$APACHE_ANT_TARBALL; then
-	$echo_n "Extracting ant $echo_c"
-	(gunzip -dc $SRCDIR/$APACHE_ANT_TARBALL | $GNUTAR xpf - )|| exit 1;
-	echo "done";
-    else
-	echo "Don't need to unpack ant";
-    fi
+fi
 
+APACHE_ANT='apache-ant-1.7.0'
+APACHE_ANT_TARBALL=$APACHE_ANT-bin.tar.gz
+check_file $SRCDIR/$APACHE_ANT_TARBALL
+
+if test -f $SRCDIR/$APACHE_ANT_TARBALL; then
+    $echo_n "Extracting ant $echo_c"
+    (gunzip -dc $SRCDIR/$APACHE_ANT_TARBALL | $GNUTAR xpf - )|| exit 1;
+    echo "done";
+else
+    echo "Don't need to unpack ant";
 fi
 
+
 case "$DISTRO" in
     NovellWin32*|GoOoWin32*)
     echo "Creating prebuilt writing aids extension (dict-bundle.oxt)..."
diff --git a/patches/dev300/win32-interix.diff b/patches/dev300/win32-interix.diff
new file mode 100644
index 0000000..e5d9817
--- /dev/null
+++ b/patches/dev300/win32-interix.diff
@@ -0,0 +1,22 @@
+--- config.guess
++++ config.guess
+@@ -789,7 +789,7 @@
+     i*:PW*:*)
+ 	echo ${UNAME_MACHINE}-pc-pw32
+ 	exit 0 ;;
+-    x86:Interix*:[34]*)
++    x86:Interix*:[3-6]*)
+ 	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
+ 	exit 0 ;;
+     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+--- configure.in
++++ configure.in
+@@ -987,7 +987,7 @@
+ 		test_cups=no
+ 		_os=GNU
+ 		;;
+-	cygwin*) # Windows
++	cygwin*|interix*) # Windows
+ 		test_cups=no
+ 		test_cairo=yes
+ 		test_freetype=no