[oe-commits] org.oe.dev perl/perl-native 5.8.8: Fix up asm/page.h include issue. Perl was including

lenehan commit openembedded-commits at lists.openembedded.org
Fri Jul 6 03:37:27 UTC 2007


perl/perl-native 5.8.8: Fix up asm/page.h include issue. Perl was including
it in order to get the definition for getpagesize which has been definied in
unistd.h, which it already includes, since glibc 2.1. Some versions of linux
libc headers removed the asm/page.h resulting in failures here for some
people. Closes #2546.

Author: lenehan at openembedded.org
Branch: org.openembedded.dev
Revision: f73312a7f2042cd2d85e7ee1a7d90847bd73e2e2
ViewMTN: http://monotone.openembedded.org/revision.psp?id=f73312a7f2042cd2d85e7ee1a7d90847bd73e2e2
Files:
1
packages/perl/perl-5.8.8/asm-pageh-fix.patch
packages/perl/perl-native_5.8.8.bb
packages/perl/perl_5.8.8.bb
Diffs:

#
# mt diff -rffd0514c9303d625e47c28920ddf079f27f6a27b -rf73312a7f2042cd2d85e7ee1a7d90847bd73e2e2
#
# 
# 
# add_file "packages/perl/perl-5.8.8/asm-pageh-fix.patch"
#  content [88de907a5838bef4de53f3c7515dad79964e02c0]
# 
# patch "packages/perl/perl-native_5.8.8.bb"
#  from [a4ceb22d5157e563528a7cce14a7c89322fadfb7]
#    to [2cae048240cb214c212fca8f25326366a6306e02]
# 
# patch "packages/perl/perl_5.8.8.bb"
#  from [5d1af066278897f4b9310e0748eaf6e64f094a96]
#    to [518122a5334d6a5c08752f625bba68be022d6dbb]
# 
============================================================
--- packages/perl/perl-5.8.8/asm-pageh-fix.patch	88de907a5838bef4de53f3c7515dad79964e02c0
+++ packages/perl/perl-5.8.8/asm-pageh-fix.patch	88de907a5838bef4de53f3c7515dad79964e02c0
@@ -0,0 +1,19 @@
+Perl inclues asm/page.h in order to get the definition for getpagesize which
+has been definied in unistd.h since glibc 2.1. Some recent version of linux
+libc headers removed the asm/page.h resulting in failures here for some
+people.
+
+Index: perl-5.8.8/ext/IPC/SysV/SysV.xs
+===================================================================
+--- perl-5.8.8.orig/ext/IPC/SysV/SysV.xs	2001-07-01 04:46:07.000000000 +1000
++++ perl-5.8.8/ext/IPC/SysV/SysV.xs	2007-07-06 11:40:21.000000000 +1000
+@@ -3,9 +3,6 @@
+ #include "XSUB.h"
+ 
+ #include <sys/types.h>
+-#ifdef __linux__
+-#   include <asm/page.h>
+-#endif
+ #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM)
+ #ifndef HAS_SEM
+ #   include <sys/ipc.h>
============================================================
--- packages/perl/perl-native_5.8.8.bb	a4ceb22d5157e563528a7cce14a7c89322fadfb7
+++ packages/perl/perl-native_5.8.8.bb	2cae048240cb214c212fca8f25326366a6306e02
@@ -1,9 +1,9 @@ DEPENDS = "virtual/db-native gdbm-native
 DESCRIPTION = "Perl is a popular scripting language."
 HOMEPAGE = "http://www.perl.org/"
 SECTION = "libs"
 LICENSE = "Artistic|GPL"
 DEPENDS = "virtual/db-native gdbm-native"
-PR = "r12"
+PR = "r13"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/perl-${PV}"
 
@@ -14,11 +14,9 @@ SRC_URI = "http://ftp.funet.fi/pub/CPAN/
            file://native-nopacklist.patch;patch=1 \
            file://native-no-gdbminc.patch;patch=1 \
            file://native-perlinc.patch;patch=1 \
-           file://makedepend-dash.patch;patch=1"
+           file://makedepend-dash.patch;patch=1 \
+           file://asm-pageh-fix.patch;patch=1"
 
-# This sloppy patch breaks normal gcc
-#           file://native-ssp.patch;patch=1
-
 S = "${WORKDIR}/perl-${PV}"
 
 inherit native
============================================================
--- packages/perl/perl_5.8.8.bb	5d1af066278897f4b9310e0748eaf6e64f094a96
+++ packages/perl/perl_5.8.8.bb	518122a5334d6a5c08752f625bba68be022d6dbb
@@ -5,7 +5,7 @@ DEPENDS = "virtual/db perl-native grep-n
 PRIORITY = "optional"
 # We need gnugrep (for -I)
 DEPENDS = "virtual/db perl-native grep-native"
-PR = "r23"
+PR = "r24"
 
 # Major part of version
 PVM = "5.8"
@@ -13,7 +13,7 @@ SRC_URI = "ftp://ftp.funet.fi/pub/CPAN/s
 SRC_URI = "ftp://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \
         file://Makefile.patch;patch=1 \
         file://Makefile.SH.patch;patch=1 \
-	file://makedepend-dash.patch;patch=1 \
+        file://makedepend-dash.patch;patch=1 \
         file://installperl.patch;patch=1 \
         file://perl-dynloader.patch;patch=1 \
         file://perl-moreconfig.patch;patch=1 \
@@ -28,6 +28,7 @@ SRC_URI = "ftp://ftp.funet.fi/pub/CPAN/s
         file://60_debian_libnet_config_path.patch;patch=1 \
         file://62_debian_cpan_definstalldirs.patch;patch=1 \
         file://64_debian_enc2xs_inc.patch;patch=1 \
+        file://asm-pageh-fix.patch;patch=1 \
         file://config.sh \
         file://config.sh-32 \
         file://config.sh-32-le \






More information about the Openembedded-commits mailing list