summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/perl/perl-5.12.3/debian/disable-zlib-bundling.diff
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2011-10-19 14:53:17 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-24 17:27:14 +0100
commit5f8f114e4cc29e96942f96ef7dec6d25e18b6d4f (patch)
tree5b7867dec533d001ce29d8bf7b4869299cea254f /meta/recipes-devtools/perl/perl-5.12.3/debian/disable-zlib-bundling.diff
parent53f7342562a66d1b14ecee234aa76be07951dedc (diff)
downloadpoky-5f8f114e4cc29e96942f96ef7dec6d25e18b6d4f.tar.gz
perl: upgrade from 5.12.3 to 5.14.2
parallel build fix patches are not needed as they are upstream now. Got a new set of debian patch set for 5.14.2 perl-rpdepends: fix the autogenerated rdepends mistakes take out some mdoules which are not going to be built. [Saul Wold: Remove debug] (From OE-Core rev: 8dc5f118832a4aca906239ffed82f72497c37f8e) Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/perl/perl-5.12.3/debian/disable-zlib-bundling.diff')
-rw-r--r--meta/recipes-devtools/perl/perl-5.12.3/debian/disable-zlib-bundling.diff31
1 files changed, 0 insertions, 31 deletions
diff --git a/meta/recipes-devtools/perl/perl-5.12.3/debian/disable-zlib-bundling.diff b/meta/recipes-devtools/perl/perl-5.12.3/debian/disable-zlib-bundling.diff
deleted file mode 100644
index 44349a534e..0000000000
--- a/meta/recipes-devtools/perl/perl-5.12.3/debian/disable-zlib-bundling.diff
+++ /dev/null
@@ -1,31 +0,0 @@
1Upstream-Status:Inappropriate [debian patch]
2
3From: Niko Tyni <ntyni@debian.org>
4Subject: Disable zlib bundling in Compress::Raw::Zlib
5
6Compress::Raw::Zlib statically links its bundled version of zlib
7by default, but we use the system library instead.
8
9---
10 cpan/Compress-Raw-Zlib/config.in | 6 +++---
11 1 files changed, 3 insertions(+), 3 deletions(-)
12
13diff --git a/cpan/Compress-Raw-Zlib/config.in b/cpan/Compress-Raw-Zlib/config.in
14index c56cc03..2c6659b 100644
15--- a/cpan/Compress-Raw-Zlib/config.in
16+++ b/cpan/Compress-Raw-Zlib/config.in
17@@ -16,9 +16,9 @@
18 # Setting the Gzip OS Code
19 #
20
21-BUILD_ZLIB = True
22-INCLUDE = ./zlib-src
23-LIB = ./zlib-src
24+BUILD_ZLIB = False
25+INCLUDE = /usr/include
26+LIB = /usr/lib
27
28 OLD_ZLIB = False
29 GZIP_OS_CODE = AUTO_DETECT
30--
31tg: (a508b62..) debian/disable-zlib-bundling (depends on: upstream)