mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-03 21:30:29 +02:00
Code Activity

(dyld_prefix), pre-inst-guile-env.in

Browse source 
(dyld_prefix): Construct and export dyld_prefix in a similar way
to ltdl_prefix, to allow pre-install dynamic linking to work on
MacOS.  Thanks to Roger Mc Murtrie for reporting this problem.
This commit is contained in:
Neil Jerram 2008-01-30 22:55:28 +00:00
parent 9cfe821f64
commit 0116c1941b
4 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2008-01-30 Neil Jerram <neil@ossau.uklinux.net>
* pre-inst-guile.in (dyld_prefix), pre-inst-guile-env.in
(dyld_prefix): Construct and export dyld_prefix in a similar way
to ltdl_prefix, to allow pre-install dynamic linking to work on
MacOS. Thanks to Roger Mc Murtrie for reporting this problem.
2008-01-22 Neil Jerram <neil@ossau.uklinux.net> 2008-01-22 Neil Jerram <neil@ossau.uklinux.net>
* README: Should say version 1.8.3, not 1.8.2. * README: Should say version 1.8.3, not 1.8.2.

1
THANKS
View file

@ -55,6 +55,7 @@ For fixes or providing information which led to a fix:
Marco Maggi Marco Maggi
Gregory Marton Gregory Marton
Dan McMahill Dan McMahill
Roger Mc Murtrie
Han-Wen Nienhuys Han-Wen Nienhuys
Jan Nieuwenhuizen Jan Nieuwenhuizen
Hrvoje Nikšić Hrvoje Nikšić

4
pre-inst-guile-env.in
View file

@ -63,11 +63,15 @@ export GUILE_LOAD_PATH
# handle LTDL_LIBRARY_PATH (no clobber) # handle LTDL_LIBRARY_PATH (no clobber)
ltdl_prefix="" ltdl_prefix=""
dyld_prefix=""
for dir in $subdirs_with_ltlibs ; do for dir in $subdirs_with_ltlibs ; do
ltdl_prefix="${top_builddir}/${dir}:${ltdl_prefix}" ltdl_prefix="${top_builddir}/${dir}:${ltdl_prefix}"
dyld_prefix="${top_builddir}/${dir}/.libs:${dyld_prefix}"
done done
LTDL_LIBRARY_PATH="${ltdl_prefix}$LTDL_LIBRARY_PATH" LTDL_LIBRARY_PATH="${ltdl_prefix}$LTDL_LIBRARY_PATH"
export LTDL_LIBRARY_PATH export LTDL_LIBRARY_PATH
DYLD_LIBRARY_PATH="${dyld_prefix}${top_builddir}/libguile/.libs:$DYLD_LIBRARY_PATH"
export DYLD_LIBRARY_PATH
# handle PATH (no clobber) # handle PATH (no clobber)
PATH="${top_builddir}/guile-config:${PATH}" PATH="${top_builddir}/guile-config:${PATH}"

4
pre-inst-guile.in
View file

@ -76,11 +76,15 @@ export GUILE_LOAD_PATH
# handle LTDL_LIBRARY_PATH (no clobber) # handle LTDL_LIBRARY_PATH (no clobber)
ltdl_prefix="" ltdl_prefix=""
dyld_prefix=""
for dir in $subdirs_with_ltlibs ; do for dir in $subdirs_with_ltlibs ; do
ltdl_prefix="${top_builddir}/${dir}:${ltdl_prefix}" ltdl_prefix="${top_builddir}/${dir}:${ltdl_prefix}"
dyld_prefix="${top_builddir}/${dir}/.libs:${dyld_prefix}"
done done
LTDL_LIBRARY_PATH="${ltdl_prefix}$LTDL_LIBRARY_PATH" LTDL_LIBRARY_PATH="${ltdl_prefix}$LTDL_LIBRARY_PATH"
export LTDL_LIBRARY_PATH export LTDL_LIBRARY_PATH
DYLD_LIBRARY_PATH="${dyld_prefix}${top_builddir}/libguile/.libs:$DYLD_LIBRARY_PATH"
export DYLD_LIBRARY_PATH
# set GUILE (clobber) # set GUILE (clobber)
GUILE=${top_builddir}/libguile/guile GUILE=${top_builddir}/libguile/guile