r20614 - gnucash/trunk/packaging/win32 - Win32 build: Update libxml2 to slightly more recent version. Add version check.
Christian Stimming
cstim at code.gnucash.org
Sun May 8 16:05:44 EDT 2011
Author: cstim
Date: 2011-05-08 16:05:43 -0400 (Sun, 08 May 2011)
New Revision: 20614
Trac: http://svn.gnucash.org/trac/changeset/20614
Modified:
gnucash/trunk/packaging/win32/defaults.sh
gnucash/trunk/packaging/win32/install-impl.sh
Log:
Win32 build: Update libxml2 to slightly more recent version. Add version check.
Modified: gnucash/trunk/packaging/win32/defaults.sh
===================================================================
--- gnucash/trunk/packaging/win32/defaults.sh 2011-05-08 20:05:33 UTC (rev 20613)
+++ gnucash/trunk/packaging/win32/defaults.sh 2011-05-08 20:05:43 UTC (rev 20614)
@@ -211,11 +211,12 @@
XMLSOFT_URL="http://xmlsoft.org/sources/win32"
XSLT_BASE_URL="http://ftp.acc.umu.se/pub/GNOME/sources/libxslt/1.1"
XML2_BASE_URL="http://ftp.acc.umu.se/pub/GNOME/sources/libxml2/2.6"
-LIBXSLT_VERSION=1.1.22
+LIBXSLT_VERSION="1.1.22"
#LIBXSLT_VERSION=1.1.26
set_default LIBXSLT_SRC_URL "${XSLT_BASE_URL}/libxslt-${LIBXSLT_VERSION}.tar.bz2"
set_default LIBXSLT_MAKEFILE_PATCH "`pwd`/libxslt-1.1.22.Makefile.in.patch"
-set_default LIBXML2_SRC_URL "${XML2_BASE_URL}/libxml2-2.6.27.tar.bz2"
+LIBXML2_VERSION="2.6.30"
+set_default LIBXML2_SRC_URL "${XML2_BASE_URL}/libxml2-${LIBXML2_VERSION}.tar.bz2"
set_default LIBXSLT_ICONV_URL "${XMLSOFT_URL}/iconv-1.9.2.win32.zip"
set_default LIBXSLT_ZLIB_URL "${XMLSOFT_URL}/zlib-1.2.3.win32.zip"
set_default LIBXSLT_DIR $GLOBAL_DIR\\libxslt
Modified: gnucash/trunk/packaging/win32/install-impl.sh
===================================================================
--- gnucash/trunk/packaging/win32/install-impl.sh 2011-05-08 20:05:33 UTC (rev 20613)
+++ gnucash/trunk/packaging/win32/install-impl.sh 2011-05-08 20:05:43 UTC (rev 20614)
@@ -485,6 +485,7 @@
quiet ${PKG_CONFIG} --atleast-version=${GTK_VERSION} gtk+-2.0 &&
quiet ${PKG_CONFIG} --atleast-version=${CAIRO_VERSION} cairo &&
quiet ${PKG_CONFIG} --atleast-version=${PIXMAN_VERSION} pixman-1 &&
+ quiet ${PKG_CONFIG} --atleast-version=${LIBXML2_VERSION} libxml-2.0 &&
quiet intltoolize --version
then
echo "gnome packages installed in $_GNOME_UDIR. skipping."
@@ -616,19 +617,30 @@
fi
quiet ${PKG_CONFIG} --exact-version=${PIXMAN_VERSION} pixman-1 || die "pixman not installed correctly"
- wget_unpacked $LIBXML2_SRC_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/libxml2-*
- qpushd $TMP_UDIR/libxml2-*
- ./configure ${HOST_XCOMPILE} \
- --prefix=${_GNOME_UDIR} \
- --without-threads
- make
- make install
- qpopd
- rm -rf ${TMP_UDIR}/libxml2-*
+ if quiet ${PKG_CONFIG} --exact-version=${LIBXML2_VERSION} libxml-2.0 ; then
+ echo "Libxml2 already compiled + installed"
+ else
+ wget_unpacked $LIBXML2_SRC_URL $DOWNLOAD_DIR $TMP_DIR
+ assert_one_dir $TMP_UDIR/libxml2-*
+ qpushd $TMP_UDIR/libxml2-*
+ ./configure ${HOST_XCOMPILE} \
+ --prefix=${_GNOME_UDIR} \
+ --disable-static \
+ --with-python=no \
+ --without-threads
+ make
+ make install
+ qpopd
+ rm -rf ${TMP_UDIR}/libxml2-*
+ fi
quiet gconftool-2 --version &&
quiet ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 &&
+ quiet ${PKG_CONFIG} --atleast-version=${GCONF_VERSION} gconf-2.0 &&
+ quiet ${PKG_CONFIG} --atleast-version=${GTK_VERSION} gtk+-2.0 &&
+ quiet ${PKG_CONFIG} --atleast-version=${CAIRO_VERSION} cairo &&
+ quiet ${PKG_CONFIG} --atleast-version=${PIXMAN_VERSION} pixman-1 &&
+ quiet ${PKG_CONFIG} --atleast-version=${LIBXML2_VERSION} libxml-2.0 &&
quiet intltoolize --version || die "gnome not installed correctly"
fi
[ ! -d $_GNOME_UDIR/share/aclocal ] || add_to_env "-I $_GNOME_UDIR/share/aclocal" ACLOCAL_FLAGS
@@ -1140,6 +1152,7 @@
patch -p0 -u -i ${LIBXSLT_MAKEFILE_PATCH}
./configure ${HOST_XCOMPILE} \
--prefix=${_LIBXSLT_UDIR} \
+ --with-python=no \
--with-libxml-prefix=${_GNOME_UDIR} CPPFLAGS="${GNUTLS_CPPFLAGS}" LDFLAGS="${GNUTLS_LDFLAGS}"
make
make install
More information about the gnucash-changes
mailing list