]>
Commit | Line | Data |
---|---|---|
15afd9ab JB |
1 | --- uClibc-0.9.19/Makefile.orig Mon Mar 3 07:47:56 2003 |
2 | +++ uClibc-0.9.19/Makefile Wed Apr 2 23:44:51 2003 | |
3 | @@ -257,21 +257,21 @@ | |
4 | ifeq ($(strip $(HAVE_SHARED)),y) | |
5 | install -d $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin; | |
6 | install -m 755 ldso/util/ldd \ | |
7 | - $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-ldd | |
8 | - ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-ldd \ | |
9 | + $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_CPU)-uclibc-ldd | |
10 | + ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_CPU)-uclibc-ldd \ | |
11 | $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/ldd | |
1ecf6a0b JB |
12 | # For now, don't bother with readelf since surely the host |
13 | # system has binutils, or we couldn't have gotten this far... | |
15afd9ab JB |
14 | #install -m 755 ldso/util/readelf \ |
15 | - # $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-readelf | |
16 | - #ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-readelf \ | |
17 | + # $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_CPU)-uclibc-readelf | |
18 | + #ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_CPU)-uclibc-readelf \ | |
19 | # $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/readelf | |
1ecf6a0b JB |
20 | @if [ -x ldso/util/ldconfig ] ; then \ |
21 | set -x -e; \ | |
22 | install -d $(PREFIX)$(DEVEL_PREFIX)/etc; \ | |
15afd9ab JB |
23 | install -m 755 ldso/util/ldconfig \ |
24 | - $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-ldconfig; \ | |
25 | - ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-ldconfig \ | |
26 | + $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_CPU)-uclibc-ldconfig; \ | |
27 | + ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_CPU)-uclibc-ldconfig \ | |
28 | $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/ldconfig; \ | |
1ecf6a0b JB |
29 | fi; |
30 | endif | |
15afd9ab JB |
31 | --- uClibc-0.9.19/extra/Configs/Config.in.orig Wed Feb 5 08:45:34 2003 |
32 | +++ uClibc-0.9.19/extra/Configs/Config.in Wed Apr 2 23:46:51 2003 | |
33 | @@ -299,7 +299,7 @@ | |
1ecf6a0b | 34 | |
15afd9ab JB |
35 | config DEVEL_PREFIX |
36 | string "uClibc development environment directory" | |
37 | - default "/usr/$(TARGET_ARCH)-linux-uclibc" | |
38 | + default "/usr/$(TARGET_CPU)-linux-uclibc" | |
39 | help | |
40 | DEVEL_PREFIX is the directory into which the uClibc development | |
41 | environment will be installed. The result will look something | |
42 | --- uClibc-0.9.19/extra/Configs/Config.i386.default.orig Thu Jan 16 08:15:18 2003 | |
43 | +++ uClibc-0.9.19/extra/Configs/Config.i386.default Wed Apr 2 23:47:11 2003 | |
44 | @@ -60,7 +60,7 @@ | |
45 | # Library Installation Options | |
46 | # | |
47 | SHARED_LIB_LOADER_PATH="$(DEVEL_PREFIX)/lib" | |
48 | -DEVEL_PREFIX="/usr/$(TARGET_ARCH)-linux-uclibc" | |
49 | +DEVEL_PREFIX="/usr/$(TARGET_CPU)-linux-uclibc" | |
50 | SYSTEM_DEVEL_PREFIX="$(DEVEL_PREFIX)" | |
51 | DEVEL_TOOL_PREFIX="$(DEVEL_PREFIX)/usr" | |
1ecf6a0b | 52 | |
317db42e | 53 | --- uClibc-0.9.19/ldso/util/Makefile.orig Sat Mar 1 12:02:43 2003 |
54 | +++ uClibc-0.9.19/ldso/util/Makefile Wed Apr 2 23:42:31 2003 | |
55 | @@ -22,7 +22,7 @@ | |
56 | ||
57 | TOPDIR=../../ | |
58 | include $(TOPDIR)Rules.mak | |
59 | -TARGET_CC = $(TOPDIR)extra/gcc-uClibc/$(TARGET_ARCH)-uclibc-gcc | |
60 | +TARGET_CC = $(TOPDIR)extra/gcc-uClibc/$(TARGET_CPU)-uclibc-gcc | |
61 | ||
62 | TARGETS = elf_header ldd | |
63 | ifeq ($(OSTYPE),linux) | |
64 | --- uClibc-0.9.19/test/Rules.mak.orig Thu Feb 27 18:04:22 2003 | |
65 | +++ uClibc-0.9.19/test/Rules.mak Wed Apr 2 23:49:34 2003 | |
66 | @@ -41,7 +41,7 @@ | |
67 | # make CROSS=mipsel-linux- | |
68 | # will build uClibc for 'mipsel'. | |
69 | ||
70 | -CROSS=../$(TESTDIR)extra/gcc-uClibc/$(TARGET_ARCH)-uclibc- | |
71 | +CROSS=../$(TESTDIR)extra/gcc-uClibc/$(TARGET_CPU)-uclibc- | |
72 | CC= $(CROSS)gcc | |
73 | STRIPTOOL=strip | |
74 | LDD=../$(TESTDIR)ldso/util/ldd | |
75 | --- uClibc-0.9.21/extra/gcc-uClibc/Makefile.orig 2003-09-01 21:25:55.000000000 +0200 | |
76 | +++ uClibc-0.9.21/extra/gcc-uClibc/Makefile 2003-09-13 06:40:32.000000000 +0200 | |
77 | @@ -51,36 +51,36 @@ | |
1ecf6a0b JB |
78 | endif |
79 | ||
80 | gcc-uClibc: gcc-uClibc.h gcc-uClibc.c | |
317db42e | 81 | - $(HOSTCC) $(HOSTCFLAGS) -s gcc-uClibc.c -o $(TARGET_ARCH)-uclibc-gcc |
82 | + $(HOSTCC) $(HOSTCFLAGS) -s gcc-uClibc.c -o $(TARGET_CPU)-uclibc-gcc | |
1ecf6a0b JB |
83 | |
84 | ld-uClibc: | |
85 | - @echo "#!/bin/sh" > $(TARGET_ARCH)-uclibc-ld | |
86 | - @echo "# This file was autogenerated by make" >> $(TARGET_ARCH)-uclibc-ld | |
87 | + @echo "#!/bin/sh" > $(TARGET_CPU)-uclibc-ld | |
88 | + @echo "# This file was autogenerated by make" >> $(TARGET_CPU)-uclibc-ld | |
89 | @echo "$(LD_BIN) \$$@ -L$(DEVEL_PREFIX)/usr/lib -L$(DEVEL_PREFIX)/lib "\ | |
90 | - "-L$(UCLIBC_DIR)" >> $(TARGET_ARCH)-uclibc-ld | |
91 | - chmod a+x $(TARGET_ARCH)-uclibc-ld | |
92 | + "-L$(UCLIBC_DIR)" >> $(TARGET_CPU)-uclibc-ld | |
93 | + chmod a+x $(TARGET_CPU)-uclibc-ld | |
94 | ||
95 | install: all | |
15afd9ab | 96 | install -d $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin; |
1ecf6a0b JB |
97 | install -d $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin; |
98 | - install -m 755 $(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/ | |
99 | - install -m 755 $(TARGET_ARCH)-uclibc-ld $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/ | |
1ecf6a0b | 100 | - ln -fs $(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-cc |
15afd9ab JB |
101 | - ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/gcc |
102 | - ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/cc | |
103 | - ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-ld $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/ld | |
1ecf6a0b JB |
104 | + install -m 755 $(TARGET_CPU)-uclibc-gcc $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/ |
105 | + install -m 755 $(TARGET_CPU)-uclibc-ld $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/ | |
15afd9ab JB |
106 | + ln -fs $(TARGET_CPU)-uclibc-gcc $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_CPU)-uclibc-cc |
107 | + ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_CPU)-uclibc-gcc $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/gcc | |
108 | + ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_CPU)-uclibc-gcc $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/cc | |
109 | + ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_CPU)-uclibc-ld $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/ld | |
110 | ifeq ($(strip $(UCLIBC_CTOR_DTOR)),y) | |
111 | - ln -fs $(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-g++ | |
112 | - ln -fs $(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-c++ | |
113 | - ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/c++ | |
114 | - ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/g++ | |
1ecf6a0b JB |
115 | + ln -fs $(TARGET_CPU)-uclibc-gcc $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_CPU)-uclibc-g++ |
116 | + ln -fs $(TARGET_CPU)-uclibc-gcc $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_CPU)-uclibc-c++ | |
15afd9ab JB |
117 | + ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_CPU)-uclibc-gcc $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/c++ |
118 | + ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_CPU)-uclibc-gcc $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/g++ | |
119 | endif | |
1ecf6a0b JB |
120 | for app in addr2line ar as cpp gasp nm objcopy \ |
121 | objdump ranlib size strings strip; do \ | |
15afd9ab JB |
122 | APPNAME=`which $(CROSS)$${app}`; \ |
123 | if [ -x "$$APPNAME" ] ; then \ | |
124 | ln -fs "$$APPNAME" $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/$${app}; \ | |
125 | - ln -fs "$$APPNAME" $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-$${app}; \ | |
126 | + ln -fs "$$APPNAME" $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_CPU)-uclibc-$${app}; \ | |
127 | fi; \ | |
1ecf6a0b JB |
128 | done |
129 |