SOURCES: klibc-klcc.patch - klcc patch reworked (it passes `-stati...

[pluto]

Author: pluto                        Date: Mon Jun 13 20:39:40 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- klcc patch reworked (it passes `-static` flag to the linker correctly now).

---- Files affected:
SOURCES:
   klibc-klcc.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/klibc-klcc.patch
diff -u SOURCES/klibc-klcc.patch:1.1 SOURCES/klibc-klcc.patch:1.2
--- SOURCES/klibc-klcc.patch:1.1	Mon Jun 13 21:06:25 2005
+++ SOURCES/klibc-klcc.patch	Mon Jun 13 22:39:35 2005
@@ -1,6 +1,6 @@
 --- klibc-1.0/klcc.in.orig	2005-03-07 22:44:49.000000000 +0100
 +++ klibc-1.0/klcc.in	2005-06-13 21:05:09.000000000 +0200
-@@ -1,9 +1,9 @@
+@@ -1,22 +1,22 @@
  # -*- perl -*-
  
  # Standard includes
@@ -13,21 +13,32 @@
  
  # Default optimization options (for compiles without -g)
  @optopt =  @OPTFLAGS;
-@@ -13,10 +13,10 @@
- @stdlibpath = ("-L${prefix}/${KCROSS}lib");
+ @goptopt = ('-O');
+ 
+ # Standard library directories
+- at stdlibpath = ("-L${prefix}/${KCROSS}lib");
++ at stdlibpath = ("-L${libdir}");
  
  # Options and libraries to pass to ld; shared versus static
 - at staticopt = ("${prefix}/${KCROSS}lib/crt0.o");
 - at staticlib = ("${prefix}/${KCROSS}lib/libc.a");
 - at sharedopt = (@EMAIN, "${prefix}/${KCROSS}lib/interp.o");
 - at sharedlib = ('-R', "${prefix}/${KCROSS}lib/libc.so");
-+ at staticopt = ("${libdir}/crt0.o");
-+ at staticlib = ("${libdir}/libc.a");
-+ at sharedopt = (@EMAIN, "${libdir}/interp.o");
-+ at sharedlib = ('-R', "${libdir}/libc.so");
++ at staticopt = ("${libdir}/klibc/crt0.o");
++ at staticlib = ("${libdir}/klibc/libc.a");
++ at sharedopt = (@EMAIN, "${libdir}/klibc/interp.o");
++ at sharedlib = ('-R', "${libdir}/klibc/libc.so");
  
  # Returns the language (-x option string) for a specific extension.
  sub filename2lang($) {
+@@ -164,6 +164,7 @@
+     } elsif ( $a eq '-shared' ) {
+ 	$shared = 1;
+     } elsif ( $a eq '-static' ) {
++	push(@ldopt, $a);
+ 	$shared = 0;
+     } elsif ( $a eq '-s' ) {
+ 	$strip = 1;
 --- klibc-1.0/Makefile.orig	2005-03-07 19:17:15.000000000 +0100
 +++ klibc-1.0/Makefile	2005-06-13 20:57:41.000000000 +0200
 @@ -27,10 +27,10 @@
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/klibc-klcc.patch?r1=1.1&r2=1.2&f=u