mirror of
git://git.yoctoproject.org/poky
synced 2026-09-09 05:19:17 +00:00
3f7e55baa6
* Remove:
- perl-5.14.3-fix-CVE-2010-4777.patch: backport
- fix-FF_MORE-crash.patch: backport
- perl-rprovides.inc: it was introduced by 5.8.7, the lines in it are like:
RPROVIDES_perl-module-b-asmdata = "perl-module-${TARGET_SYS}-b-asmdata"
If some packages do RPDEND on something like
perl-module-${TARGET_SYS}-b-asmdatam, we need update the package rather
than keep use RPROVIDES in perl-rprovides.inc, so remove it.
- perl-rprovides_5.20.0.inc: it only has one line:
RPROVIDES_perl-module-module-build, but the perl-module-module-build
is gone in 5.22.0, so remove it.
* Update:
- debian patches from http://ftp.de.debian.org/debian/pool/main/p/perl/perl_5.20.0-1.debian.tar.xz
- Makefile.SH.patch
- Merge 0001-Makefile.SH-fix-do_install-failed.patch into Makefile.SH.patch
- native-nopacklist.patch
- config.sh
* The CGI.pm and Module::Build disappear from core, so no
perl-module-module-build.rpm any more, more info:
http://perltricks.com/article/165/2015/4/10/A-preview-of-Perl-5-22
(From OE-Core rev: 06d43a90acbe63baea62d220659149a3ff2f9198)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
43 lines
1.4 KiB
Diff
43 lines
1.4 KiB
Diff
From 27ae7b18078d801a2c943aa6de2f7e9808177251 Mon Sep 17 00:00:00 2001
|
|
From: Brendan O'Dea <bod@debian.org>
|
|
Date: Fri, 18 Mar 2005 22:22:25 +1100
|
|
Subject: 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.
|
|
|
|
Patch-Name: debian/fakeroot.diff
|
|
---
|
|
Makefile.SH | 7 ++-----
|
|
1 file changed, 2 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/Makefile.SH b/Makefile.SH
|
|
index 034d812..04dd7d5 100755
|
|
--- a/Makefile.SH
|
|
+++ b/Makefile.SH
|
|
@@ -39,10 +39,7 @@ case "$useshrplib" in
|
|
true)
|
|
# Prefix all runs of 'miniperl' and 'perl' with
|
|
# $ldlibpth so that ./perl finds *this* shared libperl.
|
|
- case "$LD_LIBRARY_PATH" in
|
|
- '') ldlibpth="LD_LIBRARY_PATH=` quote "$pwd" `" ;;
|
|
- *) ldlibpth="LD_LIBRARY_PATH=` quote "$pwd" `:` quote "$LD_LIBRARY_PATH" `" ;;
|
|
- esac
|
|
+ ldlibpth="LD_LIBRARY_PATH=` quote "$pwd" `"'$${LD_LIBRARY_PATH:+:}$$LD_LIBRARY_PATH'
|
|
|
|
pldlflags="$cccdlflags"
|
|
static_ldflags=''
|
|
@@ -113,7 +110,7 @@ true)
|
|
;;
|
|
esac
|
|
case "$ldlibpthname" in
|
|
- '') ;;
|
|
+ ''|LD_LIBRARY_PATH) ;;
|
|
*)
|
|
case "$osname" in
|
|
os2)
|