Ignore:
Timestamp:
Dec 28, 2009, 3:21:23 AM (11 years ago)
Author:
Pierre Pronchery
Message:

Updated to libc 0.0.4

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/System/Sources/libc/patches/patch-libtool.diff

    r437 r449  
    1 diff -Naur libc-0.0.3.orig/src/Makefile libc-0.0.3/src/Makefile
    2 --- libc-0.0.3.orig/src/Makefile        2009-11-11 10:34:58.000000000 +0100
    3 +++ libc-0.0.3/src/Makefile     2009-11-16 02:07:08.000000000 +0100
     1diff -Naur libc-0.0.4.orig/src/Makefile libc-0.0.4/src/Makefile
     2--- libc-0.0.4.orig/src/Makefile        2009-12-20 06:56:18.000000000 +0100
     3+++ libc-0.0.4/src/Makefile     2009-12-20 08:16:00.000000000 +0100
    44@@ -1,5 +1,5 @@
    55 SUBDIRS        = dl kernel/linux kernel/freebsd kernel/netbsd kernel/openbsd kernel/solaris math pthread socket
    … …  
    1717 LN     = ln -f
    1818 MKDIR  = mkdir -p
    19 @@ -24,148 +25,142 @@
     19@@ -24,146 +25,142 @@
    2020 subdirs:
    2121        @for i in $(SUBDIRS); do (cd $$i && $(MAKE)) || exit; done
    … …  
    2525 libc_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
    2626-libc_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `$(CC) -print-libgcc-file-name`
    27 -
    2827+libc_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `$(CC) -print-libgcc-file-name` -Xcompiler -nostdlib
    2928 libc_ASFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(ASFLAGS)
    … …  
    3534-libc.so: $(libc_OBJS)
    3635-       $(LD) -o libc.so -Wl,-soname,libc.so.0 $(libc_OBJS) `$(CC) -print-libgcc-file-name`
    37 -
    3836+libc.la: $(libc_OBJS)
    3937+       $(LIBTOOL) --mode=link $(CC) -o libc.la $(libc_OBJS) `$(CC) -print-libgcc-file-name` -Xcompiler -nostdlib -rpath $(LIBDIR) $(libc_LDFLAGS)
    … …  
    254252 start.o: start.S kernel/freebsd/i386/start.S kernel/linux/arm/start.S kernel/linux/i386/start.S kernel/linux/sparc/start.S kernel/netbsd/amd64/start.S kernel/netbsd/i386/start.S kernel/netbsd/sparc64/start.S kernel/netbsd/sparc/start.S kernel/openbsd/arm/start.S kernel/openbsd/i386/start.S
    255253        $(AS) $(start.o_ASFLAGS) -o start.o start.S
    256 @@ -182,19 +177,14 @@
     254@@ -180,19 +177,14 @@
    257255 install: all
    258256        @for i in $(SUBDIRS); do (cd $$i && $(MAKE) install) || exit; done
    … …  
    277275 
    278276 .PHONY: all subdirs clean distclean install uninstall
    279 diff -Naur libc-0.0.3.orig/src/dl/Makefile libc-0.0.3/src/dl/Makefile
    280 --- libc-0.0.3.orig/src/dl/Makefile     2009-11-11 10:34:58.000000000 +0100
    281 +++ libc-0.0.3/src/dl/Makefile  2009-11-16 02:07:08.000000000 +0100
     277diff -Naur libc-0.0.4.orig/src/dl/Makefile libc-0.0.4/src/dl/Makefile
     278--- libc-0.0.4.orig/src/dl/Makefile     2009-12-20 06:56:18.000000000 +0100
     279+++ libc-0.0.4/src/dl/Makefile  2009-12-20 08:16:00.000000000 +0100
    282280@@ -1,4 +1,4 @@
    283281-TARGETS        = libdl.a libdl.so
    … …  
    339337 
    340338 .PHONY: all clean distclean install uninstall
    341 diff -Naur libc-0.0.3.orig/src/dl/project.conf libc-0.0.3/src/dl/project.conf
    342 --- libc-0.0.3.orig/src/dl/project.conf 2009-08-06 00:54:56.000000000 +0200
    343 +++ libc-0.0.3/src/dl/project.conf      2009-11-16 02:06:58.000000000 +0100
    344 @@ -6,8 +6,9 @@
     339diff -Naur libc-0.0.4.orig/src/dl/project.conf libc-0.0.4/src/dl/project.conf
     340--- libc-0.0.4.orig/src/dl/project.conf 2009-08-06 00:54:56.000000000 +0200
     341+++ libc-0.0.4/src/dl/project.conf      2009-12-20 08:15:43.000000000 +0100
     342@@ -6,9 +6,10 @@
    345343 dist=Makefile
    346344 
    … …  
    349347+type=libtool
    350348 sources=dlfcn.c
     349 install=$(LIBDIR)
    351350+ldflags=-Xcompiler -nostdlib
    352  install=$(LIBDIR)
    353351 
    354352 [dlfcn.c]
    355 diff -Naur libc-0.0.3.orig/src/math/Makefile libc-0.0.3/src/math/Makefile
    356 --- libc-0.0.3.orig/src/math/Makefile   2009-11-11 10:34:58.000000000 +0100
    357 +++ libc-0.0.3/src/math/Makefile        2009-11-16 02:07:08.000000000 +0100
     353 depends=../../include/dl/dlfcn.h
     354diff -Naur libc-0.0.4.orig/src/math/Makefile libc-0.0.4/src/math/Makefile
     355--- libc-0.0.4.orig/src/math/Makefile   2009-12-20 06:56:18.000000000 +0100
     356+++ libc-0.0.4/src/math/Makefile        2009-12-20 08:16:00.000000000 +0100
    358357@@ -1,5 +1,5 @@
    359358 SUBDIRS        = amd64 i386
    … …  
    423422 
    424423 .PHONY: all subdirs clean distclean install uninstall
    425 diff -Naur libc-0.0.3.orig/src/math/project.conf libc-0.0.3/src/math/project.conf
    426 --- libc-0.0.3.orig/src/math/project.conf       2009-08-06 00:54:57.000000000 +0200
    427 +++ libc-0.0.3/src/math/project.conf    2009-11-16 02:07:00.000000000 +0100
    428 @@ -9,8 +9,9 @@
     424diff -Naur libc-0.0.4.orig/src/math/project.conf libc-0.0.4/src/math/project.conf
     425--- libc-0.0.4.orig/src/math/project.conf       2009-08-06 00:54:57.000000000 +0200
     426+++ libc-0.0.4/src/math/project.conf    2009-12-20 08:15:45.000000000 +0100
     427@@ -9,9 +9,10 @@
    429428 dist=Makefile,arch.h
    430429 
    … …  
    433432+type=libtool
    434433 sources=arch.S,math.c
     434 install=$(LIBDIR)
    435435+ldflags=-Xcompiler -nostdlib
    436  install=$(LIBDIR)
    437436 
    438437 [arch.S]
    439 diff -Naur libc-0.0.3.orig/src/project.conf libc-0.0.3/src/project.conf
    440 --- libc-0.0.3.orig/src/project.conf    2009-11-08 20:09:37.000000000 +0100
    441 +++ libc-0.0.3/src/project.conf 2009-11-16 02:05:04.000000000 +0100
     438 depends=amd64/math.S,i386/math.S
     439diff -Naur libc-0.0.4.orig/src/project.conf libc-0.0.4/src/project.conf
     440--- libc-0.0.4.orig/src/project.conf    2009-11-07 05:34:48.000000000 +0100
     441+++ libc-0.0.4/src/project.conf 2009-12-20 08:15:27.000000000 +0100
    442442@@ -9,9 +9,9 @@
    443443 dist=Makefile,syscalls.h
    … …  
    452452 
    453453 [start.o]
    454 diff -Naur libc-0.0.3.orig/src/pthread/Makefile libc-0.0.3/src/pthread/Makefile
    455 --- libc-0.0.3.orig/src/pthread/Makefile        2009-11-11 10:34:58.000000000 +0100
    456 +++ libc-0.0.3/src/pthread/Makefile     2009-11-16 02:07:08.000000000 +0100
     454diff -Naur libc-0.0.4.orig/src/pthread/Makefile libc-0.0.4/src/pthread/Makefile
     455--- libc-0.0.4.orig/src/pthread/Makefile        2009-12-20 06:56:18.000000000 +0100
     456+++ libc-0.0.4/src/pthread/Makefile     2009-12-20 08:16:00.000000000 +0100
    457457@@ -1,4 +1,4 @@
    458458-TARGETS        = libpthread.a libpthread.so
    … …  
    514514 
    515515 .PHONY: all clean distclean install uninstall
    516 diff -Naur libc-0.0.3.orig/src/pthread/project.conf libc-0.0.3/src/pthread/project.conf
    517 --- libc-0.0.3.orig/src/pthread/project.conf    2009-08-06 00:54:57.000000000 +0200
    518 +++ libc-0.0.3/src/pthread/project.conf 2009-11-16 02:07:03.000000000 +0100
     516diff -Naur libc-0.0.4.orig/src/pthread/project.conf libc-0.0.4/src/pthread/project.conf
     517--- libc-0.0.4.orig/src/pthread/project.conf    2009-08-06 00:54:57.000000000 +0200
     518+++ libc-0.0.4/src/pthread/project.conf 2009-12-20 08:15:49.000000000 +0100
    519519@@ -6,6 +6,7 @@
    520520 dist=Makefile
    … …  
    524524+type=libtool
    525525 sources=pthread.c
     526 install=$(LIBDIR)
    526527+ldflags=-Xcompiler -nostdlib
    527  install=$(LIBDIR)
    528 diff -Naur libc-0.0.3.orig/src/socket/Makefile libc-0.0.3/src/socket/Makefile
    529 --- libc-0.0.3.orig/src/socket/Makefile 2009-11-11 10:34:58.000000000 +0100
    530 +++ libc-0.0.3/src/socket/Makefile      2009-11-16 02:07:08.000000000 +0100
     528diff -Naur libc-0.0.4.orig/src/socket/Makefile libc-0.0.4/src/socket/Makefile
     529--- libc-0.0.4.orig/src/socket/Makefile 2009-12-20 06:56:18.000000000 +0100
     530+++ libc-0.0.4/src/socket/Makefile      2009-12-20 08:16:00.000000000 +0100
    531531@@ -1,5 +1,5 @@
    532532 SUBDIRS        = kernel/freebsd kernel/linux kernel/netbsd
    … …  
    579579-       $(CC) $(libsocket_CFLAGS) -o sys/socket.o -c sys/socket.c
    580580-
    581 -syscalls.o: syscalls.S kernel/linux/common.h kernel/linux/arm/syscalls.S kernel/linux/i386/syscalls.S kernel/netbsd/amd64/syscalls.S kernel/netbsd/i386/syscalls.S kernel/netbsd/common.h kernel/netbsd/sparc/syscalls.S
     581-syscalls.o: syscalls.S kernel/linux/common.h kernel/linux/amd64/syscalls.S kernel/linux/arm/syscalls.S kernel/linux/i386/syscalls.S kernel/netbsd/amd64/syscalls.S kernel/netbsd/i386/syscalls.S kernel/netbsd/common.h kernel/netbsd/sparc/syscalls.S
    582582-       $(AS) $(libsocket_ASFLAGS) -o syscalls.o syscalls.S
    583 +syscalls.o syscalls.lo: syscalls.S kernel/linux/common.h kernel/linux/arm/syscalls.S kernel/linux/i386/syscalls.S kernel/netbsd/amd64/syscalls.S kernel/netbsd/i386/syscalls.S kernel/netbsd/common.h kernel/netbsd/sparc/syscalls.S
     583+syscalls.o syscalls.lo: syscalls.S kernel/linux/common.h kernel/linux/amd64/syscalls.S kernel/linux/arm/syscalls.S kernel/linux/i386/syscalls.S kernel/netbsd/amd64/syscalls.S kernel/netbsd/i386/syscalls.S kernel/netbsd/common.h kernel/netbsd/sparc/syscalls.S
    584584+       $(LIBTOOL) --mode=compile $(AS) $(libsocket_ASFLAGS) -o syscalls.o syscalls.S
    585585 
    … …  
    606606 
    607607 .PHONY: all subdirs clean distclean install uninstall
    608 diff -Naur libc-0.0.3.orig/src/socket/project.conf libc-0.0.3/src/socket/project.conf
    609 --- libc-0.0.3.orig/src/socket/project.conf     2009-08-06 00:54:56.000000000 +0200
    610 +++ libc-0.0.3/src/socket/project.conf  2009-11-16 02:07:06.000000000 +0100
    611 @@ -9,8 +9,9 @@
     608diff -Naur libc-0.0.4.orig/src/socket/project.conf libc-0.0.4/src/socket/project.conf
     609--- libc-0.0.4.orig/src/socket/project.conf     2009-11-19 19:33:57.000000000 +0100
     610+++ libc-0.0.4/src/socket/project.conf  2009-12-20 08:15:51.000000000 +0100
     611@@ -9,9 +9,10 @@
    612612 dist=Makefile,syscalls.h
    613613 
    … …  
    616616+type=libtool
    617617 sources=arpa/inet.c,netdb.c,sys/socket.c,syscalls.S
     618 install=$(LIBDIR)
    618619+ldflags=-Xcompiler -nostdlib
    619  install=$(LIBDIR)
    620620 
    621621 [sys/socket.c]
     622 depends=kernel/linux/common.h,kernel/netbsd/common.h,syscalls.h
Note: See TracChangeset for help on using the changeset viewer.