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 956384aefc21a253a668baec8cedd27a40a0e08c..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://superb-west.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()
 {
@@ -512,6 +527,7 @@ fi
 install_libs
 
 extract_binutils
+patch_binutils
 configure_binutils
 build_binutils
 install_binutils