Contents of /trunk/klibc/patches/klibc-1.5-2.6.24.patch
Parent Directory | Revision Log
Revision 587 -
(show annotations)
(download)
Thu May 1 12:01:05 2008 UTC (16 years, 5 months ago) by niro
File size: 1851 byte(s)
Thu May 1 12:01:05 2008 UTC (16 years, 5 months ago) by niro
File size: 1851 byte(s)
-fix compilation in multilib systems
1 | unchanged: |
2 | --- klibc-1.5.orig/usr/klibc/arch/i386/MCONFIG 2007-03-04 02:52:10.000000000 +0100 |
3 | +++ klibc-1.5/usr/klibc/arch/i386/MCONFIG 2008-01-27 16:06:08.000000000 +0100 |
4 | @@ -31,3 +31,4 @@ |
5 | # calls, and work on the memory models for this architecture |
6 | # 96 MB - normal binaries start at 128 MB |
7 | KLIBCSHAREDFLAGS = -Ttext 0x06000200 |
8 | +KLIBCASMARCH = x86 |
9 | unchanged: |
10 | --- klibc-1.5.orig/usr/klibc/arch/x86_64/MCONFIG 2007-03-04 02:52:10.000000000 +0100 |
11 | +++ klibc-1.5/usr/klibc/arch/x86_64/MCONFIG 2008-01-27 16:05:43.000000000 +0100 |
12 | @@ -36,4 +36,4 @@ |
13 | KLIBCSHAREDFLAGS = -Ttext 0x00200200 -z max-page-size=0x100000 |
14 | |
15 | # Additional asm- directories needed during installation |
16 | -ASMARCH = asm-i386 |
17 | +KLIBCASMARCH = x86 |
18 | only in patch2: |
19 | unchanged: |
20 | --- a/scripts/Kbuild.install 2007-03-04 02:52:10.000000000 +0100 |
21 | +++ b/scripts/Kbuild.install 2007-11-04 15:43:28.000000000 +0100 |
22 | @@ -84,6 +84,13 @@ |
23 | # 1) Create directories, install headers and man pages |
24 | # 2) Tell that we now install binaries |
25 | # 3) Install binaries by descending |
26 | + |
27 | +# Arch specific definitions for klibc |
28 | +include $(KLIBCSRC)/arch/$(KLIBCARCHDIR)/MCONFIG |
29 | + |
30 | +# include/asm-* architecture |
31 | +KLIBCASMARCH ?= $(KLIBCARCH) |
32 | + |
33 | .PHONY: header footer descend |
34 | header: |
35 | $(Q)echo " INSTALL headers + man pages to $(INSTALLROOT)$(INSTALLDIR)" |
36 | @@ -95,7 +102,7 @@ |
37 | $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include |
38 | $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib |
39 | $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin |
40 | - $(Q)set -e ; for d in linux scsi asm-$(KLIBCARCH) asm-generic $(ASMKLIBCARCH); do \ |
41 | + $(Q)set -e ; for d in linux scsi asm-$(KLIBCASMARCH) asm-generic $(ASMKLIBCARCH); do \ |
42 | mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KLIBCCROSS)include/$$d ; \ |
43 | for r in $(KLIBCKERNELSRC)/include $(KLIBCKERNELOBJ)/include \ |
44 | $(KLIBCKERNELOBJ)/include2 ; do \ |