Removing forced inlining from the 2.6.7 headers; this should solve issues for GCC 3.4 users.

5 files changed, 44 insertions, 37 deletions

diff --git a/sys-kernel/linux-headers/ChangeLog b/sys-kernel/linux-headers/ChangeLog
index 762353da9c74..2dc8d2d427f9 100644
--- a/sys-kernel/linux-headers/ChangeLog
+++ b/sys-kernel/linux-headers/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/linux-headers
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.82 2004/06/24 22:58:42 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.83 2004/06/28 16:28:29 plasmaroo Exp $
+
+*linux-headers-2.6.7-r1 (28 Jun 2004)
+
+  28 Jun 2004; <plasmaroo@gentoo.org> +linux-headers-2.6.7-r1.ebuild,
+  -linux-headers-2.6.7.ebuild, files/linux-headers-2.6.7-appCompat.patch:
+  Removing forced inlining from the 2.6.7 headers; this should solve inlining
+  issues for GCC 3.4 users.
 
   24 Jun 2004; <plasmaroo@gentoo.org>
   files/linux-headers-2.6.7-appCompat.patch:
diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest
index dd205b9c4e34..72ef4d775aa5 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -1,46 +1,46 @@
-MD5 16e49926440de10d968d618a90b55ff9 linux-headers-2.6.6.ebuild 4174
-MD5 6daf4a5decb1764b6d1d8a97e328c92a linux-headers-2.6.1.ebuild 4101
-MD5 85c981a6cb571f43d669ecac6ec26057 linux-headers-2.6.6-r1.ebuild 4324
+MD5 2131257baadea9b47f7b39a17933b41f ChangeLog 18898
+MD5 1f3ec44260da202dbd9ca1cd54acd6ca linux-headers-2.6.4.ebuild 4167
+MD5 046e797869a7721675ce533f084ac5c0 linux-headers-2.2.26.ebuild 2473
+MD5 c1e81f692603cedee4603d90b3ae49b5 linux-headers-2.4.23.ebuild 3411
+MD5 85d7c8096954bff9e70892c3c4a15e5c linux-headers-2.6.3-r1.ebuild 4003
+MD5 608fe99985244b0445f76cee44c9ae14 metadata.xml 290
+MD5 b7f563cf6e8193de322aa08eac941365 linux-headers-2.6.5.ebuild 4178
 MD5 f8f6361661f6958a8f1c85be4e33b75f linux-headers-2.4.21-r1.ebuild 3873
+MD5 16e49926440de10d968d618a90b55ff9 linux-headers-2.6.6.ebuild 4174
 MD5 e9e7a6164dede765220d7bee22523599 linux-headers-2.4.26.ebuild 3392
+MD5 c3c28fbe9d913923f2a83083f05af32a linux-headers-2.4.22.ebuild 3940
 MD5 733d0368c3849a17dfe9c164910e994c linux-headers-2.4.21.ebuild 3659
-MD5 b7f563cf6e8193de322aa08eac941365 linux-headers-2.6.5.ebuild 4178
-MD5 c1e81f692603cedee4603d90b3ae49b5 linux-headers-2.4.23.ebuild 3411
-MD5 cdde615378b511e1a6e2224f7361cfcb linux-headers-2.6.7.ebuild 4165
 MD5 93ca800a434cb0bf47974a9d5cd6a35e linux-headers-2.4.25.ebuild 3385
-MD5 046e797869a7721675ce533f084ac5c0 linux-headers-2.2.26.ebuild 2473
-MD5 2933e38ef9131a55c6487d65f6bdb8f8 ChangeLog 18607
-MD5 608fe99985244b0445f76cee44c9ae14 metadata.xml 290
-MD5 1f3ec44260da202dbd9ca1cd54acd6ca linux-headers-2.6.4.ebuild 4167
-MD5 85d7c8096954bff9e70892c3c4a15e5c linux-headers-2.6.3-r1.ebuild 4003
+MD5 6daf4a5decb1764b6d1d8a97e328c92a linux-headers-2.6.1.ebuild 4101
+MD5 13fc0bbcbb87fcf2c8c1de9afdc38a5c linux-headers-2.6.7-r1.ebuild 4169
+MD5 85c981a6cb571f43d669ecac6ec26057 linux-headers-2.6.6-r1.ebuild 4324
 MD5 b2590f0a8e1781bc4f04e085bb5b8752 linux-headers-2.0.40.ebuild 1784
-MD5 c3c28fbe9d913923f2a83083f05af32a linux-headers-2.4.22.ebuild 3940
-MD5 830c6d1dcb1b22b9095e6f16f3ebdf85 files/linux-headers-2.6.6-tcp_info-DRS-backport.patch 288
 MD5 8a065c0dc3b8fac8747de35f1af75a2c files/linux-headers-2.6.0-fb.patch 386
+MD5 df6b4c19f4a4cb2b3d3a2a0107d7853d files/digest-linux-headers-2.4.25 67
+MD5 c3e19cc983ab9e751bc4f5c391e66b0c files/generate-asm-sparc 1656
+MD5 556c7008fbfdf81750bbd4ab2beb111e files/digest-linux-headers-2.2.26 67
+MD5 6ef3887ee4018c06c18e8726767189c7 files/digest-linux-headers-2.4.22 67
 MD5 cb8280b584baf48a15e342e96099eeb9 files/linux-headers-2.6.6-appCompat.patch 26265
+MD5 33d51532d0f696fefa15593b2cf2f6de files/digest-linux-headers-2.0.40 66
+MD5 2574d3f1b776f2df365737f456bfe435 files/digest-linux-headers-2.4.26 67
 MD5 1f7aaa49614b3055b6110518b1ed23ee files/digest-linux-headers-2.6.1 66
-MD5 53405777e395f5520722f9fb2398ddd8 files/digest-linux-headers-2.6.4 66
-MD5 a8c4e44a323fbde21b9de3940e2ca5ef files/digest-linux-headers-2.6.5 66
-MD5 b737234adedfb6dc585af6bbb40bf2d3 files/digest-linux-headers-2.6.6 66
-MD5 b405a908c2cc1e6ed3e25f030c41f4c4 files/digest-linux-headers-2.6.7 66
 MD5 9854e47afccae85e887bcb970fc68890 files/digest-linux-headers-2.4.21-r1 67
-MD5 c33f70f0dc30a6fce5cfea06233defd4 files/linux-headers-2.6.3-appCompat.patch 17484
-MD5 aa9ba92e8479bdb5f69b03b5c72be866 files/linux-headers-2.6.4-unistd-nptl-fix.patch 362
+MD5 ebd650d7c2167aa6f3added403d478b0 files/linux-headers-2.6.7-appCompat.patch 29628
 MD5 7f5b6765680735a897bb2fb9e227f6b6 files/linux-headers-2.6.0-appCompat.patch 17983
-MD5 b20951b6bfe31b7307604df8b1b6492e files/linux-headers-2.6.7-appCompat.patch 29721
-MD5 ec3d195f7d40d599802d5c0c5ad8f502 files/linux-headers-2.6.4-appCompat.patch 17240
-MD5 33d51532d0f696fefa15593b2cf2f6de files/digest-linux-headers-2.0.40 66
-MD5 556c7008fbfdf81750bbd4ab2beb111e files/digest-linux-headers-2.2.26 67
 MD5 9854e47afccae85e887bcb970fc68890 files/digest-linux-headers-2.4.21 67
-MD5 6ef3887ee4018c06c18e8726767189c7 files/digest-linux-headers-2.4.22 67
-MD5 79ee1ad9f4629595cd8d0cd20ca56dc1 files/digest-linux-headers-2.4.23 67
-MD5 df6b4c19f4a4cb2b3d3a2a0107d7853d files/digest-linux-headers-2.4.25 67
-MD5 2574d3f1b776f2df365737f456bfe435 files/digest-linux-headers-2.4.26 67
+MD5 b737234adedfb6dc585af6bbb40bf2d3 files/digest-linux-headers-2.6.6-r1 66
+MD5 aa9ba92e8479bdb5f69b03b5c72be866 files/linux-headers-2.6.4-unistd-nptl-fix.patch 362
+MD5 598136365858338b26557b7587c6725f files/linux-headers-2.6.3-strict-ansi-fix.patch 4166
+MD5 1a3b49dce5bc80827496967e767a4a04 files/digest-linux-headers-2.6.3-r1 66
+MD5 a8c4e44a323fbde21b9de3940e2ca5ef files/digest-linux-headers-2.6.5 66
 MD5 537c756a05fe1a6819277938d570b70a files/linux-headers-2.6.0-strict-ansi-fix.patch 1484
-MD5 86ab1f9187d3b8289ac55c0651e16d47 files/generate-asm-sparc 1655
+MD5 c33f70f0dc30a6fce5cfea06233defd4 files/linux-headers-2.6.3-appCompat.patch 17484
+MD5 e300a3e148a7dcc38a0e099494fb6cb3 files/bigendian-byteorder-fix.patch 1557
+MD5 b405a908c2cc1e6ed3e25f030c41f4c4 files/digest-linux-headers-2.6.7-r1 66
+MD5 79ee1ad9f4629595cd8d0cd20ca56dc1 files/digest-linux-headers-2.4.23 67
+MD5 53405777e395f5520722f9fb2398ddd8 files/digest-linux-headers-2.6.4 66
 MD5 a73786f0b9dda7e9ebacb91a192384f9 files/linux-headers-2.6.0-sysctl_h-compat.patch 352
 MD5 459bc20c4015796630e3a9f3dc9125e6 files/linux-headers-strict-ansi-fix.patch 1486
-MD5 598136365858338b26557b7587c6725f files/linux-headers-2.6.3-strict-ansi-fix.patch 4166
-MD5 e300a3e148a7dcc38a0e099494fb6cb3 files/bigendian-byteorder-fix.patch 1557
-MD5 1a3b49dce5bc80827496967e767a4a04 files/digest-linux-headers-2.6.3-r1 66
-MD5 b737234adedfb6dc585af6bbb40bf2d3 files/digest-linux-headers-2.6.6-r1 66
+MD5 b737234adedfb6dc585af6bbb40bf2d3 files/digest-linux-headers-2.6.6 66
+MD5 ec3d195f7d40d599802d5c0c5ad8f502 files/linux-headers-2.6.4-appCompat.patch 17240
+MD5 830c6d1dcb1b22b9095e6f16f3ebdf85 files/linux-headers-2.6.6-tcp_info-DRS-backport.patch 288
diff --git a/sys-kernel/linux-headers/files/digest-linux-headers-2.6.7 b/sys-kernel/linux-headers/files/digest-linux-headers-2.6.7-r1
index fbf6945c9a39..fbf6945c9a39 100644
--- a/sys-kernel/linux-headers/files/digest-linux-headers-2.6.7
+++ b/sys-kernel/linux-headers/files/digest-linux-headers-2.6.7-r1
diff --git a/sys-kernel/linux-headers/files/linux-headers-2.6.7-appCompat.patch b/sys-kernel/linux-headers/files/linux-headers-2.6.7-appCompat.patch
index afc8102d3575..6b01dee8f017 100644
--- a/sys-kernel/linux-headers/files/linux-headers-2.6.7-appCompat.patch
+++ b/sys-kernel/linux-headers/files/linux-headers-2.6.7-appCompat.patch
@@ -972,9 +972,9 @@ diff -ur linux-2.6.7/include/linux/compiler.h linux-2.6.7-gentoo/include/linux/c
  #endif
  
 +#if (__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
-+#define inline          __inline__ __attribute__((always_inline))
-+#define __inline__      __inline__ __attribute__((always_inline))
-+#define __inline        __inline__ __attribute__((always_inline))
++#define inline          __inline__
++#define __inline__      __inline__
++#define __inline        __inline__
 +#ifndef asm
 +#  define asm           __asm__
 +#endif
diff --git a/sys-kernel/linux-headers/linux-headers-2.6.7.ebuild b/sys-kernel/linux-headers/linux-headers-2.6.7-r1.ebuild
index 7b77b620eeac..001ce5705d61 100644
--- a/sys-kernel/linux-headers/linux-headers-2.6.7.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-2.6.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.7.ebuild,v 1.3 2004/06/24 22:58:42 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.7-r1.ebuild,v 1.1 2004/06/28 16:28:29 plasmaroo Exp $
 
 ETYPE="headers"
 inherit kernel eutils