From 4bcdd27d63305bb579e7e58db60f7425d4d77a7b Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 6 Nov 2006 21:11:51 +0000 Subject: Generate .depend files with CPPFLAGS rather than CFLAGS #154281. (Portage version: 2.1.2_rc1-r3) --- sys-apps/module-init-tools/ChangeLog | 6 +++- .../files/modutils-2.4.27-build.patch | 35 ++++++++++++++++++++++ .../module-init-tools-3.2.2-r1.ebuild | 3 +- 3 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 sys-apps/module-init-tools/files/modutils-2.4.27-build.patch (limited to 'sys-apps/module-init-tools') 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 + +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 module-init-tools-3.2.2-r1.ebuild: 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 -- cgit v1.2.3-65-gdbad