Cleanup ugly build code #146903 by throw_away_2002.

Package-Manager: portage-2.1.1_rc1-r6

6 files changed, 120 insertions, 4 deletions

diff --git a/sys-libs/com_err/ChangeLog b/sys-libs/com_err/ChangeLog
index 5f5c81321b8f..0db5bd14bb80 100644
--- a/sys-libs/com_err/ChangeLog
+++ b/sys-libs/com_err/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/com_err
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/com_err/ChangeLog,v 1.23 2006/08/01 04:36:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/com_err/ChangeLog,v 1.24 2006/09/09 10:28:05 vapier Exp $
+
+  09 Sep 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/com_err-1.39-parse-types.patch, com_err-1.39.ebuild:
+  Cleanup ugly build code #146903 by throw_away_2002.
 
 *com_err-1.39 (01 Aug 2006)
 
diff --git a/sys-libs/com_err/com_err-1.39.ebuild b/sys-libs/com_err/com_err-1.39.ebuild
index 21ff5b93daed..a03e5bfebb2c 100644
--- a/sys-libs/com_err/com_err-1.39.ebuild
+++ b/sys-libs/com_err/com_err-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-libs/com_err/com_err-1.39.ebuild,v 1.2 2006/08/13 00:27:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/com_err/com_err-1.39.ebuild,v 1.3 2006/09/09 10:28:05 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -22,6 +22,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-1.39-makefile.patch
+	epatch "${FILESDIR}"/${PN}-1.39-parse-types.patch
 }
 
 src_compile() {
diff --git a/sys-libs/com_err/files/com_err-1.39-parse-types.patch b/sys-libs/com_err/files/com_err-1.39-parse-types.patch
new file mode 100644
index 000000000000..8af9128d6591
--- /dev/null
+++ b/sys-libs/com_err/files/com_err-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"
diff --git a/sys-libs/ss/ChangeLog b/sys-libs/ss/ChangeLog
index 3c385ae6778d..03895f46d783 100644
--- a/sys-libs/ss/ChangeLog
+++ b/sys-libs/ss/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/ss
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ss/ChangeLog,v 1.22 2006/08/01 04:44:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ss/ChangeLog,v 1.23 2006/09/09 10:27:29 vapier Exp $
+
+  09 Sep 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/ss-1.39-parse-types.patch, ss-1.39.ebuild:
+  Cleanup ugly build code #146903 by throw_away_2002.
 
 *ss-1.39 (01 Aug 2006)
 
diff --git a/sys-libs/ss/files/ss-1.39-parse-types.patch b/sys-libs/ss/files/ss-1.39-parse-types.patch
new file mode 100644
index 000000000000..8af9128d6591
--- /dev/null
+++ b/sys-libs/ss/files/ss-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"
diff --git a/sys-libs/ss/ss-1.39.ebuild b/sys-libs/ss/ss-1.39.ebuild
index 496c4ac7da13..727cf8c01a73 100644
--- a/sys-libs/ss/ss-1.39.ebuild
+++ b/sys-libs/ss/ss-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-libs/ss/ss-1.39.ebuild,v 1.1 2006/08/01 04:44:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ss/ss-1.39.ebuild,v 1.2 2006/09/09 10:27:29 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -24,6 +24,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-1.38-locale.patch
 	epatch "${FILESDIR}"/${PN}-1.39-makefile.patch
+	epatch "${FILESDIR}"/${PN}-1.39-parse-types.patch #146903
 }
 
 src_compile() {