r22715 - gnucash/trunk/packaging/win32 - Win32 build: some more patchfile cleanups
Geert Janssens
gjanssens at code.gnucash.org
Sat Jan 19 13:28:00 EST 2013
Author: gjanssens
Date: 2013-01-19 13:28:00 -0500 (Sat, 19 Jan 2013)
New Revision: 22715
Trac: http://svn.gnucash.org/trac/changeset/22715
Modified:
gnucash/trunk/packaging/win32/install-impl.sh
Log:
Win32 build: some more patchfile cleanups
Wrap patching code in conditional in most cases to only run patch if
there actually is a patch file available.
Modified: gnucash/trunk/packaging/win32/install-impl.sh
===================================================================
--- gnucash/trunk/packaging/win32/install-impl.sh 2013-01-19 18:27:51 UTC (rev 22714)
+++ gnucash/trunk/packaging/win32/install-impl.sh 2013-01-19 18:28:00 UTC (rev 22715)
@@ -722,7 +722,9 @@
tar -xzpf $_GUILE_BALL -C $TMP_UDIR
assert_one_dir $TMP_UDIR/guile-*
qpushd $TMP_UDIR/guile-*
- patch -p1 < $GUILE_PATCH
+ if [ -n "$GUILE_PATCH" -a -f "$GUILE_PATCH" ]; then
+ patch -p1 < $GUILE_PATCH
+ fi
ACLOCAL="aclocal $ACLOCAL_FLAGS" autoreconf -fvi $ACLOCAL_FLAGS
./configure ${HOST_XCOMPILE} \
--disable-static \
@@ -946,7 +948,7 @@
fi
if [ -n "$LIBDBI_PATCH2" -a -f "$LIBDBI_PATCH2" ]; then
patch -p1 < $LIBDBI_PATCH2
- fi
+ fi
if [ "$CROSS_COMPILE" = "yes" ]; then
rm ltmain.sh aclocal.m4
libtoolize --force
@@ -1116,7 +1118,9 @@
wget_unpacked $LIBXSLT_SRC_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/libxslt-*
qpushd $TMP_UDIR/libxslt-*
- patch -p0 -u -i ${LIBXSLT_MAKEFILE_PATCH}
+ if [ -n "$LIBXSLT_MAKEFILE_PATCH" -a -f "$LIBXSLT_MAKEFILE_PATCH" ]; then
+ patch -p0 -u -i ${LIBXSLT_MAKEFILE_PATCH}
+ fi
./configure ${HOST_XCOMPILE} \
--prefix=${_LIBXSLT_UDIR} \
--with-python=no \
More information about the gnucash-changes
mailing list