diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2005-03-09 23:55:54 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2005-03-09 23:55:54 +0000 |
| commit | b4e6c2528252f393c9d2fc23c45e3e456cc48693 (patch) | |
| tree | 024b0d1f9575e6ded60a7efe8db7253214f6c9fc /dev-libs/klibc | |
| parent | new upstream version, fixes #84577 (diff) | |
| download | gentoo-2-b4e6c2528252f393c9d2fc23c45e3e456cc48693.tar.gz gentoo-2-b4e6c2528252f393c9d2fc23c45e3e456cc48693.tar.bz2 gentoo-2-b4e6c2528252f393c9d2fc23c45e3e456cc48693.zip | |
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.
(Portage version: 2.0.51.19)
Diffstat (limited to 'dev-libs/klibc')
| -rw-r--r-- | dev-libs/klibc/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-libs/klibc/files/klibc-1.0-makeklcc-empty-args.patch | 31 | ||||
| -rw-r--r-- | dev-libs/klibc/klibc-1.0.ebuild | 12 |
3 files changed, 46 insertions, 5 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/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 } |