Fix some trivial errors and implemented the restore of IRIX xattrs.

[bacula/bacula] / bacula / src / win32 / build-win32-cross-tools

diff --git a/bacula/src/win32/build-win32-cross-tools b/bacula/src/win32/build-win32-cross-tools
index bf6f612b999c15ae64cc7aab04b38a9047acc641..9d05f88de9e6eb9e87bc385831f7a3f8b8ec4ec4 100755 (executable)
--- a/bacula/src/win32/build-win32-cross-tools
+++ b/bacula/src/win32/build-win32-cross-tools
@@ -42,6 +42,7 @@
 
 # Directory where cross-tools directory will be placed
 TOPDIR=../../..
+TOPDIR=${DEPKGS:-${TOPDIR}}
 # Cross tools directory name under TOPDIR
 CROSSTOOLS=cross-tools
 # What flavor of GCC cross-compiler are we building? under CROSSTOOLS
@@ -52,6 +53,7 @@ cwd=`pwd`
 cd ${TOPDIR}
 # Make TOPDIR absolute 
 TOPDIR=`pwd`
+TOPDIR=${DEPKGS:-${TOPDIR}}
 
 cd ${cwd}/`dirname $0`
 SCRIPTDIR=`pwd`
@@ -85,7 +87,8 @@ PURGE_DIR="Y"
 # You need to set both the URL they will be downloaded from
 # and the exact name of the individual component files.
 
-MINGW_URL="http://heanet.dl.sourceforge.net/sourceforge/mingw"
+#MINGW_URL="http://superb-west.dl.sourceforge.net/sourceforge/mingw"
+MINGW_URL="http://www.bacula.org/cross-tools"
 
 # GCC_CORE is required; the other components are optional.
 # Set any you don't want to "".  You need binutils,
@@ -104,6 +107,7 @@ GCC_PATCH=""
 # GCC_JAVA_ARCHIVE="gcc-java-3.4.2-20040916-1-src.tar.gz"
 
 BINUTILS_ARCHIVE="binutils-2.16.91-20060119-1-src.tar.gz"
+BINUTILS_PATCH="binutils_texinfo_version.patch"
 
 MINGW_ARCHIVE="mingw-runtime-3.9.tar.gz"
 
@@ -114,7 +118,8 @@ MINGW_UTILS_ARCHIVE="mingw-utils-0.3-src.tar.gz"
 # These are the files from the SDL website
 # These are optional, set them to "" if you don't want them)
 
-SDL_URL="http://www.libsdl.org/extras/win32/common"
+#SDL_URL="http://www.libsdl.org/extras/win32/common"
+SDL_URL="http://www.bacula.org/cross-tools"
 
 OPENGL_ARCHIVE="opengl-devel.tar.gz"
 DIRECTX_ARCHIVE="directx-devel.tar.gz"
@@ -264,6 +269,16 @@ extract_binutils()
         cd "$BUILDDIR"
 }
 
+patch_binutils()
+{
+        if [ "$BINUTILS_PATCH" != "" ]; then
+                echo "Patching binutils"
+                cd "$SRCDIR/$BINUTILS"
+                patch -p1 < "${cwd}/patches/$BINUTILS_PATCH"
+                cd "$BUILDDIR"
+        fi
+}
+
 
 configure_binutils()
 {
@@ -403,66 +418,62 @@ install_gcc()
 
 extract_mingw_utils()
 {
-       cd "$SRCDIR"
-       MINGW_UTILS=`tar -tzf "$SRCDIR/$MINGW_UTILS_ARCHIVE" | head -n 1`
-       if [ "x${MINGW_UTILS}" != "x./" ]; then
-          rm -rf "$MINGW_UTILS"
-       fi
-       echo "Extracting mingw-utils"
-       tar -xzf "$SRCDIR/$MINGW_UTILS_ARCHIVE"
-       cd "$BUILDDIR"
+        cd "$SRCDIR"
+        MINGW_UTILS=`tar -tzf "$SRCDIR/$MINGW_UTILS_ARCHIVE" | head -n 1`
+        if [ "x${MINGW_UTILS}" != "x./" ]; then
+           rm -rf "$MINGW_UTILS"
+        fi
+        echo "Extracting mingw-utils"
+        tar -xzf "$SRCDIR/$MINGW_UTILS_ARCHIVE"
+        cd "$BUILDDIR"
 }
 
 
 patch_mingw_utils()
 {
-       MINGW_UTILS=`tar -tzf "$SRCDIR/$MINGW_UTILS_ARCHIVE" | head -n 1`
-       cd "${SRCDIR}/${MINGW_UTILS}"
-       echo "Patching mingw-utils"
-       patch -p0 < ${SCRIPTDIR}/patches/mingw-utils1.patch 2>&1 > patch.log
-       cd dos2unix
-       patch -p0 < ${SCRIPTDIR}/patches/mingw-utils2.patch 2>&1 >> patch.log
-       cd ../unix2dos
-       patch -p0 < ${SCRIPTDIR}/patches/mingw-utils3.patch 2>&1 >> patch.log
-       cd "$BUILDDIR"
+        MINGW_UTILS=`tar -tzf "$SRCDIR/$MINGW_UTILS_ARCHIVE" | head -n 1`
+        cd "${SRCDIR}/${MINGW_UTILS}"
+        echo "Patching mingw-utils"
+        patch -p0 < ${SCRIPTDIR}/patches/mingw-utils.patch 2>&1 > patch.log
+        cd "$BUILDDIR"
 }
 
 
 configure_mingw_utils()
 {
-       cd "$BUILDDIR"
-       rm -rf "mingw-utils"
-       mkdir "mingw-utils"
-       cd "mingw-utils"
-       echo "Configuring mingw-utils"
-       "$SRCDIR/$MINGW_UTILS/configure" --disable-nonportable --prefix="${PREFIX}/${TARGET}" 2>&1 > configure.log
-       cd "$BUILDDIR"
+        cd "$BUILDDIR"
+        rm -rf "mingw-utils"
+        mkdir "mingw-utils"
+        cd "mingw-utils"
+        echo "Configuring mingw-utils"
+        "$SRCDIR/$MINGW_UTILS/configure" --disable-nonportable --prefix="${PREFIX}/${TARGET}" 2>&1 > configure.log
+        cd "$BUILDDIR"
 }
 
 
 build_mingw_utils()
 {
-       cd "$BUILDDIR/mingw-utils"
-       echo "Building mingw-utils"
-       make CFLAGS="-O2 -fno-exceptions" LDFLAGS="-s" 2>&1 > make.log
-       if test $? -ne 0; then
-               echo "make of mingw-utils failed - log available: mingw-utils/make.log"
-               exit 1
-       fi
-       cd "$BUILDDIR"
+        cd "$BUILDDIR/mingw-utils"
+        echo "Building mingw-utils"
+        make CFLAGS="-O2 -fno-exceptions" LDFLAGS="-s" 2>&1 > make.log
+        if test $? -ne 0; then
+                echo "make of mingw-utils failed - log available: mingw-utils/make.log"
+                exit 1
+        fi
+        cd "$BUILDDIR"
 }
 
 
 install_mingw_utils()
 {
-       cd "$BUILDDIR/mingw-utils"
-       echo "Installing mingw-utils"
-       make install 2>&1 > make-install.log
-       if test $? -ne 0; then
-               echo "install of mingw-utils failed - log available: mingw-utils/make-install.log"
-               exit 1
-       fi
-       cd "$BUILDDIR"
+        cd "$BUILDDIR/mingw-utils"
+        echo "Installing mingw-utils"
+        make install 2>&1 > make-install.log
+        if test $? -ne 0; then
+                echo "install of mingw-utils failed - log available: mingw-utils/make-install.log"
+                exit 1
+        fi
+        cd "$BUILDDIR"
 }
 
 
@@ -516,6 +527,7 @@ fi
 install_libs
 
 extract_binutils
+patch_binutils
 configure_binutils
 build_binutils
 install_binutils
@@ -527,11 +539,11 @@ build_gcc
 install_gcc
 
 if test -n "${MINGW_UTILS_ARCHIVE}"; then
-       extract_mingw_utils
-       patch_mingw_utils
-       configure_mingw_utils
-       build_mingw_utils
-       install_mingw_utils
+        extract_mingw_utils
+        patch_mingw_utils
+        configure_mingw_utils
+        build_mingw_utils
+        install_mingw_utils
 fi
 
 final_tweaks