IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

More cross-compile preparations - goffice needs a cross-compile libtool as well.

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@14854 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Christian Stimming 2006-09-17 13:45:18 +00:00
parent 850323276d
commit 4ed1ed400c
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packaging/win32/custom.sh
View File

@ -16,14 +16,16 @@ cross_compile=no
LD=ld LD=ld
CC=gcc CC=gcc
DLLTOOL=dlltool DLLTOOL=dlltool
LIBTOOLIZE=libtoolize
# For cross-compiling, uncomment the following lines: # For cross-compiling, uncomment the following lines:
# HOST_XCOMPILE="--host=mingw32" # HOST_XCOMPILE="--host=mingw32"
# PKG_CONFIG_PATH="" # to avoid using the host's installed packages # PKG_CONFIG_PATH="" # to avoid using the host's installed packages
# PATH=/opt/mingw32/bin:$PATH # PATH=/opt/mingw32/bin:/opt/mingw32/mingw32/bin:$PATH
# cross_compile=yes # cross_compile=yes
# LD=mingw32-ld # LD=mingw32-ld
# CC=mingw32-gcc # CC=mingw32-gcc
# DLLTOOL=mingw32-dlltool # DLLTOOL=mingw32-dlltool
# LIBTOOLIZE=$GLOBAL_DIR/autotools/bin/libtoolize
#### ####
MSYS_DIR=$GLOBAL_DIR\\msys MSYS_DIR=$GLOBAL_DIR\\msys

18
packaging/win32/install.sh
View File

@ -583,13 +583,12 @@ function inst_autotools() {
setup Autotools setup Autotools
_AUTOTOOLS_UDIR=`unix_path $AUTOTOOLS_DIR` _AUTOTOOLS_UDIR=`unix_path $AUTOTOOLS_DIR`
add_to_env $_AUTOTOOLS_UDIR/bin PATH add_to_env $_AUTOTOOLS_UDIR/bin PATH
if quiet autoconf --help && quiet automake --help && quiet libtool --help if quiet autoconf --help && quiet automake --help
then then
echo "auto tools already installed. skipping." echo "autoconf/automake already installed. skipping."
else else
wget_unpacked $AUTOCONF_URL $DOWNLOAD_DIR $TMP_DIR wget_unpacked $AUTOCONF_URL $DOWNLOAD_DIR $TMP_DIR
wget_unpacked $AUTOMAKE_URL $DOWNLOAD_DIR $TMP_DIR wget_unpacked $AUTOMAKE_URL $DOWNLOAD_DIR $TMP_DIR
wget_unpacked $LIBTOOL_URL $DOWNLOAD_DIR $TMP_DIR
qpushd $TMP_UDIR/autoconf-* qpushd $TMP_UDIR/autoconf-*
echo "building autoconf..." echo "building autoconf..."
./configure --prefix=$_AUTOTOOLS_UDIR ./configure --prefix=$_AUTOTOOLS_UDIR
@ -602,6 +601,12 @@ function inst_autotools() {
make make
make install make install
qpopd qpopd
fi
if quiet ${LIBTOOLIZE} --help
then
echo "libtool/libtoolize already installed. skipping."
else
wget_unpacked $LIBTOOL_URL $DOWNLOAD_DIR $TMP_DIR
qpushd $TMP_UDIR/libtool-* qpushd $TMP_UDIR/libtool-*
echo "building libtool..." echo "building libtool..."
./configure ${HOST_XCOMPILE} --prefix=$_AUTOTOOLS_UDIR ./configure ${HOST_XCOMPILE} --prefix=$_AUTOTOOLS_UDIR
@ -611,12 +616,10 @@ function inst_autotools() {
fi fi
add_to_env -I$_AUTOTOOLS_UDIR/include AUTOTOOLS_CPPFLAGS add_to_env -I$_AUTOTOOLS_UDIR/include AUTOTOOLS_CPPFLAGS
add_to_env -L$_AUTOTOOLS_UDIR/lib AUTOTOOLS_LDFLAGS add_to_env -L$_AUTOTOOLS_UDIR/lib AUTOTOOLS_LDFLAGS
if test x$cross_compile != xyes ; then add_to_env "-I $_AUTOTOOLS_UDIR/share/aclocal" ACLOCAL_FLAGS
add_to_env "-I $_AUTOTOOLS_UDIR/share/aclocal" ACLOCAL_FLAGS
fi
quiet autoconf --help && quiet autoconf --help &&
quiet automake --help && quiet automake --help &&
quiet libtool --help || die "autotools not installed correctly" quiet ${LIBTOOLIZE} --help || die "autotools not installed correctly"
} }
function inst_libgsf() { function inst_libgsf() {
@ -653,6 +656,7 @@ function inst_goffice() {
qpushd $TMP_UDIR/goffice-* qpushd $TMP_UDIR/goffice-*
[ -n "$GOFFICE_PATCH" -a -f "$GOFFICE_PATCH" ] && \ [ -n "$GOFFICE_PATCH" -a -f "$GOFFICE_PATCH" ] && \
patch -p1 < $GOFFICE_PATCH patch -p1 < $GOFFICE_PATCH
${LIBTOOLIZE} --force
aclocal ${ACLOCAL_FLAGS} aclocal ${ACLOCAL_FLAGS}
automake automake
autoconf autoconf