projects / packages / uClibc.git / blame
| Commit | Line | Data |
|---|---|---|
| fa6abcea JR |
1 | diff -urNp -x '*.orig' uClibc-0.9.33.2.org/extra/Configs/Config.in uClibc-0.9.33.2/extra/Configs/Config.in |
| 2 | --- uClibc-0.9.33.2.org/extra/Configs/Config.in 2012-05-15 09:20:09.000000000 +0200 | |
| 3 | +++ uClibc-0.9.33.2/extra/Configs/Config.in 2021-04-09 09:42:09.833470098 +0200 | |
| 4 | @@ -1994,7 +1994,7 @@ menu "Library Installation Options" | |
| 90de3b5b JB |
5 | |
| 6 | config RUNTIME_PREFIX | |
| 7 | string "uClibc runtime library directory" | |
| 8 | - default "/usr/$(TARGET_ARCH)-linux-uclibc/" | |
| 7823c0bd | 9 | + default "/usr/$(TARGET_CPU)-linux-uclibc" |
| 90de3b5b JB |
10 | help |
| 11 | RUNTIME_PREFIX is the directory into which the uClibc runtime | |
| 12 | libraries will be installed. The result will look something | |
| fa6abcea | 13 | @@ -2012,7 +2012,7 @@ config RUNTIME_PREFIX |
| 1ecf6a0b | 14 | |
| 15afd9ab JB |
15 | config DEVEL_PREFIX |
| 16 | string "uClibc development environment directory" | |
| 90de3b5b | 17 | - default "/usr/$(TARGET_ARCH)-linux-uclibc/usr/" |
| 7823c0bd | 18 | + default "/usr/$(TARGET_CPU)-linux-uclibc/usr" |
| 15afd9ab JB |
19 | help |
| 20 | DEVEL_PREFIX is the directory into which the uClibc development | |
| 21 | environment will be installed. The result will look something | |
| fa6abcea JR |
22 | diff -urNp -x '*.orig' uClibc-0.9.33.2.org/extra/gcc-uClibc/Makefile uClibc-0.9.33.2/extra/gcc-uClibc/Makefile |
| 23 | --- uClibc-0.9.33.2.org/extra/gcc-uClibc/Makefile 2021-04-09 09:42:09.643467299 +0200 | |
| 24 | +++ uClibc-0.9.33.2/extra/gcc-uClibc/Makefile 2021-04-09 09:42:09.833470098 +0200 | |
| 25 | @@ -53,37 +53,37 @@ else | |
| 1ecf6a0b JB |
26 | endif |
| 27 | ||
| 28 | gcc-uClibc: gcc-uClibc.h gcc-uClibc.c | |
| 317db42e | 29 | - $(HOSTCC) $(HOSTCFLAGS) -s gcc-uClibc.c -o $(TARGET_ARCH)-uclibc-gcc |
| 30 | + $(HOSTCC) $(HOSTCFLAGS) -s gcc-uClibc.c -o $(TARGET_CPU)-uclibc-gcc | |
| 90de3b5b | 31 | touch gcc-uClibc |
| 1ecf6a0b JB |
32 | |
| 33 | ld-uClibc: | |
| 34 | - @echo "#!/bin/sh" > $(TARGET_ARCH)-uclibc-ld | |
| 35 | - @echo "# This file was autogenerated by make" >> $(TARGET_ARCH)-uclibc-ld | |
| fa6abcea JR |
36 | - @echo "exec $(LD_BIN) \$$@ -L$(DEVEL_PREFIX)/lib" >> $(TARGET_ARCH)-uclibc-ld |
| 37 | - chmod a+x $(TARGET_ARCH)-uclibc-ld | |
| 1ecf6a0b JB |
38 | + @echo "#!/bin/sh" > $(TARGET_CPU)-uclibc-ld |
| 39 | + @echo "# This file was autogenerated by make" >> $(TARGET_CPU)-uclibc-ld | |
| a6527d51 | 40 | + @echo "exec $(LD_BIN) \$$@ -L$(DEVEL_PREFIX)/lib" >> $(TARGET_CPU)-uclibc-ld |
| 1ecf6a0b | 41 | + chmod a+x $(TARGET_CPU)-uclibc-ld |
| 90de3b5b | 42 | touch ld-uClibc |
| 1ecf6a0b JB |
43 | |
| 44 | install: all | |
| 90de3b5b JB |
45 | install -d $(PREFIX)$(DEVEL_PREFIX)/bin; |
| 46 | install -d $(PREFIX)$(RUNTIME_PREFIX)/bin; | |
| 47 | - install -m 755 $(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(RUNTIME_PREFIX)/bin/ | |
| 48 | - install -m 755 $(TARGET_ARCH)-uclibc-ld $(PREFIX)$(RUNTIME_PREFIX)/bin/ | |
| 49 | - ln -fs $(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(RUNTIME_PREFIX)/bin/$(TARGET_ARCH)-uclibc-cc | |
| 50 | - ln -fs $(RUNTIME_PREFIX)/bin/$(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(DEVEL_PREFIX)/bin/gcc | |
| 51 | - ln -fs $(RUNTIME_PREFIX)/bin/$(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(DEVEL_PREFIX)/bin/cc | |
| 52 | - ln -fs $(RUNTIME_PREFIX)/bin/$(TARGET_ARCH)-uclibc-ld $(PREFIX)$(DEVEL_PREFIX)/bin/ld | |
| 53 | + install -m 755 $(TARGET_CPU)-uclibc-gcc $(PREFIX)$(RUNTIME_PREFIX)/bin/ | |
| 54 | + install -m 755 $(TARGET_CPU)-uclibc-ld $(PREFIX)$(RUNTIME_PREFIX)/bin/ | |
| 55 | + ln -fs $(TARGET_CPU)-uclibc-gcc $(PREFIX)$(RUNTIME_PREFIX)/bin/$(TARGET_CPU)-uclibc-cc | |
| 56 | + ln -fs $(RUNTIME_PREFIX)/bin/$(TARGET_CPU)-uclibc-gcc $(PREFIX)$(DEVEL_PREFIX)/bin/gcc | |
| 57 | + ln -fs $(RUNTIME_PREFIX)/bin/$(TARGET_CPU)-uclibc-gcc $(PREFIX)$(DEVEL_PREFIX)/bin/cc | |
| 58 | + ln -fs $(RUNTIME_PREFIX)/bin/$(TARGET_CPU)-uclibc-ld $(PREFIX)$(DEVEL_PREFIX)/bin/ld | |
| 15afd9ab | 59 | ifeq ($(strip $(UCLIBC_CTOR_DTOR)),y) |
| 90de3b5b JB |
60 | - ln -fs $(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(RUNTIME_PREFIX)/bin/$(TARGET_ARCH)-uclibc-g++ |
| 61 | - ln -fs $(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(RUNTIME_PREFIX)/bin/$(TARGET_ARCH)-uclibc-c++ | |
| 62 | - ln -fs $(RUNTIME_PREFIX)/bin/$(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(DEVEL_PREFIX)/bin/c++ | |
| 63 | - ln -fs $(RUNTIME_PREFIX)/bin/$(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(DEVEL_PREFIX)/bin/g++ | |
| 64 | + ln -fs $(TARGET_CPU)-uclibc-gcc $(PREFIX)$(RUNTIME_PREFIX)/bin/$(TARGET_CPU)-uclibc-g++ | |
| 65 | + ln -fs $(TARGET_CPU)-uclibc-gcc $(PREFIX)$(RUNTIME_PREFIX)/bin/$(TARGET_CPU)-uclibc-c++ | |
| 66 | + ln -fs $(RUNTIME_PREFIX)/bin/$(TARGET_CPU)-uclibc-gcc $(PREFIX)$(DEVEL_PREFIX)/bin/c++ | |
| 67 | + ln -fs $(RUNTIME_PREFIX)/bin/$(TARGET_CPU)-uclibc-gcc $(PREFIX)$(DEVEL_PREFIX)/bin/g++ | |
| 15afd9ab | 68 | endif |
| 3e880be8 | 69 | for app in addr2line ar as cpp nm objcopy \ |
| 1ecf6a0b | 70 | objdump ranlib size strings strip; do \ |
| 15afd9ab JB |
71 | APPNAME=`which $(CROSS)$${app}`; \ |
| 72 | if [ -x "$$APPNAME" ] ; then \ | |
| 90de3b5b JB |
73 | ln -fs "$$APPNAME" $(PREFIX)$(DEVEL_PREFIX)/bin/$${app}; \ |
| 74 | - ln -fs "$$APPNAME" $(PREFIX)$(RUNTIME_PREFIX)/bin/$(TARGET_ARCH)-uclibc-$${app}; \ | |
| 75 | + ln -fs "$$APPNAME" $(PREFIX)$(RUNTIME_PREFIX)/bin/$(TARGET_CPU)-uclibc-$${app}; \ | |
| 15afd9ab | 76 | fi; \ |
| 1ecf6a0b JB |
77 | done |
| 78 |