commit fa6abceaa5ea6ee58be9a76f69044fe5c233b0e3
Author: Jan Rękorajski <[email protected]>
Date: Fri Apr 9 09:42:53 2021 +0200
- rediff patches
- rel 34
uClibc-targetcpu.patch | 20 +--
uClibc-toolchain-wrapper.patch | 267 +++++++++++++++++++++--------------------
uClibc.spec | 2 +-
3 files changed, 146 insertions(+), 143 deletions(-)
---
diff --git a/uClibc.spec b/uClibc.spec
index 4a58371..e3d5655 100644
--- a/uClibc.spec
+++ b/uClibc.spec
@@ -12,7 +12,7 @@ Summary: C library optimized for size
Summary(pl.UTF-8): Biblioteka C zoptymalizowana na rozmiar
Name: uClibc
Version: 0.9.33.2
-Release: 33
+Release: 34
Epoch: 4
License: LGPL v2.1
Group: Libraries
diff --git a/uClibc-targetcpu.patch b/uClibc-targetcpu.patch
index abb3f09..d41540c 100644
--- a/uClibc-targetcpu.patch
+++ b/uClibc-targetcpu.patch
@@ -1,6 +1,7 @@
---- uClibc-0.9.26/extra/Configs/Config.in.orig 2004-01-03 00:34:12.000000000
+0100
-+++ uClibc-0.9.26/extra/Configs/Config.in 2004-01-31 17:48:09.355223576
+0100
-@@ -1018,7 +1018,7 @@
+diff -urNp -x '*.orig' uClibc-0.9.33.2.org/extra/Configs/Config.in
uClibc-0.9.33.2/extra/Configs/Config.in
+--- uClibc-0.9.33.2.org/extra/Configs/Config.in 2012-05-15
09:20:09.000000000 +0200
++++ uClibc-0.9.33.2/extra/Configs/Config.in 2021-04-09 09:42:09.833470098
+0200
+@@ -1994,7 +1994,7 @@ menu "Library Installation Options"
config RUNTIME_PREFIX
string "uClibc runtime library directory"
@@ -9,7 +10,7 @@
help
RUNTIME_PREFIX is the directory into which the uClibc runtime
libraries will be installed. The result will look something
-@@ -1036,7 +1036,7 @@
+@@ -2012,7 +2012,7 @@ config RUNTIME_PREFIX
config DEVEL_PREFIX
string "uClibc development environment directory"
@@ -18,9 +19,10 @@
help
DEVEL_PREFIX is the directory into which the uClibc development
environment will be installed. The result will look something
---- uClibc-0.9.26/extra/gcc-uClibc/Makefile.orig 2004-01-31
17:41:23.190969928 +0100
-+++ uClibc-0.9.26/extra/gcc-uClibc/Makefile 2004-01-31 17:51:11.132589216
+0100
-@@ -51,38 +51,38 @@
+diff -urNp -x '*.orig' uClibc-0.9.33.2.org/extra/gcc-uClibc/Makefile
uClibc-0.9.33.2/extra/gcc-uClibc/Makefile
+--- uClibc-0.9.33.2.org/extra/gcc-uClibc/Makefile 2021-04-09
09:42:09.643467299 +0200
++++ uClibc-0.9.33.2/extra/gcc-uClibc/Makefile 2021-04-09 09:42:09.833470098
+0200
+@@ -53,37 +53,37 @@ else
endif
gcc-uClibc: gcc-uClibc.h gcc-uClibc.c
@@ -31,11 +33,11 @@
ld-uClibc:
- @echo "#!/bin/sh" > $(TARGET_ARCH)-uclibc-ld
- @echo "# This file was autogenerated by make" >>
$(TARGET_ARCH)-uclibc-ld
+- @echo "exec $(LD_BIN) \$$@ -L$(DEVEL_PREFIX)/lib" >>
$(TARGET_ARCH)-uclibc-ld
+- chmod a+x $(TARGET_ARCH)-uclibc-ld
+ @echo "#!/bin/sh" > $(TARGET_CPU)-uclibc-ld
+ @echo "# This file was autogenerated by make" >> $(TARGET_CPU)-uclibc-ld
-- @echo "exec $(LD_BIN) \$$@ -L$(DEVEL_PREFIX)/lib" >>
$(TARGET_ARCH)-uclibc-ld
+ @echo "exec $(LD_BIN) \$$@ -L$(DEVEL_PREFIX)/lib" >>
$(TARGET_CPU)-uclibc-ld
-- chmod a+x $(TARGET_ARCH)-uclibc-ld
+ chmod a+x $(TARGET_CPU)-uclibc-ld
touch ld-uClibc
diff --git a/uClibc-toolchain-wrapper.patch b/uClibc-toolchain-wrapper.patch
index f7e40e2..1a4c153 100644
--- a/uClibc-toolchain-wrapper.patch
+++ b/uClibc-toolchain-wrapper.patch
@@ -1,6 +1,137 @@
-diff -urN uClibc-0.9.29.org/extra/gcc-uClibc/gcc-uClibc.c
uClibc-0.9.29/extra/gcc-uClibc/gcc-uClibc.c
---- uClibc-0.9.29.org/extra/gcc-uClibc/gcc-uClibc.c 1970-01-01
01:00:00.000000000 +0100
-+++ uClibc-0.9.29/extra/gcc-uClibc/gcc-uClibc.c 2007-06-03
22:10:49.372320596 +0200
+diff -urNp -x '*.orig' uClibc-0.9.33.2.org/Makefile.in
uClibc-0.9.33.2/Makefile.in
+--- uClibc-0.9.33.2.org/Makefile.in 2012-05-15 09:20:09.000000000 +0200
++++ uClibc-0.9.33.2/Makefile.in 2021-04-09 09:42:09.273461846 +0200
+@@ -23,7 +23,7 @@ export KCONFIG_CONFIG
+
+ ifeq ($(HAVE_DOT_CONFIG),y)
+
+-all: pregen libs
++all: pregen libs toolchain
+ libs: pregen
+
+ # In this section, we need .config
+@@ -195,7 +195,7 @@ $(LOCAL_INSTALL_PATH):
+ HOSTCC="$(HOSTCC)" \
+ install
+
+-install: install_runtime install_dev
++install: install_runtime install_dev install_toolchain
+
+
+ RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB=$(shell
$(top_srcdir)extra/scripts/relative_path.sh $(DEVEL_PREFIX)$(MULTILIB_DIR)
$(RUNTIME_PREFIX)$(MULTILIB_DIR))
+@@ -416,6 +416,12 @@ install_utils: utils
+
+ endif # ifeq ($(HAVE_DOT_CONFIG),y)
+
++toolchain:
++ $(MAKE) CROSS="$(CROSS)" CC="$(CC)" -C extra/gcc-uClibc
++
++install_toolchain: toolchain
++ $(MAKE) CROSS="$(CROSS)" CC="$(CC)" -C extra/gcc-uClibc install
++
+ hostutils: | pregen
+ $(Q)$(MAKE) CROSS_COMPILE="$(CROSS_COMPILE)" CC="$(CC)"
HOSTCC="$(HOSTCC)" DOTHOST=.host -C utils $@
+
+diff -urNp -x '*.orig' uClibc-0.9.33.2.org/extra/gcc-uClibc/Makefile
uClibc-0.9.33.2/extra/gcc-uClibc/Makefile
+--- uClibc-0.9.33.2.org/extra/gcc-uClibc/Makefile 1970-01-01
01:00:00.000000000 +0100
++++ uClibc-0.9.33.2/extra/gcc-uClibc/Makefile 2021-04-09 09:42:09.273461846
+0200
+@@ -0,0 +1,93 @@
++# Makefile for building a fake gcc/binutils toolchain
++# that simply spoofs the location of the C library
++#
++# Copyright (C) 2000-2002 Erik Andersen <[email protected]>
++#
++
++TOPDIR = ../../
++include $(TOPDIR)Rules.mak
++include $(TOPDIR)/.config
++
++UCLIBC_DIR = $(shell (cd ../.. ; /bin/pwd))
++GCC_BIN = $(shell which $(CC))
++LD_BIN = $(shell which $(LD))
++GCCINCDIR:= ${shell $(CC) -print-search-dirs | sed -ne "s/install:
\(.*\)/\1include/gp"}
++
++all: gcc-uClibc ld-uClibc
++
++gcc-uClibc.h: Makefile $(TOPDIR)/.config
++ @echo "/* this file was autogenerated by make */" > gcc-uClibc.h
++ @echo "#define UCLIBC_TARGET_PREFIX " \"$(TARGET_PREFIX)\" >>
gcc-uClibc.h
++ @echo "#define UCLIBC_DEVEL_PREFIX " \"$(DEVEL_PREFIX)\" >> gcc-uClibc.h
++ @echo "#define UCLIBC_RUNTIME_PREFIX " \"$(RUNTIME_PREFIX)\" >>
gcc-uClibc.h
++ @echo "#define UCLIBC_BUILD_DIR " \"$(UCLIBC_DIR)\" >> gcc-uClibc.h
++ @echo "#define GCC_BIN " \"$(GCC_BIN)\" >> gcc-uClibc.h
++ @echo "#define LIBGCC_DIR " \"$(LIBGCC_DIR)\" >> gcc-uClibc.h
++ @echo "#define TARGET_ARCH " \"$(TARGET_ARCH)\" >> gcc-uClibc.h
++ @echo "#define DYNAMIC_LINKER "
\"$(RUNTIME_PREFIX)/lib/$(UCLIBC_LDSO)\" >> gcc-uClibc.h
++ @echo "#define BUILD_DYNAMIC_LINKER "
\"$(UCLIBC_DIR)/lib/$(UCLIBC_LDSO)\" >> gcc-uClibc.h
++ifeq ($(strip $(HAVE_SHARED)),y)
++ @echo "#define __UCLIBC_HAS_SHARED__ 1" >> gcc-uClibc.h
++else
++ @echo "#undef __UCLIBC_HAS_SHARED__" >> gcc-uClibc.h
++endif
++ifeq ($(strip $(UCLIBC_HAS_MMU)),y)
++ @echo "#define __UCLIBC_HAS_MMU__ 1" >> gcc-uClibc.h
++else
++ @echo "#undef __UCLIBC_HAS_MMU__" >> gcc-uClibc.h
++endif
++ifeq ($(strip $(HAS_ELF)),y)
++ @echo "#define __HAS_ELF__ 1" >> gcc-uClibc.h
++else
++ @echo "#undef __HAS_ELF__" >> gcc-uClibc.h
++endif
++ifeq ($(strip $(UCLIBC_CTOR_DTOR)),y)
++ @echo "#define __UCLIBC_CTOR_DTOR__ 1" >> gcc-uClibc.h
++ifeq ($(strip $(UCLIBC_PROFILING)),y)
++ @echo "#define __UCLIBC_PROFILING__ 1" >> gcc-uClibc.h
++else
++ @echo "#undef __UCLIBC_PROFILING__" >> gcc-uClibc.h
++endif
++else
++ @echo "#undef __UCLIBC_CTOR_DTOR__" >> gcc-uClibc.h
++endif
++
++gcc-uClibc: gcc-uClibc.h gcc-uClibc.c
++ $(HOSTCC) $(HOSTCFLAGS) -s gcc-uClibc.c -o $(TARGET_ARCH)-uclibc-gcc
++ touch gcc-uClibc
++
++ld-uClibc:
++ @echo "#!/bin/sh" > $(TARGET_ARCH)-uclibc-ld
++ @echo "# This file was autogenerated by make" >>
$(TARGET_ARCH)-uclibc-ld
++ @echo "exec $(LD_BIN) \$$@ -L$(DEVEL_PREFIX)/lib" >>
$(TARGET_ARCH)-uclibc-ld
++ chmod a+x $(TARGET_ARCH)-uclibc-ld
++ touch ld-uClibc
++
++install: all
++ install -d $(PREFIX)$(DEVEL_PREFIX)/bin;
++ install -d $(PREFIX)$(RUNTIME_PREFIX)/bin;
++ install -m 755 $(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(RUNTIME_PREFIX)/bin/
++ install -m 755 $(TARGET_ARCH)-uclibc-ld $(PREFIX)$(RUNTIME_PREFIX)/bin/
++ ln -fs $(TARGET_ARCH)-uclibc-gcc
$(PREFIX)$(RUNTIME_PREFIX)/bin/$(TARGET_ARCH)-uclibc-cc
++ ln -fs $(RUNTIME_PREFIX)/bin/$(TARGET_ARCH)-uclibc-gcc
$(PREFIX)$(DEVEL_PREFIX)/bin/gcc
++ ln -fs $(RUNTIME_PREFIX)/bin/$(TARGET_ARCH)-uclibc-gcc
$(PREFIX)$(DEVEL_PREFIX)/bin/cc
++ ln -fs $(RUNTIME_PREFIX)/bin/$(TARGET_ARCH)-uclibc-ld
$(PREFIX)$(DEVEL_PREFIX)/bin/ld
++ifeq ($(strip $(UCLIBC_CTOR_DTOR)),y)
++ ln -fs $(TARGET_ARCH)-uclibc-gcc
$(PREFIX)$(RUNTIME_PREFIX)/bin/$(TARGET_ARCH)-uclibc-g++
++ ln -fs $(TARGET_ARCH)-uclibc-gcc
$(PREFIX)$(RUNTIME_PREFIX)/bin/$(TARGET_ARCH)-uclibc-c++
++ ln -fs $(RUNTIME_PREFIX)/bin/$(TARGET_ARCH)-uclibc-gcc
$(PREFIX)$(DEVEL_PREFIX)/bin/c++
++ ln -fs $(RUNTIME_PREFIX)/bin/$(TARGET_ARCH)-uclibc-gcc
$(PREFIX)$(DEVEL_PREFIX)/bin/g++
++endif
++ for app in addr2line ar as cpp nm objcopy \
++ objdump ranlib size strings strip; do \
++ APPNAME=`which $(CROSS)$${app}`; \
++ if [ -x "$$APPNAME" ] ; then \
++ ln -fs "$$APPNAME" $(PREFIX)$(DEVEL_PREFIX)/bin/$${app}; \
++ ln -fs "$$APPNAME"
$(PREFIX)$(RUNTIME_PREFIX)/bin/$(TARGET_ARCH)-uclibc-$${app}; \
++ fi; \
++ done
++
++clean:
++ rm -f gcc-uClibc.h *-uclibc-gcc *-uclibc-ld core
++
++
+diff -urNp -x '*.orig' uClibc-0.9.33.2.org/extra/gcc-uClibc/gcc-uClibc.c
uClibc-0.9.33.2/extra/gcc-uClibc/gcc-uClibc.c
+--- uClibc-0.9.33.2.org/extra/gcc-uClibc/gcc-uClibc.c 1970-01-01
01:00:00.000000000 +0100
++++ uClibc-0.9.33.2/extra/gcc-uClibc/gcc-uClibc.c 2021-04-09
09:42:09.273461846 +0200
@@ -0,0 +1,672 @@
+/* vi: set sw=4 ts=4: */
+/*
@@ -674,133 +805,3 @@ diff -urN uClibc-0.9.29.org/extra/gcc-uClibc/gcc-uClibc.c
uClibc-0.9.29/extra/gc
+ }
+ exit(EXIT_FAILURE);
+}
-diff -urN uClibc-0.9.29.org/extra/gcc-uClibc/Makefile
uClibc-0.9.29/extra/gcc-uClibc/Makefile
---- uClibc-0.9.29.org/extra/gcc-uClibc/Makefile 1970-01-01
01:00:00.000000000 +0100
-+++ uClibc-0.9.29/extra/gcc-uClibc/Makefile 2007-06-03 22:10:14.593807939
+0200
-@@ -0,0 +1,93 @@
-+# Makefile for building a fake gcc/binutils toolchain
-+# that simply spoofs the location of the C library
-+#
-+# Copyright (C) 2000-2002 Erik Andersen <[email protected]>
-+#
-+
-+TOPDIR = ../../
-+include $(TOPDIR)Rules.mak
-+include $(TOPDIR)/.config
-+
-+UCLIBC_DIR = $(shell (cd ../.. ; /bin/pwd))
-+GCC_BIN = $(shell which $(CC))
-+LD_BIN = $(shell which $(LD))
-+GCCINCDIR:= ${shell $(CC) -print-search-dirs | sed -ne "s/install:
\(.*\)/\1include/gp"}
-+
-+all: gcc-uClibc ld-uClibc
-+
-+gcc-uClibc.h: Makefile $(TOPDIR)/.config
-+ @echo "/* this file was autogenerated by make */" > gcc-uClibc.h
-+ @echo "#define UCLIBC_TARGET_PREFIX " \"$(TARGET_PREFIX)\" >>
gcc-uClibc.h
-+ @echo "#define UCLIBC_DEVEL_PREFIX " \"$(DEVEL_PREFIX)\" >> gcc-uClibc.h
-+ @echo "#define UCLIBC_RUNTIME_PREFIX " \"$(RUNTIME_PREFIX)\" >>
gcc-uClibc.h
-+ @echo "#define UCLIBC_BUILD_DIR " \"$(UCLIBC_DIR)\" >> gcc-uClibc.h
-+ @echo "#define GCC_BIN " \"$(GCC_BIN)\" >> gcc-uClibc.h
-+ @echo "#define LIBGCC_DIR " \"$(LIBGCC_DIR)\" >> gcc-uClibc.h
-+ @echo "#define TARGET_ARCH " \"$(TARGET_ARCH)\" >> gcc-uClibc.h
-+ @echo "#define DYNAMIC_LINKER "
\"$(RUNTIME_PREFIX)/lib/$(UCLIBC_LDSO)\" >> gcc-uClibc.h
-+ @echo "#define BUILD_DYNAMIC_LINKER "
\"$(UCLIBC_DIR)/lib/$(UCLIBC_LDSO)\" >> gcc-uClibc.h
-+ifeq ($(strip $(HAVE_SHARED)),y)
-+ @echo "#define __UCLIBC_HAS_SHARED__ 1" >> gcc-uClibc.h
-+else
-+ @echo "#undef __UCLIBC_HAS_SHARED__" >> gcc-uClibc.h
-+endif
-+ifeq ($(strip $(UCLIBC_HAS_MMU)),y)
-+ @echo "#define __UCLIBC_HAS_MMU__ 1" >> gcc-uClibc.h
-+else
-+ @echo "#undef __UCLIBC_HAS_MMU__" >> gcc-uClibc.h
-+endif
-+ifeq ($(strip $(HAS_ELF)),y)
-+ @echo "#define __HAS_ELF__ 1" >> gcc-uClibc.h
-+else
-+ @echo "#undef __HAS_ELF__" >> gcc-uClibc.h
-+endif
-+ifeq ($(strip $(UCLIBC_CTOR_DTOR)),y)
-+ @echo "#define __UCLIBC_CTOR_DTOR__ 1" >> gcc-uClibc.h
-+ifeq ($(strip $(UCLIBC_PROFILING)),y)
-+ @echo "#define __UCLIBC_PROFILING__ 1" >> gcc-uClibc.h
-+else
-+ @echo "#undef __UCLIBC_PROFILING__" >> gcc-uClibc.h
-+endif
-+else
-+ @echo "#undef __UCLIBC_CTOR_DTOR__" >> gcc-uClibc.h
-+endif
-+
-+gcc-uClibc: gcc-uClibc.h gcc-uClibc.c
-+ $(HOSTCC) $(HOSTCFLAGS) -s gcc-uClibc.c -o $(TARGET_ARCH)-uclibc-gcc
-+ touch gcc-uClibc
-+
-+ld-uClibc:
-+ @echo "#!/bin/sh" > $(TARGET_ARCH)-uclibc-ld
-+ @echo "# This file was autogenerated by make" >>
$(TARGET_ARCH)-uclibc-ld
-+ @echo "exec $(LD_BIN) \$$@ -L$(DEVEL_PREFIX)/lib" >>
$(TARGET_ARCH)-uclibc-ld
-+ chmod a+x $(TARGET_ARCH)-uclibc-ld
-+ touch ld-uClibc
-+
-+install: all
-+ install -d $(PREFIX)$(DEVEL_PREFIX)/bin;
-+ install -d $(PREFIX)$(RUNTIME_PREFIX)/bin;
-+ install -m 755 $(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(RUNTIME_PREFIX)/bin/
-+ install -m 755 $(TARGET_ARCH)-uclibc-ld $(PREFIX)$(RUNTIME_PREFIX)/bin/
-+ ln -fs $(TARGET_ARCH)-uclibc-gcc
$(PREFIX)$(RUNTIME_PREFIX)/bin/$(TARGET_ARCH)-uclibc-cc
-+ ln -fs $(RUNTIME_PREFIX)/bin/$(TARGET_ARCH)-uclibc-gcc
$(PREFIX)$(DEVEL_PREFIX)/bin/gcc
-+ ln -fs $(RUNTIME_PREFIX)/bin/$(TARGET_ARCH)-uclibc-gcc
$(PREFIX)$(DEVEL_PREFIX)/bin/cc
-+ ln -fs $(RUNTIME_PREFIX)/bin/$(TARGET_ARCH)-uclibc-ld
$(PREFIX)$(DEVEL_PREFIX)/bin/ld
-+ifeq ($(strip $(UCLIBC_CTOR_DTOR)),y)
-+ ln -fs $(TARGET_ARCH)-uclibc-gcc
$(PREFIX)$(RUNTIME_PREFIX)/bin/$(TARGET_ARCH)-uclibc-g++
-+ ln -fs $(TARGET_ARCH)-uclibc-gcc
$(PREFIX)$(RUNTIME_PREFIX)/bin/$(TARGET_ARCH)-uclibc-c++
-+ ln -fs $(RUNTIME_PREFIX)/bin/$(TARGET_ARCH)-uclibc-gcc
$(PREFIX)$(DEVEL_PREFIX)/bin/c++
-+ ln -fs $(RUNTIME_PREFIX)/bin/$(TARGET_ARCH)-uclibc-gcc
$(PREFIX)$(DEVEL_PREFIX)/bin/g++
-+endif
-+ for app in addr2line ar as cpp nm objcopy \
-+ objdump ranlib size strings strip; do \
-+ APPNAME=`which $(CROSS)$${app}`; \
-+ if [ -x "$$APPNAME" ] ; then \
-+ ln -fs "$$APPNAME" $(PREFIX)$(DEVEL_PREFIX)/bin/$${app}; \
-+ ln -fs "$$APPNAME"
$(PREFIX)$(RUNTIME_PREFIX)/bin/$(TARGET_ARCH)-uclibc-$${app}; \
-+ fi; \
-+ done
-+
-+clean:
-+ rm -f gcc-uClibc.h *-uclibc-gcc *-uclibc-ld core
-+
-+
---- uClibc-0.9.32/Makefile.in.orig 2011-06-08 21:35:20.000000000 +0200
-+++ uClibc-0.9.32/Makefile.in 2011-06-12 09:20:09.634046086 +0200
-@@ -23,7 +23,7 @@
-
- ifeq ($(HAVE_DOT_CONFIG),y)
-
--all: pregen libs
-+all: pregen libs toolchain
- libs: pregen
-
- # In this section, we need .config
-@@ -192,7 +192,7 @@
- HOSTCC="$(HOSTCC)" \
- install_dev
-
--install: install_runtime install_dev
-+install: install_runtime install_dev install_toolchain
-
-
- RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB=$(shell
$(top_srcdir)extra/scripts/relative_path.sh $(DEVEL_PREFIX)$(MULTILIB_DIR)
$(RUNTIME_PREFIX)$(MULTILIB_DIR))
-@@ -405,6 +405,12 @@
-
- endif # ifeq ($(HAVE_DOT_CONFIG),y)
-
-+toolchain:
-+ $(MAKE) CROSS="$(CROSS)" CC="$(CC)" -C extra/gcc-uClibc
-+
-+install_toolchain: toolchain
-+ $(MAKE) CROSS="$(CROSS)" CC="$(CC)" -C extra/gcc-uClibc install
-+
- hostutils: | pregen
- $(Q)$(MAKE) CROSS="$(CROSS)" CC="$(CC)" HOSTCC="$(HOSTCC)"
DOTHOST=.host -C utils $@
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/uClibc.git/commitdiff/fa6abceaa5ea6ee58be9a76f69044fe5c233b0e3
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
