From 5062d76783b8e4d90bc4986e6d7a11a92bd211c0 Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Wed, 5 Dec 2018 17:13:03 +0100 Subject: glibc: version bump 2.27 -> 2.28 Signed-off-by: Michael Olbrich --- .../0100-add-install-lib-all-target.patch | 34 --------------------- ...101-don-t-regen-docs-if-perl-is-not-found.patch | 35 ---------------------- .../0200-Hack-around-mips-args-to-host-gcc.patch | 28 ----------------- patches/glibc-2.27/series | 9 ------ .../0100-add-install-lib-all-target.patch | 34 +++++++++++++++++++++ ...101-don-t-regen-docs-if-perl-is-not-found.patch | 35 ++++++++++++++++++++++ .../0200-Hack-around-mips-args-to-host-gcc.patch | 28 +++++++++++++++++ patches/glibc-2.28/series | 9 ++++++ 8 files changed, 106 insertions(+), 106 deletions(-) delete mode 100644 patches/glibc-2.27/0100-add-install-lib-all-target.patch delete mode 100644 patches/glibc-2.27/0101-don-t-regen-docs-if-perl-is-not-found.patch delete mode 100644 patches/glibc-2.27/0200-Hack-around-mips-args-to-host-gcc.patch delete mode 100644 patches/glibc-2.27/series create mode 100644 patches/glibc-2.28/0100-add-install-lib-all-target.patch create mode 100644 patches/glibc-2.28/0101-don-t-regen-docs-if-perl-is-not-found.patch create mode 100644 patches/glibc-2.28/0200-Hack-around-mips-args-to-host-gcc.patch create mode 100644 patches/glibc-2.28/series (limited to 'patches') diff --git a/patches/glibc-2.27/0100-add-install-lib-all-target.patch b/patches/glibc-2.27/0100-add-install-lib-all-target.patch deleted file mode 100644 index ae18c72..0000000 --- a/patches/glibc-2.27/0100-add-install-lib-all-target.patch +++ /dev/null @@ -1,34 +0,0 @@ -From: Michael Olbrich -Date: Tue, 1 Nov 2011 19:22:27 +0100 -Subject: [PATCH] add install-lib-all target - -From http://svn.exactcode.de/t2/trunk/package/base/glibc32/make-install-lib-all.patch - -Rule to install all needed libraries, not just the ones installed by install-lib, -yet not install programs. -Needed because we can't use the main install target, as we can't build programs before -we have the final gcc installed; linking fails because libeh.a is not present, -and glibc insists on linking programs with that library. - -Signed-off-by: Michael Olbrich ---- - Makerules | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/Makerules b/Makerules -index ef6abeac6d9d..d64ac754b02f 100644 ---- a/Makerules -+++ b/Makerules -@@ -1010,6 +1010,12 @@ installed-libcs := $(foreach o,$(filter-out .os,$(object-suffixes-for-libc)),\ - $(inst_libdir)/$(patsubst %,$(libtype$o),\ - $(libprefix)$(libc-name))) - -+install-lib-all: $(inst_slibdir)/libc.so$(libc.so-version) \ -+ $(inst_slibdir)/libc-$(version).so \ -+ $(inst_libdir)/libc.so \ -+ $(inst_libdir)/libc.a \ -+ install-lib -+ - .PHONY: check-install-supported - check-install-supported: - diff --git a/patches/glibc-2.27/0101-don-t-regen-docs-if-perl-is-not-found.patch b/patches/glibc-2.27/0101-don-t-regen-docs-if-perl-is-not-found.patch deleted file mode 100644 index 346c8ff..0000000 --- a/patches/glibc-2.27/0101-don-t-regen-docs-if-perl-is-not-found.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: Michael Olbrich -Date: Wed, 2 Nov 2011 00:14:37 +0100 -Subject: [PATCH] don't regen docs if perl is not found - -If we're using a cvs snapshot which updates the source files, and -perl isn't installed yet, then we can't regen the docs. Not a big -deal, so just whine a little and continue on our merry way. - -This patch was taken from gentoo. -http://bugs.gentoo.org/60132 - -Signed-off-by: Michael Olbrich ---- - manual/Makefile | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/manual/Makefile b/manual/Makefile -index c2756640a785..8b0b178152a5 100644 ---- a/manual/Makefile -+++ b/manual/Makefile -@@ -101,9 +101,14 @@ $(objpfx)dir-add.texi: xtract-typefun.awk $(texis-path) - $(objpfx)libm-err.texi: $(objpfx)stamp-libm-err - $(objpfx)stamp-libm-err: libm-err-tab.pl $(wildcard $(foreach dir,$(sysdirs),\ - $(dir)/libm-test-ulps)) -+ifneq ($(PERL),no) - pwd=`pwd`; \ - $(PERL) $< $$pwd/.. > $(objpfx)libm-err-tmp - $(move-if-change) $(objpfx)libm-err-tmp $(objpfx)libm-err.texi -+else -+ echo "Unable to rebuild math docs, no perl installed" -+ touch libm-err.texi -+endif - touch $@ - - # Package version and bug reporting URL. diff --git a/patches/glibc-2.27/0200-Hack-around-mips-args-to-host-gcc.patch b/patches/glibc-2.27/0200-Hack-around-mips-args-to-host-gcc.patch deleted file mode 100644 index 5cc5c41..0000000 --- a/patches/glibc-2.27/0200-Hack-around-mips-args-to-host-gcc.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: Marc Kleine-Budde -Date: Wed, 3 Dec 2014 15:05:52 +0100 -Subject: [PATCH] Hack around mips args to host-gcc - -originally From: "Steven J dot Hill" -for Crosstool - -In OSELAS.Toolchain we pass -DBOOTSTRAP_GCC in CC. This patch fixes the -header extraction from the glibc, by not passing mips specific flags to -the HOST compiler. - -Signed-off-by: Marc Kleine-Budde ---- - sysdeps/mips/mips32/Makefile | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/sysdeps/mips/mips32/Makefile b/sysdeps/mips/mips32/Makefile -index dec0b024c3a8..dde2ca6bce1d 100644 ---- a/sysdeps/mips/mips32/Makefile -+++ b/sysdeps/mips/mips32/Makefile -@@ -1,3 +1,7 @@ -+ifeq ($(filter -DBOOTSTRAP_GCC,$(CC)),) - ifeq ($(filter -mabi=32,$(CC)),) - CC += -mabi=32 - endif -+else -+CC += -D_MIPS_SZPTR=32 -+endif diff --git a/patches/glibc-2.27/series b/patches/glibc-2.27/series deleted file mode 100644 index da5b65b..0000000 --- a/patches/glibc-2.27/series +++ /dev/null @@ -1,9 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -#tag:upstream --start-number 1 -#tag:build-system --start-number 100 -0100-add-install-lib-all-target.patch -0101-don-t-regen-docs-if-perl-is-not-found.patch -#tag:hacks --start-number 200 -0200-Hack-around-mips-args-to-host-gcc.patch -# 093247f87c0e3ded1431e29c27443f99 - git-ptx-patches magic diff --git a/patches/glibc-2.28/0100-add-install-lib-all-target.patch b/patches/glibc-2.28/0100-add-install-lib-all-target.patch new file mode 100644 index 0000000..4dccbf9 --- /dev/null +++ b/patches/glibc-2.28/0100-add-install-lib-all-target.patch @@ -0,0 +1,34 @@ +From: Michael Olbrich +Date: Tue, 1 Nov 2011 19:22:27 +0100 +Subject: [PATCH] add install-lib-all target + +From http://svn.exactcode.de/t2/trunk/package/base/glibc32/make-install-lib-all.patch + +Rule to install all needed libraries, not just the ones installed by install-lib, +yet not install programs. +Needed because we can't use the main install target, as we can't build programs before +we have the final gcc installed; linking fails because libeh.a is not present, +and glibc insists on linking programs with that library. + +Signed-off-by: Michael Olbrich +--- + Makerules | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/Makerules b/Makerules +index a10a0b4d7021..8eee60e24306 100644 +--- a/Makerules ++++ b/Makerules +@@ -1014,6 +1014,12 @@ installed-libcs := $(foreach o,$(filter-out .os,$(object-suffixes-for-libc)),\ + $(inst_libdir)/$(patsubst %,$(libtype$o),\ + $(libprefix)$(libc-name))) + ++install-lib-all: $(inst_slibdir)/libc.so$(libc.so-version) \ ++ $(inst_slibdir)/libc-$(version).so \ ++ $(inst_libdir)/libc.so \ ++ $(inst_libdir)/libc.a \ ++ install-lib ++ + .PHONY: check-install-supported + check-install-supported: + diff --git a/patches/glibc-2.28/0101-don-t-regen-docs-if-perl-is-not-found.patch b/patches/glibc-2.28/0101-don-t-regen-docs-if-perl-is-not-found.patch new file mode 100644 index 0000000..346c8ff --- /dev/null +++ b/patches/glibc-2.28/0101-don-t-regen-docs-if-perl-is-not-found.patch @@ -0,0 +1,35 @@ +From: Michael Olbrich +Date: Wed, 2 Nov 2011 00:14:37 +0100 +Subject: [PATCH] don't regen docs if perl is not found + +If we're using a cvs snapshot which updates the source files, and +perl isn't installed yet, then we can't regen the docs. Not a big +deal, so just whine a little and continue on our merry way. + +This patch was taken from gentoo. +http://bugs.gentoo.org/60132 + +Signed-off-by: Michael Olbrich +--- + manual/Makefile | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/manual/Makefile b/manual/Makefile +index c2756640a785..8b0b178152a5 100644 +--- a/manual/Makefile ++++ b/manual/Makefile +@@ -101,9 +101,14 @@ $(objpfx)dir-add.texi: xtract-typefun.awk $(texis-path) + $(objpfx)libm-err.texi: $(objpfx)stamp-libm-err + $(objpfx)stamp-libm-err: libm-err-tab.pl $(wildcard $(foreach dir,$(sysdirs),\ + $(dir)/libm-test-ulps)) ++ifneq ($(PERL),no) + pwd=`pwd`; \ + $(PERL) $< $$pwd/.. > $(objpfx)libm-err-tmp + $(move-if-change) $(objpfx)libm-err-tmp $(objpfx)libm-err.texi ++else ++ echo "Unable to rebuild math docs, no perl installed" ++ touch libm-err.texi ++endif + touch $@ + + # Package version and bug reporting URL. diff --git a/patches/glibc-2.28/0200-Hack-around-mips-args-to-host-gcc.patch b/patches/glibc-2.28/0200-Hack-around-mips-args-to-host-gcc.patch new file mode 100644 index 0000000..5cc5c41 --- /dev/null +++ b/patches/glibc-2.28/0200-Hack-around-mips-args-to-host-gcc.patch @@ -0,0 +1,28 @@ +From: Marc Kleine-Budde +Date: Wed, 3 Dec 2014 15:05:52 +0100 +Subject: [PATCH] Hack around mips args to host-gcc + +originally From: "Steven J dot Hill" +for Crosstool + +In OSELAS.Toolchain we pass -DBOOTSTRAP_GCC in CC. This patch fixes the +header extraction from the glibc, by not passing mips specific flags to +the HOST compiler. + +Signed-off-by: Marc Kleine-Budde +--- + sysdeps/mips/mips32/Makefile | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/sysdeps/mips/mips32/Makefile b/sysdeps/mips/mips32/Makefile +index dec0b024c3a8..dde2ca6bce1d 100644 +--- a/sysdeps/mips/mips32/Makefile ++++ b/sysdeps/mips/mips32/Makefile +@@ -1,3 +1,7 @@ ++ifeq ($(filter -DBOOTSTRAP_GCC,$(CC)),) + ifeq ($(filter -mabi=32,$(CC)),) + CC += -mabi=32 + endif ++else ++CC += -D_MIPS_SZPTR=32 ++endif diff --git a/patches/glibc-2.28/series b/patches/glibc-2.28/series new file mode 100644 index 0000000..da5b65b --- /dev/null +++ b/patches/glibc-2.28/series @@ -0,0 +1,9 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +#tag:upstream --start-number 1 +#tag:build-system --start-number 100 +0100-add-install-lib-all-target.patch +0101-don-t-regen-docs-if-perl-is-not-found.patch +#tag:hacks --start-number 200 +0200-Hack-around-mips-args-to-host-gcc.patch +# 093247f87c0e3ded1431e29c27443f99 - git-ptx-patches magic -- cgit v1.2.3