Cleanup ugly build code #146903 by throw_away_2002.

(Portage version: 2.1.1_rc1-r6)

3 files changed, 60 insertions, 2 deletions

diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog
index 0eef102e7a87..7c786b48c470 100644
--- a/sys-fs/e2fsprogs/ChangeLog
+++ b/sys-fs/e2fsprogs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/e2fsprogs
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.89 2006/08/01 04:48:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.90 2006/09/09 10:28:27 vapier Exp $
+
+  09 Sep 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/e2fsprogs-1.39-parse-types.patch, e2fsprogs-1.39.ebuild:
+  Cleanup ugly build code #146903 by throw_away_2002.
 
 *e2fsprogs-1.39 (01 Aug 2006)
 
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.39.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.39.ebuild
index 0ac4c608e32a..55e7ffe3a985 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.39.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.39.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-fs/e2fsprogs/e2fsprogs-1.39.ebuild,v 1.1 2006/08/01 04:48:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.39.ebuild,v 1.2 2006/09/09 10:28:27 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -42,6 +42,7 @@ src_unpack() {
 	chmod u+w po/*.po # Userpriv fix #27348
 	# Clean up makefile to suck less
 	epatch "${FILESDIR}"/e2fsprogs-1.39-makefile.patch
+	epatch "${FILESDIR}"/e2fsprogs-1.39-parse-types.patch #146903
 
 	# Fixes libintl handling on non-glibc #122368
 	epatch "${FILESDIR}"/${PN}-1.39-libintl.patch
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.39-parse-types.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.39-parse-types.patch
new file mode 100644
index 000000000000..8af9128d6591
--- /dev/null
+++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.39-parse-types.patch
@@ -0,0 +1,53 @@
+make this script suck less:
+ - dont use known files in /tmp
+ - dont use absolute paths to headers
+ - dont hardcode gcc/cc
+ - dont spit out warnings about incompat func types
+
+http://bugs.gentoo.org/146903
+
+--- config/parse-types.sh
++++ config/parse-types.sh
+@@ -1,27 +1,20 @@
+ #!/bin/sh
+ 
+-ASM_TYPES=/usr/include/asm/types.h
+-
+-if test ! -f $ASM_TYPES
+-then
+-    echo "" > asm_types.h
+-    echo "No asm_types file found"
+-    exit 1
+-fi
+-
+-cat > /tmp/sed.script << "EOF"
++echo '#include <asm/types.h>' | ${CPP-${CC-gcc} -E} - | sed \
++"
+ /^#/d
+ /^$/d
+ s/__extension__ //
+ s/typedef \(.*\) __u\([1-9]*\);/#define __U\2_TYPEDEF \1/
+ s/typedef \(.*\) __s\([1-9]*\);/#define __S\2_TYPEDEF \1/
+-EOF
+-
+-gcc -E $ASM_TYPES | sed -f /tmp/sed.script | grep ^# > asm_types.h
++" \
++| grep ^# > asm_types.h
+ 
+ cp asm_types.h asm_types.c
+ 
+ cat >> asm_types.c <<EOF
++#include <stdio.h>
++#include <stdlib.h>
+ main(int argc, char **argv)
+ {
+ #ifdef __U8_TYPEDEF
+@@ -102,7 +95,7 @@
+ }
+ EOF
+ 
+-cc -o asm_types asm_types.c
++${BUILD_CC-gcc} -o asm_types asm_types.c
+ if ! ./asm_types 
+ then
+     echo "Problem detected with asm_types.h"