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

[bacula/bacula] / bacula / src / win32 / build-depkgs-mingw32

diff --git a/bacula/src/win32/build-depkgs-mingw32 b/bacula/src/win32/build-depkgs-mingw32
index eb55c47bea337bc630310061b223323688b2577e..7ccad8bc3e7d0b17082b60aa04fa45f5860c8e91 100755 (executable)
--- a/bacula/src/win32/build-depkgs-mingw32
+++ b/bacula/src/win32/build-depkgs-mingw32
@@ -36,6 +36,7 @@ SCRIPT_DIR=`pwd`
 
 cd ../../..
 TOP_DIR=`pwd`
+TOP_DIR=${DEPKGS:-${TOP_DIR}}
 
 if [ -e ${TOP_DIR}/cross-tools/mingw32/bin/mingw32-gcc ]
 then
@@ -63,7 +64,7 @@ export PATH=${BIN_DIR}:${PATH}
 
 OLD_IFS=${IFS};IFS="|";
 while read package url dir mkd; do
-   echo "Got package ${package}"
+#  echo "Got package ${package}"
    case ${package} in
    \#*) ;;
    *) eval "URL_${package}=${url};DIR_${package}=${dir};MKD_${package}=${mkd}";;
@@ -404,70 +405,70 @@ process_nsis()
 
 process_mtx()
 {
-        if get_source "${URL_MTX}" "${DIR_MTX}" "${MKD_MTX}"
-        then
-                echo Patching mtx
-                # We can't run configure in a cross-compile environment so we
-                # patch the files to the correct values
-                cp -f config.h.in config.h
-                cp -f Makefile.in Makefile
-                rm -f configure
-                >patch.log
-                do_patch mtx.patch
-        fi
-        echo Building mtx
-        do_make Makefile prefix=${DEPPKG_DIR} all
-        echo Installing mtx
-        do_make Makefile prefix=${DEPPKG_DIR} install
+   if get_source "${URL_MTX}" "${DIR_MTX}" "${MKD_MTX}"
+   then
+           echo Patching mtx
+           # We can't run configure in a cross-compile environment so we
+           # patch the files to the correct values
+           cp -f config.h.in config.h
+           cp -f Makefile.in Makefile
+           rm -f configure
+           >patch.log
+           do_patch mtx.patch
+   fi
+   echo Building mtx
+   do_make Makefile prefix=${DEPPKG_DIR} all
+   echo Installing mtx
+   do_make Makefile prefix=${DEPPKG_DIR} install
 }
 
 process_mt()
 {
-        if get_source "${URL_MT}" "${DIR_MT}" "${MKD_MT}"
-        then
-                echo "Patching mt"
-                >patch.log
-                do_patch mt.patch
-        fi
-        echo "Building mt"
-        do_make Makefile PREFIX=${DEPPKG_DIR} all
-        echo Installing mt
-        do_make Makefile PREFIX=${DEPPKG_DIR} install
+   if get_source "${URL_MT}" "${DIR_MT}" "${MKD_MT}"
+   then
+           echo "Patching mt"
+           >patch.log
+           do_patch mt.patch
+   fi
+   echo "Building mt"
+   do_make Makefile PREFIX=${DEPPKG_DIR} all
+   echo Installing mt
+   do_make Makefile PREFIX=${DEPPKG_DIR} install
 }
 
 process_sed()
 {
-        if get_source "${URL_SED}" "${DIR_SED}" "${MKD_SED}"
-        then
-                echo Patching sed
-                >patch.log
-                do_patch sed.patch
-                echo Configuring sed
-                ./configure --host=mingw32 \
-                            --prefix=${DEPPKG_DIR} \
-                            --disable-nls >make.log 2>&1
-        fi
-        echo Building sed
-        do_make Makefile all
-        echo Installing sed
-        do_make Makefile install
+   if get_source "${URL_SED}" "${DIR_SED}" "${MKD_SED}"
+   then
+           echo Patching sed
+           >patch.log
+           do_patch sed.patch
+           echo Configuring sed
+           ./configure --host=mingw32 \
+                       --prefix=${DEPPKG_DIR} \
+                       --disable-nls >make.log 2>&1
+   fi
+   echo Building sed
+   do_make Makefile all
+   echo Installing sed
+   do_make Makefile install
 }
 
 process_stab2cv()
 {
-        if get_source "${URL_STAB2CV}" "${DIR_STAB2CV}" "${MKD_STAB2CV}"
-        then
-                # echo Patching stab2cv
-                # >patch.log
-                # do_patch stab2cv.patch
-                echo Configuring stab2cv
-                ./configure --prefix=${DEPPKG_DIR}/tools \
-                            >make.log 2>&1
-        fi
-        echo Building stab2cv
-        do_make Makefile 
-        echo Installing stab2cv
-        do_make Makefile install
+   if get_source "${URL_STAB2CV}" "${DIR_STAB2CV}" "${MKD_STAB2CV}"
+   then
+           # echo Patching stab2cv
+           # >patch.log
+           # do_patch stab2cv.patch
+           echo Configuring stab2cv
+           ./configure --prefix=${DEPPKG_DIR}/tools \
+                       >make.log 2>&1
+   fi
+   echo Building stab2cv
+   do_make Makefile 
+   echo Installing stab2cv
+   do_make Makefile install
 }
 
 process_cmd_utils()
@@ -512,7 +513,13 @@ process_dvd_rw_tools()
 process_qt4()
 {
    get_source "${URL_Qt4}" "${DIR_Qt4}" "${MKD_Qt4}"
-
+   echo "Installing Qt4"
+   rm -rf ${DEPPKG_DIR}/include/qt ${DEPPKG_DIR}/include/src
+   cp -a include/* ${DEPPKG_DIR}/include/
+   rm -rf ${DEPPKG_DIR}/lib/qt
+#  cp -a ${DEPPKG_DIR}/src/${DIR_Qt4}/lib/* ${DEPPKG_DIR}/lib/
+   cp -a lib/* ${DEPPKG_DIR}/lib/
+   cp -p lib/qt/*.dll ${DEPPKG_DIR}/bin/
 }
 
 if [ "$#" -eq 0 ]