gnucash-on-windows master: Multiple changes pushed
John Ralls
jralls at code.gnucash.org
Sun Nov 2 19:18:54 EST 2014
Updated via https://github.com/Gnucash/gnucash-on-windows/commit/d3c86ed8 (commit)
via https://github.com/Gnucash/gnucash-on-windows/commit/ee916ce5 (commit)
via https://github.com/Gnucash/gnucash-on-windows/commit/78f4b59e (commit)
via https://github.com/Gnucash/gnucash-on-windows/commit/35930b69 (commit)
from https://github.com/Gnucash/gnucash-on-windows/commit/8fd80893 (commit)
commit d3c86ed81ff624f598771eb38f7f6e581136eeb7
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Nov 2 15:58:52 2014 -0800
Get rid of some of the libfoo.la has moved warnings.
The warning is caused by finding the libtool-lib on a different path than
the one encoded in its libdir statement; it's a purely lexical check,
so if the mingw version, /c/gcdev is given in the -L directive and c:/gcdev
is in the libdir statement, libtool will issue the warning.
The only one remaining is libintl, which is usually found with /c/gcdev/mingw/lib
but whose libdir=/mingw.
Unfortunately just about every other library links to this so it's issued
a lot.
diff --git a/functions.sh b/functions.sh
index a633073..859b92f 100644
--- a/functions.sh
+++ b/functions.sh
@@ -41,6 +41,7 @@ function qpushd() { pushd "$@" >/dev/null; }
function qpopd() { popd >/dev/null; }
function win_fs_path() { echo "$*" | sed 's,\\,/,g'; }
function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
+function unix_ldpath() { echo "$*" | sed 's,\\,/,g'; }
# usage: wpwd [rel]
# rel can be any relative path
diff --git a/install-impl.sh b/install-impl.sh
index a1d3d30..07ab6c6 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -53,6 +53,7 @@ function inst_prepare() {
function inst_msys() {
setup MSys
_MINGW_UDIR=`unix_path $MINGW_DIR`
+ _MINGW_LDDIR=/mingw/lib
_MSYS_UDIR=`unix_path $MSYS_DIR`
add_to_env $_MINGW_UDIR/bin PATH
add_to_env $_MSYS_UDIR/bin PATH
@@ -543,9 +544,10 @@ function inst_guile() {
setup Guile
_GUILE_WFSDIR=`win_fs_path $GUILE_DIR`
_GUILE_UDIR=`unix_path $GUILE_DIR`
+ _GUILE_LDDIR=`unix_ldpath $GUILE_DIR`
_WIN_UDIR=`unix_path $WINDIR`
add_to_env -I$_GUILE_UDIR/include GUILE_CPPFLAGS
- add_to_env -L$_GUILE_UDIR/lib GUILE_LDFLAGS
+ add_to_env -L$_GUILE_LDDIR/lib GUILE_LDFLAGS
add_to_env $_GUILE_UDIR/bin PATH
add_to_env ${_GUILE_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
if quiet guile -c '(use-modules (srfi srfi-39))' &&
@@ -1334,7 +1336,7 @@ function inst_gnucash() {
--enable-locale-specific-tax \
${_EXTRA_OPTIONS} \
CPPFLAGS="${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GUILE_CPPFLAGS} ${LIBDBI_CPPFLAGS} ${KTOBLZCHECK_CPPFLAGS} ${HH_CPPFLAGS} ${LIBSOUP_CPPFLAGS} -D_WIN32 ${EXTRA_CFLAGS}" \
- LDFLAGS="${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GUILE_LDFLAGS} ${LIBDBI_LDFLAGS} ${KTOBLZCHECK_LDFLAGS} ${HH_LDFLAGS} -L${_SQLITE3_UDIR}/lib -L${_ENCHANT_UDIR}/lib -L${_LIBXSLT_UDIR}/lib -L${_MINGW_UDIR}/lib" \
+ LDFLAGS="${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GUILE_LDFLAGS} ${LIBDBI_LDFLAGS} ${KTOBLZCHECK_LDFLAGS} ${HH_LDFLAGS} -L${_SQLITE3_UDIR}/lib -L${_ENCHANT_UDIR}/lib -L${_LIBXSLT_UDIR}/lib -L${_MINGW_LDDIR}" \
PKG_CONFIG_PATH="${PKG_CONFIG_PATH}"
make
commit ee916ce5fc94e95c297f3c7de545ae7b3cc5960d
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Nov 2 09:44:12 2014 -0800
Fix up libgnutls installation when building from source.
We don't actually build libgnutls from source, so we need to create the
directory for it. The .la files it provides contain the builder's paths
which screws up libtool later, so delete them.
diff --git a/defaults.sh b/defaults.sh
index dad724c..f8ce978 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -210,7 +210,7 @@ GNUTLS_VERSION="3.2.19"
set_default BUILD_GNUTLS_FROM_SOURCE "no"
set_default GNUTLS_URL "$GC_DEPS_URL/gnutls-3.2.19-minGW.tgz"
set_default GNUTLS_DEV_URL "$GC_DEPS_URL/gnutls-3.2.19-dev-minGW.tgz"
-set_default GNUTLS_SRC_URL "ftp://ftp.gnutls.org/gcrypt/gnutls/w32/gnutls-${GNUTLS_VERSION}-w32.zip"
+set_default GNUTLS_PKG_URL "ftp://ftp.gnutls.org/gcrypt/gnutls/w32/gnutls-${GNUTLS_VERSION}-w32.zip"
GCRYPT_VERSION="1.6.2"
set_default GCRYPT_SRC_URL "ftp://ftp.gnutls.org/gcrypt/libgcrypt/libgcrypt-${GCRYPT_VERSION}.tar.bz2"
GPG_ERROR_VERSION="1.17"
diff --git a/install-impl.sh b/install-impl.sh
index cbe1bcd..a1d3d30 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -459,10 +459,12 @@ function inst_gnutls() {
echo "GNUTLS already installed in $_GNUTLS_UDIR. skipping."
else
if [ "$BUILD_GNUTLS_FROM_SOURCE" = "yes" ]; then
- wget_unpacked $GNUTLS_URL $DOWNLOAD_DIR $GNUTLS_DIR
+ mkdir -p $_GNUTLS_UDIR
+ wget_unpacked $GNUTLS_PKG_URL $DOWNLOAD_DIR $GNUTLS_DIR
wget_unpacked $GCRYPT_SRC_URL $DOWNLOAD_DIR $TMP_DIR
wget_unpacked $GPG_ERROR_SRC_URL $DOWNLOAD_DIR $TMP_DIR
wget_unpacked $GLIB_NETWORKING_SRC_URL $DOWNLOAD_DIR $TMP_DIR
+ rm $_GNUTLS_UDIR/lib/*.la
assert_one_dir $TMP_UDIR/libgcrypt-*
assert_one_dir $TMP_UDIR/libgpg-error-*
assert_one_dir $TMP_UDIR/glib-networking-*
commit 78f4b59eb732258f3504ff5de6c71c43ba7be5f0
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Nov 2 09:41:12 2014 -0800
Build glib-networking (required by libsoup) in gnutls.
Ensure that its version is coordinated with glib's by using new variable
GLIB_VERSION for both.
diff --git a/defaults.sh b/defaults.sh
index b8f090d..dad724c 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -205,6 +205,7 @@ set_default GUILE_PATCH `pwd`/guile-1.8.patch
set_default OPENSSL_URL "http://www.openssl.org/source/openssl-0.9.8j.tar.gz"
set_default OPENSSL_DIR $GLOBAL_DIR\\openssl
+GLIB_VERSION="2.38.2"
GNUTLS_VERSION="3.2.19"
set_default BUILD_GNUTLS_FROM_SOURCE "no"
set_default GNUTLS_URL "$GC_DEPS_URL/gnutls-3.2.19-minGW.tgz"
@@ -214,6 +215,7 @@ GCRYPT_VERSION="1.6.2"
set_default GCRYPT_SRC_URL "ftp://ftp.gnutls.org/gcrypt/libgcrypt/libgcrypt-${GCRYPT_VERSION}.tar.bz2"
GPG_ERROR_VERSION="1.17"
set_default GPG_ERROR_SRC_URL "ftp://ftp.gnutls.org/gcrypt/libgpg-error/libgpg-error-${GPG_ERROR_VERSION}.tar.bz2"
+set_default GLIB_NETWORKING_SRC_URL "$GNOME_MIRROR/sources/glib-networking/2.38/glib-networking-${GLIB_VERSION}.tar.xz"
set_default GNUTLS_DIR $GLOBAL_DIR\\gnutls
set_default MINGW_UTILS_URL "$SF_MIRROR/mingw/mingw-utils-0.3.tar.gz"
@@ -263,8 +265,8 @@ set_default LIBXML2_URL "$GNOME_WIN32_DEPS_URL/libxml2_2.7.7-1_win32
set_default LIBXML2_DEV_URL "$GNOME_WIN32_DEPS_URL/libxml2-dev_2.7.7-1_win32.zip"
set_default PKG_CONFIG_URL "$GNOME_WIN32_DEPS_URL/pkg-config_0.25-1_win32.zip"
set_default PKG_CONFIG_DEV_URL "$GNOME_WIN32_DEPS_URL/pkg-config-dev_0.25-1_win32.zip"
-set_default GLIB_URL "$GC_DEPS_URL/glib-2.38.2-minGW.tgz"
-set_default GLIB_DEV_URL "$GC_DEPS_URL/glib-2.38.2-dev-minGW.tgz"
+set_default GLIB_URL "$GC_DEPS_URL/glib-$GLIB_VERSION-minGW.tgz"
+set_default GLIB_DEV_URL "$GC_DEPS_URL/glib-$GLIB_VERSION-dev-minGW.tgz"
set_default CAIRO_VERSION="1.10.2"
set_default CAIRO_URL "$GC_DEPS_URL/cairo-1.10.2-minGW.tgz"
set_default CAIRO_DEV_URL "$GC_DEPS_URL/cairo-1.10.2-dev-minGW.tgz"
diff --git a/install-impl.sh b/install-impl.sh
index cd2d831..cbe1bcd 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -462,9 +462,10 @@ function inst_gnutls() {
wget_unpacked $GNUTLS_URL $DOWNLOAD_DIR $GNUTLS_DIR
wget_unpacked $GCRYPT_SRC_URL $DOWNLOAD_DIR $TMP_DIR
wget_unpacked $GPG_ERROR_SRC_URL $DOWNLOAD_DIR $TMP_DIR
- mydir=`pwd`
+ wget_unpacked $GLIB_NETWORKING_SRC_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/libgcrypt-*
assert_one_dir $TMP_UDIR/libgpg-error-*
+ assert_one_dir $TMP_UDIR/glib-networking-*
qpushd $TMP_UDIR/libgpg-error-*
sed -i'' s/ro// po/LINGUAS #Converting ro.po to UTF8 hangs
./configure ${HOST_XCOMPILE} --prefix=$_GNUTLS_UDIR --disable-nls \
@@ -481,6 +482,16 @@ function inst_gnutls() {
make
make install
qpopd
+ qpushd $TMP_UDIR/glib-networking-*
+ ./configure ${HOST_XCOMPILE} --prefix=$_GNUTLS_UDIR \
+ --with-ca-certificates=no \
+ --with-pkcs11=no \
+ CPPFLAGS="${GNOME_CPPFLAGS}" \
+ LDFLAGS="${GNOME_LDFLAGS}"
+ make
+ make install
+ qpopd
+
rm -f $_GNUTLS_UDIR/lib/*.la
else
mkdir -p $_GNUTLS_UDIR
commit 35930b69123304195109db89b35ab749c1e56d6a
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Nov 2 09:36:23 2014 -0800
Fix hang when building libgpg-error.
diff --git a/install-impl.sh b/install-impl.sh
index 426286f..cd2d831 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -466,6 +466,7 @@ function inst_gnutls() {
assert_one_dir $TMP_UDIR/libgcrypt-*
assert_one_dir $TMP_UDIR/libgpg-error-*
qpushd $TMP_UDIR/libgpg-error-*
+ sed -i'' s/ro// po/LINGUAS #Converting ro.po to UTF8 hangs
./configure ${HOST_XCOMPILE} --prefix=$_GNUTLS_UDIR --disable-nls \
--disable-languages \
CPPFLAGS="${GNOME_CPPFLAGS}" \
Summary of changes:
defaults.sh | 8 +++++---
functions.sh | 1 +
install-impl.sh | 24 ++++++++++++++++++++----
3 files changed, 26 insertions(+), 7 deletions(-)
More information about the gnucash-changes
mailing list