Only include compiler.h if using 2.6 headers #71330.

diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index db57b9f280853da6a74bfe627cfa44b075ff140a..159d45d208d3714a4418ff207e3aecfb86556c49 100644 (file)
--- a/sys-apps/util-linux/ChangeLog
+++ b/sys-apps/util-linux/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/util-linux
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.91 2004/11/14 08:46:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.92 2004/11/16 02:28:00 vapier Exp $
+
+  15 Nov 2004; Mike Frysinger <vapier@gentoo.org>
+  util-linux-2.12i-r1.ebuild:
+  Only include compiler.h if using 2.6 headers #71330.
 
 *util-linux-2.12i-r1 (14 Nov 2004)
 

diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index ac4e3066f3e8a21386563c282cd43b50873dcf50..227542f58e218ebfd2904db3b90aa112be9e4030 100644 (file)
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -1,7 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 3f602e7b8a396f9ddc07ce687d935361 ChangeLog 15567
+MD5 5214ad0706400a79ee23d8accc5b86a6 ChangeLog 15703
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 a4ef29239ccf28cf039d13951c6b8c06 util-linux-2.11z-r8.ebuild 3135
 MD5 3c3a1ff0272a0ff8c192ac49031ec8cd util-linux-2.11z-r9.ebuild 3328
@@ -11,7 +8,7 @@ MD5 956fda46dcf04bbb717ec282840edada util-linux-2.12-r4.ebuild 4101
 MD5 b1770169fdbfa0b28480dbebf67d3222 util-linux-2.12-r5.ebuild 4196
 MD5 4bb184b87ec90bdc579a71f53214f21a util-linux-2.12b-r1.ebuild 4983
 MD5 46b84caf300acc762451ca3631a2bb14 util-linux-2.12b.ebuild 4874
-MD5 da16c06477485565a6febe73cb666ba8 util-linux-2.12i-r1.ebuild 3632
+MD5 4c610709ca38d2d3da64247ef206603a util-linux-2.12i-r1.ebuild 3688
 MD5 02afa4d774f45ab0b9ef42ecc1748005 files/digest-util-linux-2.11z-r8 153
 MD5 02afa4d774f45ab0b9ef42ecc1748005 files/digest-util-linux-2.11z-r9 153
 MD5 830453d37b748b7e2ec454603e33b920 files/digest-util-linux-2.12-r2 151
@@ -46,10 +43,3 @@ MD5 0be8df03dae23c81a0e929e58a4114e0 files/util-linux-2.11z-01-nfsv4.dif 13442
 MD5 a9bc06c292401d6f2d27e8e4ebf7e6ae files/util-linux-2.12i-fat-LABEL-support.patch 2304
 MD5 33ddd96078cf91030b80f73eb70f5371 files/util-linux-2.12i-swapon-check-symlinks.patch 875
 MD5 73c0cb6f9aa5fa84e701fc68d0478aac files/util-linux-2.12i-nfsv4.patch 12854
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBlxuqHTu7gpaalycRApZWAJwI69uzEMPzoAPtnEr7C82RNpYvrACfcPCx
-UozEGol7SAy5+3GnGjph6a0=
-=h8Sj
------END PGP SIGNATURE-----

diff --git a/sys-apps/util-linux/util-linux-2.12i-r1.ebuild b/sys-apps/util-linux/util-linux-2.12i-r1.ebuild
index 96a383199054d1f3419ae9c4e5726a82f1a478a0..136dd535ffe9f5d48efa3c704160d66bd6f150d0 100644 (file)
--- a/sys-apps/util-linux/util-linux-2.12i-r1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.12i-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-apps/util-linux/util-linux-2.12i-r1.ebuild,v 1.1 2004/11/14 08:46:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.12i-r1.ebuild,v 1.2 2004/11/16 02:28:00 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -103,7 +103,8 @@ src_compile() {
        emake || die "emake failed"
 
        cd partx
-       emake CFLAGS="${CFLAGS} -include linux/compiler.h" || die "make partx failed"
+       has_version sys-kernel/linux26-headers && append-flags -include linux/compiler.h
+       emake CFLAGS="${CFLAGS}" || die "make partx failed"
 }
 
 src_install() {