Generate .depend files with CPPFLAGS rather than CFLAGS #154281.

Package-Manager: portage-2.1.2_rc1-r3

4 files changed, 57 insertions, 13 deletions

diff --git a/sys-apps/module-init-tools/ChangeLog b/sys-apps/module-init-tools/ChangeLog
index 161f47f19f07..31812cd6575e 100644
--- a/sys-apps/module-init-tools/ChangeLog
+++ b/sys-apps/module-init-tools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/module-init-tools
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/ChangeLog,v 1.113 2006/09/04 05:56:35 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/ChangeLog,v 1.114 2006/11/06 21:11:51 vapier Exp $
+
+  06 Nov 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/modutils-2.4.27-build.patch, module-init-tools-3.2.2-r1.ebuild:
+  Generate .depend files with CPPFLAGS rather than CFLAGS #154281.
 
   04 Sep 2006; Joshua Kinard <kumba@gentoo.org>
   module-init-tools-3.2.2-r1.ebuild:
diff --git a/sys-apps/module-init-tools/Manifest b/sys-apps/module-init-tools/Manifest
index 7d2890500204..d9580328c470 100644
--- a/sys-apps/module-init-tools/Manifest
+++ b/sys-apps/module-init-tools/Manifest
@@ -13,6 +13,10 @@ AUX modutils-2.4.27-alias.patch 2246 RMD160 bcf4fffbecae76e5b14b05c9003ba4f0cf26
 MD5 5428d53f18b5fac287741b23634d84dc files/modutils-2.4.27-alias.patch 2246
 RMD160 bcf4fffbecae76e5b14b05c9003ba4f0cf2675ff files/modutils-2.4.27-alias.patch 2246
 SHA256 453e3ab982088e2e85164e63b4944af58cd01c2b2d45d75fdcda6649a339878f files/modutils-2.4.27-alias.patch 2246
+AUX modutils-2.4.27-build.patch 948 RMD160 f1b08653720bbba56505cef5df378d6365c54ed5 SHA1 481d7f31c6e58e4356537b728779d014edece374 SHA256 7b015de3c739e996247edcda9a1df59fa871f4e93a408a8033f0e64c36325703
+MD5 b3a5ce73fcf7d0cc851597e739f3c072 files/modutils-2.4.27-build.patch 948
+RMD160 f1b08653720bbba56505cef5df378d6365c54ed5 files/modutils-2.4.27-build.patch 948
+SHA256 7b015de3c739e996247edcda9a1df59fa871f4e93a408a8033f0e64c36325703 files/modutils-2.4.27-build.patch 948
 AUX modutils-2.4.27-flex.patch 805 RMD160 aa0806e61e5287a5ce821bce66cbfa028e50576b SHA1 87d2dee1db44ff854e3d4c371efd78cc3f613578 SHA256 dbe0c3207751157e7b104d66bdfeea280343ceabe856dc5d51849c206fdccad9
 MD5 27a62130de1c51fc678efc0e9ad67ddd files/modutils-2.4.27-flex.patch 805
 RMD160 aa0806e61e5287a5ce821bce66cbfa028e50576b files/modutils-2.4.27-flex.patch 805
@@ -31,14 +35,14 @@ RMD160 6c34f6ff25019884495c21af525e88a63e449b3c files/modutils-2.4.27-no-nested-
 SHA256 3e9961a7c9411e8c01eb48d9053d7901ec7a90ee0e070e85bd766385f36d563d files/modutils-2.4.27-no-nested-function.patch 1422
 DIST module-init-tools-3.2.2.tar.bz2 169182 RMD160 42abfe10709315180898106e3c7c1ce916e01166 SHA1 b51e8ac170be23a1f2e301a1dddd47a47ec2186a SHA256 c080f7e42e60456eab33051026da388b5d21a360e9d2bee26ce9991427a758aa
 DIST modutils-2.4.27.tar.bz2 234963 RMD160 3179d364106859cf6dbd1fad82d8356337634735 SHA1 fa268b48d98e0efab349d45fa7fb2372d58320c1 SHA256 ab4c9191645f9ffb455ae7c014d8c45339c13a1d0f6914817cfbf30a0bc56bf0
-EBUILD module-init-tools-3.2.2-r1.ebuild 4917 RMD160 8de44e49fbe02908f6efe97d229165f9778c019d SHA1 12d9e3df07579ae8c4ebd4cc35af745370ba1a08 SHA256 b3239d8af2bcab5094923b371a81ce03fb1370c33d16381a162a77965613ffd2
-MD5 14a2c31d96b1511cc96b25fcc7b49da8 module-init-tools-3.2.2-r1.ebuild 4917
-RMD160 8de44e49fbe02908f6efe97d229165f9778c019d module-init-tools-3.2.2-r1.ebuild 4917
-SHA256 b3239d8af2bcab5094923b371a81ce03fb1370c33d16381a162a77965613ffd2 module-init-tools-3.2.2-r1.ebuild 4917
-MISC ChangeLog 20584 RMD160 310de6133bda6ec33252101b6519b0104e558eec SHA1 0a814bcf9592a89072f323428d76de966280938d SHA256 efbfdb08ac46bd39cf81e82569da2dbab2c1ee8325e8f96e499125ca357151c5
-MD5 89d603aa9a34dcdb906457d08d3eb1e4 ChangeLog 20584
-RMD160 310de6133bda6ec33252101b6519b0104e558eec ChangeLog 20584
-SHA256 efbfdb08ac46bd39cf81e82569da2dbab2c1ee8325e8f96e499125ca357151c5 ChangeLog 20584
+EBUILD module-init-tools-3.2.2-r1.ebuild 4976 RMD160 8e5d8f740ea7e527ecc61b84aa45c16deff5265e SHA1 8150323ac4ce406ec389510e8a467cece45bf3ff SHA256 031c4734d87ddaa7b7109840b8c2b29321c11818d060701640e197e54b21cd83
+MD5 f5339686e5d2953429797a691fa19057 module-init-tools-3.2.2-r1.ebuild 4976
+RMD160 8e5d8f740ea7e527ecc61b84aa45c16deff5265e module-init-tools-3.2.2-r1.ebuild 4976
+SHA256 031c4734d87ddaa7b7109840b8c2b29321c11818d060701640e197e54b21cd83 module-init-tools-3.2.2-r1.ebuild 4976
+MISC ChangeLog 20776 RMD160 3a5e66e5f662d6e0462f5e578a853a118e88054f SHA1 42d7445298bef978b146516214b256ebedf8e5da SHA256 06896e919a521b133e686e26159ceb53a2636f3096832b4fb8aafbd1761f0985
+MD5 251bc08f88e2edda31d1d32efda5a878 ChangeLog 20776
+RMD160 3a5e66e5f662d6e0462f5e578a853a118e88054f ChangeLog 20776
+SHA256 06896e919a521b133e686e26159ceb53a2636f3096832b4fb8aafbd1761f0985 ChangeLog 20776
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -49,7 +53,7 @@ SHA256 a0137b244c6cab76e8a2cb31e651484992231b823af1d8d4fc2e1a5db10fe5f6 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFFJ0UamhnQswr0vIRAkLKAKCMcKkpIMTQZPhTWcFKbjYsPnPGhwCdHLXf
-4b6APMre1XAS0nZhzOF9po8=
-=48Ic
+iD8DBQFFT6VKamhnQswr0vIRAmoSAKCvczhtM7CdVA2J3sfIZgvO3TRuqACglT6M
+liwrdbapaZPDDozisG0eJL4=
+=EG0D
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/module-init-tools/files/modutils-2.4.27-build.patch b/sys-apps/module-init-tools/files/modutils-2.4.27-build.patch
new file mode 100644
index 000000000000..00cc103257f7
--- /dev/null
+++ b/sys-apps/module-init-tools/files/modutils-2.4.27-build.patch
@@ -0,0 +1,35 @@
+http://bugs.gentoo.org/154281
+
+--- util/Makefile.in
++++ util/Makefile.in
+@@ -42,7 +42,7 @@
+ install-bin: all
+ 
+ dep depend .depend: $(OBJS:.o=.c)
+-	$(CC) -M $(CFLAGS) $(DEFS) $^ > .depend
++	$(CC) -M $(CPPFLAGS) $(DEFS) $^ > .depend
+ 
+ ifeq (.depend,$(wildcard .depend))
+ include .depend
+--- obj/Makefile.in
++++ obj/Makefile.in
+@@ -78,7 +78,7 @@
+ install-bin: all
+ 
+ dep depend .depend: $(LIBOBJ_SRCS)
+-	$(CC) -M $(CFLAGS) $(DEFSNOARCH) $(DEFS) $^ > .depend
++	$(CC) -M $(CPPFLAGS) $(DEFSNOARCH) $(DEFS) $^ > .depend
+ 
+ ifeq (.depend,$(wildcard .depend))
+ include .depend
+--- insmod/Makefile.in.orig	2006-11-06 16:10:44.000000000 -0500
++++ insmod/Makefile.in	2006-11-06 16:10:53.000000000 -0500
+@@ -146,7 +146,7 @@
+ 	rm -f Makefile
+ 
+ dep depend .depend: $(addsuffix .c, $(PROGS))
+-	$(CC) -M $(CFLAGS) $(DEFSNOARCH) $(DEFS) $^ > .depend
++	$(CC) -M $(CPPFLAGS) $(DEFSNOARCH) $(DEFS) $^ > .depend
+ 
+ ifeq (.depend,$(wildcard .depend))
+ include .depend
diff --git a/sys-apps/module-init-tools/module-init-tools-3.2.2-r1.ebuild b/sys-apps/module-init-tools/module-init-tools-3.2.2-r1.ebuild
index 145f31ceeac6..b693a7d98cf3 100644
--- a/sys-apps/module-init-tools/module-init-tools-3.2.2-r1.ebuild
+++ b/sys-apps/module-init-tools/module-init-tools-3.2.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.2.2-r1.ebuild,v 1.15 2006/09/23 02:31:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.2.2-r1.ebuild,v 1.16 2006/11/06 21:11:51 vapier Exp $
 
 inherit flag-o-matic eutils toolchain-funcs fixheadtails
 
@@ -38,6 +38,7 @@ src_unpack() {
 		epatch "${FILESDIR}"/modutils-2.4.27-flex.patch
 		epatch "${FILESDIR}"/modutils-2.4.27-no-nested-function.patch
 		epatch "${FILESDIR}"/modutils-2.4.27-hppa.patch
+		epatch "${FILESDIR}"/modutils-2.4.27-build.patch #154281
 	fi
 
 	# Fixes for new module-init-tools