Fix compilation with sanitised linux-headers, bug #173050.

Package-Manager: portage-2.1.2.7

4 files changed, 67 insertions, 14 deletions

diff --git a/dev-lisp/clisp/ChangeLog b/dev-lisp/clisp/ChangeLog
index c7f76e76d5e1..c0a5c386f464 100644
--- a/dev-lisp/clisp/ChangeLog
+++ b/dev-lisp/clisp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lisp/clisp
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/clisp/ChangeLog,v 1.58 2007/03/03 23:26:44 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/clisp/ChangeLog,v 1.59 2007/05/21 18:04:15 ulm Exp $
+
+  21 May 2007; Ulrich Mueller <ulm@gentoo.org>
+  +files/2.41-linux-headers.patch, clisp-2.41.ebuild:
+  Apply patch from upstream to fix compilation with sanitised linux-headers.
+  Fixes bug #173050.
 
   03 Mar 2007; Marius Mauch <genone@gentoo.org> clisp-2.38-r2.ebuild,
   clisp-2.41.ebuild:
diff --git a/dev-lisp/clisp/Manifest b/dev-lisp/clisp/Manifest
index f3bcfb192534..caa5b10ae157 100644
--- a/dev-lisp/clisp/Manifest
+++ b/dev-lisp/clisp/Manifest
@@ -37,6 +37,10 @@ AUX 2.41-fastcgi-Makefile-gentoo.patch 681 RMD160 be7c10a9996175e1df81d456f79a32
 MD5 14144e6a4e14a2d9fa2148736c33a0a6 files/2.41-fastcgi-Makefile-gentoo.patch 681
 RMD160 be7c10a9996175e1df81d456f79a3260bcae50cd files/2.41-fastcgi-Makefile-gentoo.patch 681
 SHA256 affc6b7687d035130ac7ac172d50096d21c06a7098379fe47de1dde659c6ad12 files/2.41-fastcgi-Makefile-gentoo.patch 681
+AUX 2.41-linux-headers.patch 1444 RMD160 609c269738a096cf2120c65fe1979d6c5a775c65 SHA1 b8f658c6e058fe43b6a575b3e171d6f602cc93e6 SHA256 cbf3bd75cc5a9457f34e81c8071865af64310c4f664b1b64b3658cd22abe0e59
+MD5 be172c1198b9b90f2584662eee99edca files/2.41-linux-headers.patch 1444
+RMD160 609c269738a096cf2120c65fe1979d6c5a775c65 files/2.41-linux-headers.patch 1444
+SHA256 cbf3bd75cc5a9457f34e81c8071865af64310c4f664b1b64b3658cd22abe0e59 files/2.41-linux-headers.patch 1444
 DIST clisp-2.38.tar.bz2 8078151 RMD160 9070e1d7cd4db66de62f077b68a7fef7413da622 SHA1 d9586c04ed4778b5c603b3b1df73e8c76220df59 SHA256 98ddb7faa384b9b62621ac9af8b4416cbe1b6df420306fceea9e1e01a880e051
 DIST clisp-2.39.tar.bz2 8071957 RMD160 b31e53cb97a116c683543ee74093fe2a05ed9ea4 SHA1 388cc208cd0bd05a154840e83a4b824a493acbc0 SHA256 9e7db421d076420d60652e7bdaf8241e36d1db6a4cad2a8253afc9952200bbb7
 DIST clisp-2.41.tar.bz2 8319471 RMD160 e98ee7142c01e946f242360c7495df5668694d34 SHA1 0f53703d45807c10e0398fc85352ed605ee566a3 SHA256 1e5f8d9b04024ae072536ae3271075c1a422c02d3997a729a6b00912ed2ae323
@@ -56,14 +60,14 @@ EBUILD clisp-2.39.ebuild 3534 RMD160 88b7b5f7c7561ef05081b77db574c09b9cd87b54 SH
 MD5 452da74a5e3ab60808d013a26e9c1dbf clisp-2.39.ebuild 3534
 RMD160 88b7b5f7c7561ef05081b77db574c09b9cd87b54 clisp-2.39.ebuild 3534
 SHA256 027ef8e73013d104565c35ae71ed67fe1913996ba1bce3025e40f5db40e0f352 clisp-2.39.ebuild 3534
-EBUILD clisp-2.41.ebuild 2643 RMD160 9696c280b344836d2f33cef78620fdb2f105773a SHA1 527c0d4b9687a08c1f99f786658f7ea6f2767935 SHA256 57c2925e45a13f1377f32c47bd0200d4db2b1c88ffa13045928c1f097d74921f
-MD5 307809b49da5a2339b3db617986cbab7 clisp-2.41.ebuild 2643
-RMD160 9696c280b344836d2f33cef78620fdb2f105773a clisp-2.41.ebuild 2643
-SHA256 57c2925e45a13f1377f32c47bd0200d4db2b1c88ffa13045928c1f097d74921f clisp-2.41.ebuild 2643
-MISC ChangeLog 13421 RMD160 a577e99ec872f04459ce9ec50fbac72dc2debd46 SHA1 c758d942142bb4999452a045085bfafc20270fe7 SHA256 b2b1b2d132ad4f5c88dcbd086285413b7b45e8337058bae5e2696f9ee77b724b
-MD5 5b7a8b1dc1544b743edeed7b01a9468b ChangeLog 13421
-RMD160 a577e99ec872f04459ce9ec50fbac72dc2debd46 ChangeLog 13421
-SHA256 b2b1b2d132ad4f5c88dcbd086285413b7b45e8337058bae5e2696f9ee77b724b ChangeLog 13421
+EBUILD clisp-2.41.ebuild 2696 RMD160 bdd12344fd3ae582f53149d57be95596e7189d8c SHA1 337ca782d9f93e36598ac66a1d672ca0289bc376 SHA256 8c1f5d0ac1664515b13b5cff9edb49edab6b19bf2f4760b20c4b55021c0b1307
+MD5 795d581313c4e4c684f0f5361ea0b72d clisp-2.41.ebuild 2696
+RMD160 bdd12344fd3ae582f53149d57be95596e7189d8c clisp-2.41.ebuild 2696
+SHA256 8c1f5d0ac1664515b13b5cff9edb49edab6b19bf2f4760b20c4b55021c0b1307 clisp-2.41.ebuild 2696
+MISC ChangeLog 13618 RMD160 873d820884af0ca61c43a11badf2df9fc861bbc0 SHA1 7e14c4b5b755e95f781a52690eb362b5afc15762 SHA256 a72f1d2c9d08fc4b3f174f13c7729b21bb7168f476faa7d78c13bd97a81ea2c7
+MD5 c89d7c31ad8e05ecc9b9e2432af4bee1 ChangeLog 13618
+RMD160 873d820884af0ca61c43a11badf2df9fc861bbc0 ChangeLog 13618
+SHA256 a72f1d2c9d08fc4b3f174f13c7729b21bb7168f476faa7d78c13bd97a81ea2c7 ChangeLog 13618
 MISC metadata.xml 882 RMD160 c1c9236c3fb6d0594a998221fbff50add9b1d1b2 SHA1 87e15aa8db7170dd4ca3bb0e71c5ce2fb097f588 SHA256 b55a5dec0b7c7764565517bab024bb1526dd21cf58bc4a727f09ac3d2ff4983f
 MD5 485cde76397408cf913fc6d4c7a45a67 metadata.xml 882
 RMD160 c1c9236c3fb6d0594a998221fbff50add9b1d1b2 metadata.xml 882
@@ -84,9 +88,9 @@ MD5 751572a6bad499c23e70a91bf73e4d6e files/digest-clisp-2.41 238
 RMD160 c0949434828b8947ae28dd971848db0ee45bfa74 files/digest-clisp-2.41 238
 SHA256 16ca4c78b4938a9b53837d811e79eab641480a62fcd769d34cb2e5bb01a390d6 files/digest-clisp-2.41 238
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFF6gUp6J2i8a8J4okRAmZbAKDAWnwSek7//b0LI2j7+soXEwOHcgCbBAyc
-eD8mnlFcC2WiWsP8CnzVIKQ=
-=t18B
+iD8DBQFGUd+jOeoy/oIi7uwRAvVBAKCCkkFD+Vi2MxyCq+Q3pjU/59J7oACg2Wv+
+XlhwqJCJqieX33ImxOhmDzw=
+=NwWS
 -----END PGP SIGNATURE-----
diff --git a/dev-lisp/clisp/clisp-2.41.ebuild b/dev-lisp/clisp/clisp-2.41.ebuild
index c6902ec87542..11b001a350a0 100644
--- a/dev-lisp/clisp/clisp-2.41.ebuild
+++ b/dev-lisp/clisp/clisp-2.41.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/clisp/clisp-2.41.ebuild,v 1.3 2007/03/03 23:26:44 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/clisp/clisp-2.41.ebuild,v 1.4 2007/05/21 18:04:15 ulm Exp $
 
 inherit flag-o-matic eutils toolchain-funcs
 
@@ -40,7 +40,9 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
+	cd "${S}"
 	epatch ${FILESDIR}/2.41-fastcgi-Makefile-gentoo.patch
+	epatch ${FILESDIR}/2.41-linux-headers.patch
 }
 
 src_compile() {
diff --git a/dev-lisp/clisp/files/2.41-linux-headers.patch b/dev-lisp/clisp/files/2.41-linux-headers.patch
new file mode 100644
index 000000000000..6da6eefafe88
--- /dev/null
+++ b/dev-lisp/clisp/files/2.41-linux-headers.patch
@@ -0,0 +1,42 @@
+2007-05-20  Bruno Haible  <bruno@clisp.org>
+
+	* unix.d [UNIX_LINUX && UNIX_GNU]: Don't include <asm/page.h>.
+	* lispbibl.d (UNIX_GNU): Move definition down.
+	Reported by Ulrich Müller <ulm@gentoo.org>.
+
+--- src/unix.d	2006/05/23 12:32:25	1.76
++++ src/unix.d	2007/05/20 13:59:43	1.77
+@@ -174,7 +174,7 @@
+   #ifdef UNIX_AUX
+     #include <sys/mmu.h> /* for SHMLBA */
+   #endif
+-  #ifdef UNIX_LINUX
++  #if defined(UNIX_LINUX) && !defined(UNIX_GNU)
+     #include <asm/page.h> /* for SHMLBA on Linux 2.0 */
+   #endif
+   #if defined(UNIX_SUNOS4) || defined(UNIX_SUNOS5)
+--- src/lispbibl.d	2007/04/05 01:56:47	1.718
++++ src/lispbibl.d	2007/05/20 22:49:59	1.719
+@@ -376,9 +376,6 @@
+ #if defined(UNIX_MACOSX) && defined(HAVE_MSYNC)
+   #define UNIX_DARWIN  # MacOS X, a.k.a. Darwin
+ #endif
+-#if (__GLIBC__ >= 2)
+-  #define UNIX_GNU # glibc2 (may be UNIX_LINUX, UNIX_HURD or UNIX_FREEBSD)
+-#endif
+ 
+ 
+ # Choose the character set:
+@@ -1267,6 +1264,12 @@
+ 
+ #include <stdio.h>    /* libc i/o */
+ 
++# A more precise classification of the operating system:
++# (This test works only after at least one system header has been included.)
++#if (__GLIBC__ >= 2)
++  #define UNIX_GNU # glibc2 (may be UNIX_LINUX, UNIX_HURD or UNIX_FREEBSD)
++#endif
++
+ # Determine the offset of a component 'ident' in a struct of the type 'type':
+ # See 0 as pointer to 'type', put a struct 'type' there and determine the
+ # address of its component 'ident' and return it as number: