openkylin
/
perl
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Postpone LD_LIBRARY_PATH evaluation to the binary targets. 

Modify the setting of LD_LIBRARY_PATH to append pre-existing values at the
time the rule is evaluated rather than when the Makefile is created.

This is required when building packages with dpkg-buildpackage and fakeroot,
since fakeroot (which now sets LD_LIBRARY_PATH) is not used for the "build"
rule where the Makefile is created, but is for the clean/binary* targets.

Gbp-Pq: Topic debian
Gbp-Pq: Name fakeroot.diff
This commit is contained in:
Brendan O'Dea 2005-03-18 22:22:25 +11:00 committed by openKylinBot
parent b1109f43f4
commit 0c06d07ea8
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile.SH
View File

@ -48,10 +48,7 @@ case "$useshrplib" in
true) true)
# Prefix all runs of 'miniperl' and 'perl' with # Prefix all runs of 'miniperl' and 'perl' with
# $ldlibpth so that ./perl finds *this* shared libperl. # $ldlibpth so that ./perl finds *this* shared libperl.
case "$LD_LIBRARY_PATH" in ldlibpth="LD_LIBRARY_PATH=` quote "$pwd" `"'$${LD_LIBRARY_PATH:+:}$$LD_LIBRARY_PATH'
'') ldlibpth="LD_LIBRARY_PATH=` quote "$pwd" `" ;;
*) ldlibpth="LD_LIBRARY_PATH=` quote "$pwd" `:` quote "$LD_LIBRARY_PATH" `" ;;
esac
pldlflags="$cccdlflags" pldlflags="$cccdlflags"
static_ldflags='' static_ldflags=''
@ -130,7 +127,7 @@ true)
;; ;;
esac esac
case "$ldlibpthname" in case "$ldlibpthname" in
'') ;; ''|LD_LIBRARY_PATH) ;;
*) *)
case "$osname" in case "$osname" in
os2) os2)