Patch makeklcc.pl to not generate '' arrays if they are empty, else we get

the issue where '' is passed to ld, etc, and they fail with cannot find
file.

Package-Manager: portage-2.0.51.19

4 files changed, 52 insertions, 10 deletions

diff --git a/dev-libs/klibc/ChangeLog b/dev-libs/klibc/ChangeLog
index 93f9a2e841c4..e8389cc79abe 100644
--- a/dev-libs/klibc/ChangeLog
+++ b/dev-libs/klibc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/klibc
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/ChangeLog,v 1.1 2005/03/09 20:59:05 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/ChangeLog,v 1.2 2005/03/09 23:55:54 azarah Exp $
+
+  10 Mar 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/klibc-1.0-makeklcc-empty-args.patch, klibc-1.0.ebuild:
+  Patch makeklcc.pl to not generate '' arrays if they are empty, else we get
+  the issue where '' is passed to ld, etc, and they fail with cannot find
+  file.
 
 *klibc-1.0 (09 Mar 2005)
 
diff --git a/dev-libs/klibc/Manifest b/dev-libs/klibc/Manifest
index 797a8da106ae..91e075d32091 100644
--- a/dev-libs/klibc/Manifest
+++ b/dev-libs/klibc/Manifest
@@ -1,15 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 752e00ddb36492cd8a8069bb0a2f46b7 klibc-1.0.ebuild 3162
+MD5 300321e4e9125b68cfc58017ec3949fd klibc-1.0.ebuild 3289
 MD5 b612d343db3c54560665171eb7db245c metadata.xml 223
-MD5 8c182fba2dd6a4c798fbf1fe6993ef73 ChangeLog 351
+MD5 cc7dd201275317cd75a1094c8c210b1c ChangeLog 627
 MD5 d995810231e49d3aee9101cebc8a6a17 files/digest-klibc-1.0 62
 MD5 5c3c81897bd984be9f30c508fc07745b files/klibc.m4 2936
+MD5 e70edb40913b7ad07638a7202f773b6f files/klibc-1.0-makeklcc-empty-args.patch 807
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFCL2RfqburzKaJYLYRAjOKAJ9LAwOh0vAvUgHSVjWhTjE7ZXpTbwCgmF4k
-ilDRELJVjD+FaXxuNYzbBaM=
-=SUnq
+iD8DBQFCL43I1ZcsMnZjRyIRAjYtAJ9mQgJV9CGV16/xiiQeLt6lVOPmNwCeMSUy
+TmLumLRjlvW3ctxPOSBwfKk=
+=1SyL
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/klibc/files/klibc-1.0-makeklcc-empty-args.patch b/dev-libs/klibc/files/klibc-1.0-makeklcc-empty-args.patch
new file mode 100644
index 000000000000..e86ae61ee401
--- /dev/null
+++ b/dev-libs/klibc/files/klibc-1.0-makeklcc-empty-args.patch
@@ -0,0 +1,31 @@
+If say LDFLAGS = "", then '' gets passed as arg to ld which borks
+
+--- 1/makeklcc.pl	2005-03-10 00:22:03.000000000 +0200
++++ 2/makeklcc.pl	2005-03-10 01:26:51.000000000 +0200
+@@ -7,24 +7,14 @@
+ 
+ ($klccin, $klibcconf, $perlpath) = @ARGV;
+ 
+-# This should probably handle quotes and escapes...
+-sub string2list($)
+-{
+-    my($s) = @_;
+-
+-    $s =~ s/\s+/\',\'/g;
+-    return "(\'".$s."\')";
+-}
+-
+ print "#!${perlpath}\n";
+ 
+ open(KLIBCCONF, '<', $klibcconf) or die "$0: cannot open $klibcconf: $!\n";
+ while ( defined($l = <KLIBCCONF>) ) {
+-    chomp $l;
+-    if ( $l =~ /^([^=]+)\=(.*)$/ ) {
++    if ( $l =~ /^([^=]+)=(.*)$/ ) {
+ 	$n = $1;  $s = $2;
+ 	print "\$$n = \"\Q$s\E\";\n";
+-	print "\@$n = ", string2list($s), ";\n";
++	print "\@$n = qw( $s );\n";
+ 	print "\$conf{\'\L$n\E\'} = \\\$$n;\n";
+     }
+ }
diff --git a/dev-libs/klibc/klibc-1.0.ebuild b/dev-libs/klibc/klibc-1.0.ebuild
index c16a2b92e44d..87af33b102a5 100644
--- a/dev-libs/klibc/klibc-1.0.ebuild
+++ b/dev-libs/klibc/klibc-1.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/klibc-1.0.ebuild,v 1.1 2005/03/09 20:59:05 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/klibc-1.0.ebuild,v 1.2 2005/03/09 23:55:54 azarah Exp $
 
-inherit linux-mod
+inherit eutils linux-mod
 
 export CTARGET=${CTARGET:-${CHOST}}
 if [[ ${CTARGET} == ${CHOST} ]] ; then
@@ -49,7 +49,7 @@ guess_arch() {
 
 	return 1
 }
-	
+
 
 src_unpack() {
 	unpack ${A}
@@ -76,8 +76,12 @@ src_unpack() {
 		eerror "(KERNEL_ARCH=\"${kernel_arch}\", ARCH=\"$(guess_arch)\")"
 		die "Your kernel sources are not configured for your chosen arch!"
 	fi
-	
+
 	cd ${S}
+
+	# If say LDFLAGS = "", then '' gets passed as arg to ld which borks
+	epatch ${FILESDIR}/${P}-makeklcc-empty-args.patch
+
 	ln -snf ${KV_DIR} linux
 }