Improve INSTALL wizard: move all patch files to the separate directory

[tools/install.git] / config_files / sip-4.2.1.sh

diff --git a/config_files/sip-4.2.1.sh b/config_files/sip-4.2.1.sh
index 515f683dc198425b8623d8e2e00a996ee5168e62..9072c4b497ee01949d92ba92ffcbb71ab08df4f3 100755 (executable)
--- a/config_files/sip-4.2.1.sh
+++ b/config_files/sip-4.2.1.sh
@@ -83,19 +83,21 @@ makedir ${PRODUCT_DIR}
 
 check_jb tar xfz ${SOURCE_DIR}/sip-4.2.1.tar.gz -C ${INSTALL_WORK}
 
-  if test `uname -m` = "x86_64" ; then
-      cp sip-4.2.1.patch ${PRODUCT_WORK}
-      cd ${PRODUCT_WORK}
-      patch -p 1 -i sip-4.2.1.patch
-      else
-      cd ${PRODUCT_WORK}
-  fi
-
-  if test `uname -m` = "x86_64" ; then
-      SIP_CONFIGURE_OPTIONS="-b ${PRODUCT_DIR} -d ${PRODUCT_DIR} -e ${PRODUCT_DIR} -v ${PRODUCT_DIR} -l qt-mt -p linux-g++-64"
-      else
-      SIP_CONFIGURE_OPTIONS="-b ${PRODUCT_DIR} -d ${PRODUCT_DIR} -e ${PRODUCT_DIR} -v ${PRODUCT_DIR} -l qt-mt"
-  fi
+# apply patch for 64-bit platforms
+if test `uname -m` = "x86_64" ; then
+    if [ -f patches/sip-4.2.1-lib64.patch ] ; then
+       cp patches/sip-4.2.1-lib64.patch ${PRODUCT_WORK}
+       ( cd ${PRODUCT_WORK} ; patch -p1 < sip-4.2.1-lib64.patch )
+    fi
+fi
+
+cd ${PRODUCT_WORK}
+
+if test `uname -m` = "x86_64" ; then
+    SIP_CONFIGURE_OPTIONS="-b ${PRODUCT_DIR} -d ${PRODUCT_DIR} -e ${PRODUCT_DIR} -v ${PRODUCT_DIR} -l qt-mt -p linux-g++-64"
+else
+    SIP_CONFIGURE_OPTIONS="-b ${PRODUCT_DIR} -d ${PRODUCT_DIR} -e ${PRODUCT_DIR} -v ${PRODUCT_DIR} -l qt-mt"
+fi
 
 check_job ${PRODUCT_DIR}/CONFIGURE.LOG \
     python configure.py $SIP_CONFIGURE_OPTIONS