Skip to content

Commit

Permalink
Get rid of some of the libfoo.la has moved warnings.
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
jralls committed Nov 2, 2014
1 parent ee916ce commit d3c86ed
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
1 change: 1 addition & 0 deletions functions.sh
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions install-impl.sh
Expand Up @@ -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
Expand Down Expand Up @@ -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))' &&
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit d3c86ed

Please sign in to comment.