浏览代码

the patch is a one-time patch and trivial enough and hence should be included into perl.patch. We use external patches only for official vendor patches or for larger scale patches. Everything else we have to maintain anyway ourself and so it can be included into the local patch.

Ralf S. Engelschall 18 年之前
父节点
当前提交
3f2e529007
共有 2 个文件被更改,包括 20 次插入2 次删除
  1. 20 0
      perl/perl.patch
  2. 0 2
      perl/perl.spec

+ 20 - 0
perl/perl.patch

@@ -348,3 +348,23 @@ Index: hints/freebsd.sh
          cccdlflags='-DPIC -fPIC'
          ;;
 
+
+-----------------------------------------------------------------------------
+
+Fix issue when <asm/page.h> is missing from the Linux headers.
+See https://bugs.gentoo.org/show_bug.cgi?id=168312 for details.
+
+Index: ext/IPC/SysV/SysV.xs
+--- ext/IPC/SysV/SysV.xs.orig       2001-06-30 14:46:07.000000000 -0400
++++ ext/IPC/SysV/SysV.xs     2006-06-02 17:37:22.000000000 -0400
+@@ -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>
+

+ 0 - 2
perl/perl.spec

@@ -38,7 +38,6 @@ Release:      20071011
 #   list of sources
 Source0:      ftp://ftp.cpan.org/pub/CPAN/src/perl-%{version}.tar.gz
 Patch0:       perl.patch
-Patch1:       http://bugs.gentoo.org/attachment.cgi?id=111427
 
 #   build information
 Prefix:       %{l_prefix}
@@ -64,7 +63,6 @@ AutoReqProv:  no
 %prep
     %setup -q
     %patch -p0
-    %patch -p1 -P 1
     chmod -R u+w .
 
 %build