HAOUAS Elyes has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/38483 )
Change subject: crossgcc: Upgrade make to version 4.3 ......................................................................
crossgcc: Upgrade make to version 4.3
_0068-configure.ac-Support-GLIBC-glob-interface-version-2.patch and _0053-glob-Do-not-assume-glibc-glob-internals.patch are integrated in upstream, so we don't need it anymore
Change-Id: I08f592731c3da2ac19e1f93682256f559a067fc4 Signed-off-by: Elyes HAOUAS ehaouas@noos.fr --- M util/crossgcc/buildgcc D util/crossgcc/patches/make-4.2.1_0053-glob-Do-not-assume-glibc-glob-internals.patch D util/crossgcc/patches/make-4.2.1_0068-configure.ac-Support-GLIBC-glob-interface-version-2.patch R util/crossgcc/patches/make-4.3_alloca.patch D util/crossgcc/sum/make-4.2.1.tar.bz2.cksum A util/crossgcc/sum/make-4.3.tar.gz.cksum 6 files changed, 5 insertions(+), 100 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/83/38483/1
diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index ab2ea89..863afa5 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -63,7 +63,7 @@ EXPAT_VERSION=2.2.9 # CLANG version number CLANG_VERSION=9.0.0 -MAKE_VERSION=4.2.1 +MAKE_VERSION=4.3 CMAKE_VERSION=3.16.2 NASM_VERSION=2.14.02
@@ -85,7 +85,7 @@ CFE_ARCHIVE="https://releases.llvm.org/$%7BCLANG_VERSION%7D/cfe-$%7BCLANG_VERSION%7D.src...." CRT_ARCHIVE="https://releases.llvm.org/$%7BCLANG_VERSION%7D/compiler-rt-$%7BCLANG_VERSION..." CTE_ARCHIVE="https://releases.llvm.org/$%7BCLANG_VERSION%7D/clang-tools-extra-$%7BCLANG_V..." -MAKE_ARCHIVE="https://ftpmirror.gnu.org/make/make-$%7BMAKE_VERSION%7D.tar.bz2" +MAKE_ARCHIVE="https://ftpmirror.gnu.org/make/make-$%7BMAKE_VERSION%7D.tar.gz" CMAKE_ARCHIVE="https://cmake.org/files/v3.16/cmake-$%7BCMAKE_VERSION%7D.tar.gz" NASM_ARCHIVE="https://www.nasm.us/pub/nasm/releasebuilds/$%7BNASM_VERSION%7D/nasm-$%7BNASM..."
diff --git a/util/crossgcc/patches/make-4.2.1_0053-glob-Do-not-assume-glibc-glob-internals.patch b/util/crossgcc/patches/make-4.2.1_0053-glob-Do-not-assume-glibc-glob-internals.patch deleted file mode 100644 index 3d45025..0000000 --- a/util/crossgcc/patches/make-4.2.1_0053-glob-Do-not-assume-glibc-glob-internals.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 193f1e81edd6b1b56b0eb0ff8aa4b41c7b4257b4 Mon Sep 17 00:00:00 2001 -From: Paul Eggert eggert@cs.ucla.edu -Date: Sun, 24 Sep 2017 09:12:58 -0400 -Subject: [PATCH 53/78] glob: Do not assume glibc glob internals. - -It has been proposed that glibc glob start using gl_lstat, -which the API allows it to do. GNU 'make' should not get in -the way of this. See: -https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html - -* dir.c (local_lstat): New function, like local_stat. -(dir_setup_glob): Use it to initialize gl_lstat too, as the API -requires. ---- - dir.c | 29 +++++++++++++++++++++++++++-- - 1 file changed, 27 insertions(+), 2 deletions(-) - -diff --git a/dir.c b/dir.c -index adbb8a9..c343e4c 100644 ---- a/dir.c -+++ b/dir.c -@@ -1299,15 +1299,40 @@ local_stat (const char *path, struct stat *buf) - } - #endif - -+/* Similarly for lstat. */ -+#if !defined(lstat) && !defined(WINDOWS32) || defined(VMS) -+# ifndef VMS -+# ifndef HAVE_SYS_STAT_H -+int lstat (const char *path, struct stat *sbuf); -+# endif -+# else -+ /* We are done with the fake lstat. Go back to the real lstat */ -+# ifdef lstat -+# undef lstat -+# endif -+# endif -+# define local_lstat lstat -+#elif defined(WINDOWS32) -+/* Windows doesn't support lstat(). */ -+# define local_lstat local_stat -+#else -+static int -+local_lstat (const char *path, struct stat *buf) -+{ -+ int e; -+ EINTRLOOP (e, lstat (path, buf)); -+ return e; -+} -+#endif -+ - void - dir_setup_glob (glob_t *gl) - { - gl->gl_opendir = open_dirstream; - gl->gl_readdir = read_dirstream; - gl->gl_closedir = free; -+ gl->gl_lstat = local_lstat; - gl->gl_stat = local_stat; -- /* We don't bother setting gl_lstat, since glob never calls it. -- The slot is only there for compatibility with 4.4 BSD. */ - } - - void --- -2.18.0 - diff --git a/util/crossgcc/patches/make-4.2.1_0068-configure.ac-Support-GLIBC-glob-interface-version-2.patch b/util/crossgcc/patches/make-4.2.1_0068-configure.ac-Support-GLIBC-glob-interface-version-2.patch deleted file mode 100644 index 53e61b8..0000000 --- a/util/crossgcc/patches/make-4.2.1_0068-configure.ac-Support-GLIBC-glob-interface-version-2.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 48c8a116a914a325a0497721f5d8b58d5bba34d4 Mon Sep 17 00:00:00 2001 -From: Paul Smith psmith@gnu.org -Date: Sun, 19 Nov 2017 15:09:16 -0500 -Subject: [PATCH 68/78] * configure.ac: Support GLIBC glob interface version 2 - ---- - configure.ac | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 8c72568..4710832 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -404,10 +404,9 @@ AC_CACHE_CHECK([if system libc has GNU glob], [make_cv_sys_gnu_glob], - #include <glob.h> - #include <fnmatch.h> - --#define GLOB_INTERFACE_VERSION 1 - #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1 - # include <gnu-versions.h> --# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION -+# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2 - gnu glob - # endif - #endif], --- -2.18.0 - diff --git a/util/crossgcc/patches/make-4.2.1_alloca.patch b/util/crossgcc/patches/make-4.3_alloca.patch similarity index 61% rename from util/crossgcc/patches/make-4.2.1_alloca.patch rename to util/crossgcc/patches/make-4.3_alloca.patch index 61a3581..6dd1fd1 100644 --- a/util/crossgcc/patches/make-4.2.1_alloca.patch +++ b/util/crossgcc/patches/make-4.3_alloca.patch @@ -1,5 +1,5 @@ ---- clean/make-4.2/glob/glob.c 2013-10-20 17:14:38.000000000 +0000 -+++ make-4.2/glob/glob.c 2018-09-18 10:16:03.860886356 +0000 +--- clean/make-4.3/lib/glob.c ++++ make-4.3/lib/glob.c @@ -208,7 +208,7 @@ #endif /* __GNU_LIBRARY__ || __DJGPP__ */
diff --git a/util/crossgcc/sum/make-4.2.1.tar.bz2.cksum b/util/crossgcc/sum/make-4.2.1.tar.bz2.cksum deleted file mode 100644 index 34af72c..0000000 --- a/util/crossgcc/sum/make-4.2.1.tar.bz2.cksum +++ /dev/null @@ -1 +0,0 @@ -7d9d11eb36cfb752da1fb11bb3e521d2a3cc8830 tarballs/make-4.2.1.tar.bz2 diff --git a/util/crossgcc/sum/make-4.3.tar.gz.cksum b/util/crossgcc/sum/make-4.3.tar.gz.cksum new file mode 100644 index 0000000..c68844a --- /dev/null +++ b/util/crossgcc/sum/make-4.3.tar.gz.cksum @@ -0,0 +1 @@ +3c40e5b49b893dbb14f1e2e1f8fe89b7298cc51d tarballs/make-4.3.tar.gz
HAOUAS Elyes has uploaded a new patch set (#2). ( https://review.coreboot.org/c/coreboot/+/38483 )
Change subject: crossgcc: Upgrade make to version 4.3 ......................................................................
crossgcc: Upgrade make to version 4.3
_0068-configure.ac-Support-GLIBC-glob-interface-version-2.patch and _0053-glob-Do-not-assume-glibc-glob-internals.patch are integrated in upstream, so we don't need them anymore.
Change-Id: I08f592731c3da2ac19e1f93682256f559a067fc4 Signed-off-by: Elyes HAOUAS ehaouas@noos.fr --- M util/crossgcc/buildgcc D util/crossgcc/patches/make-4.2.1_0053-glob-Do-not-assume-glibc-glob-internals.patch D util/crossgcc/patches/make-4.2.1_0068-configure.ac-Support-GLIBC-glob-interface-version-2.patch R util/crossgcc/patches/make-4.3_alloca.patch D util/crossgcc/sum/make-4.2.1.tar.bz2.cksum A util/crossgcc/sum/make-4.3.tar.gz.cksum 6 files changed, 5 insertions(+), 100 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/83/38483/2
Patrick Georgi has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38483 )
Change subject: crossgcc: Upgrade make to version 4.3 ......................................................................
Patch Set 2: Code-Review+2
HAOUAS Elyes has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38483 )
Change subject: crossgcc: Upgrade make to version 4.3 ......................................................................
Patch Set 2:
Patch Set 2: Code-Review+2
it didn't build on my PC :'(
Idwer Vollering has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38483 )
Change subject: crossgcc: Upgrade make to version 4.3 ......................................................................
Patch Set 2:
May I ask why the version bump of this specific package is desired? Because GNU make has not (yet) landed in debian unstable.
Also, if you change lines around make, you'll need to add a line to buildgcc that mentions being able to build 'make' as well.
Idwer Vollering has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38483 )
Change subject: crossgcc: Upgrade make to version 4.3 ......................................................................
Patch Set 2:
Patch Set 2:
May I ask why the version bump of this specific package is desired? Because GNU make has not (yet) landed in debian unstable.
Also, if you change lines around make, you'll need to add a line to buildgcc that mentions being able to build 'make' as well.
That ^ should have read GNU make version 4.3
Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38483 )
Change subject: crossgcc: Upgrade make to version 4.3 ......................................................................
Patch Set 2:
Patch Set 2:
Patch Set 2: Code-Review+2
it didn't build on my PC :'(
What error did you get?
HAOUAS Elyes has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38483 )
Change subject: crossgcc: Upgrade make to version 4.3 ......................................................................
Patch Set 2:
Patch Set 2:
Patch Set 2:
Patch Set 2: Code-Review+2
it didn't build on my PC :'(
What error did you get?
make-4.3/configure: line 5863: syntax error near unexpected token `0.19.4'
Hello Jacob Garber, build bot (Jenkins), Patrick Georgi,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/38483
to look at the new patch set (#3).
Change subject: crossgcc: Upgrade Make to version 4.3 ......................................................................
crossgcc: Upgrade Make to version 4.3
_0068-configure.ac-Support-GLIBC-glob-interface-version-2.patch and _0053-glob-Do-not-assume-glibc-glob-internals.patch are integrated in upstream, so we don't need them anymore.
Change-Id: I08f592731c3da2ac19e1f93682256f559a067fc4 Signed-off-by: Elyes HAOUAS ehaouas@noos.fr --- M util/crossgcc/buildgcc D util/crossgcc/patches/make-4.2.1_0053-glob-Do-not-assume-glibc-glob-internals.patch D util/crossgcc/patches/make-4.2.1_0068-configure.ac-Support-GLIBC-glob-interface-version-2.patch R util/crossgcc/patches/make-4.3_alloca.patch D util/crossgcc/sum/make-4.2.1.tar.bz2.cksum A util/crossgcc/sum/make-4.3.tar.gz.cksum 6 files changed, 5 insertions(+), 100 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/83/38483/3
HAOUAS Elyes has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38483 )
Change subject: crossgcc: Upgrade Make to version 4.3 ......................................................................
Patch Set 8:
This change is ready for review.
Hello Jacob Garber, build bot (Jenkins), Martin Roth, Patrick Georgi,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/38483
to look at the new patch set (#9).
Change subject: [WIP]crossgcc: Upgrade Make to version 4.3 ......................................................................
[WIP]crossgcc: Upgrade Make to version 4.3
_0068-configure.ac-Support-GLIBC-glob-interface-version-2.patch and _0053-glob-Do-not-assume-glibc-glob-internals.patch are integrated in upstream, so we don't need them anymore.
Change-Id: I08f592731c3da2ac19e1f93682256f559a067fc4 Signed-off-by: Elyes HAOUAS ehaouas@noos.fr --- M util/crossgcc/buildgcc D util/crossgcc/patches/make-4.2.1_0053-glob-Do-not-assume-glibc-glob-internals.patch D util/crossgcc/patches/make-4.2.1_0068-configure.ac-Support-GLIBC-glob-interface-version-2.patch R util/crossgcc/patches/make-4.3_alloca.patch D util/crossgcc/sum/make-4.2.1.tar.bz2.cksum A util/crossgcc/sum/make-4.3.tar.gz.cksum 6 files changed, 5 insertions(+), 101 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/83/38483/9
Hello build bot (Jenkins), Martin Roth, Patrick Georgi, Jacob Garber,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/38483
to look at the new patch set (#10).
Change subject: crossgcc: Upgrade Make to version 4.3 ......................................................................
crossgcc: Upgrade Make to version 4.3
_0068-configure.ac-Support-GLIBC-glob-interface-version-2.patch and _0053-glob-Do-not-assume-glibc-glob-internals.patch are integrated in upstream, so we don't need them anymore.
Change-Id: I08f592731c3da2ac19e1f93682256f559a067fc4 Signed-off-by: Elyes HAOUAS ehaouas@noos.fr --- M util/crossgcc/buildgcc D util/crossgcc/patches/make-4.2.1_0053-glob-Do-not-assume-glibc-glob-internals.patch D util/crossgcc/patches/make-4.2.1_0068-configure.ac-Support-GLIBC-glob-interface-version-2.patch R util/crossgcc/patches/make-4.3_alloca.patch D util/crossgcc/sum/make-4.2.1.tar.bz2.cksum A util/crossgcc/sum/make-4.3.tar.gz.cksum 6 files changed, 5 insertions(+), 101 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/83/38483/10
Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38483 )
Change subject: crossgcc: Upgrade Make to version 4.3 ......................................................................
Patch Set 12: Code-Review+1
Which builder verifies the toolchain?
HAOUAS Elyes has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/38483 )
Change subject: crossgcc: Upgrade Make to version 4.3 ......................................................................
Abandoned
"Make" is not needed anymore
HAOUAS Elyes has restored this change. ( https://review.coreboot.org/c/coreboot/+/38483 )
Change subject: crossgcc: Upgrade Make to version 4.3 ......................................................................
Restored
HAOUAS Elyes has removed a vote from this change. ( https://review.coreboot.org/c/coreboot/+/38483 )
Change subject: crossgcc: Upgrade Make to version 4.3 ......................................................................
Removed Code-Review+1 by Paul Menzel paulepanter@users.sourceforge.net
Hello build bot (Jenkins), Martin Roth, Patrick Georgi, Paul Menzel, Jacob Garber,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/38483
to look at the new patch set (#15).
Change subject: crossgcc: Upgrade Make to version 4.3 ......................................................................
crossgcc: Upgrade Make to version 4.3
_0068-configure.ac-Support-GLIBC-glob-interface-version-2.patch and _0053-glob-Do-not-assume-glibc-glob-internals.patch are integrated in upstream, so we don't need them anymore.
Change-Id: I08f592731c3da2ac19e1f93682256f559a067fc4 Signed-off-by: Elyes HAOUAS ehaouas@noos.fr --- M util/crossgcc/buildgcc D util/crossgcc/patches/make-4.2.1_0053-glob-Do-not-assume-glibc-glob-internals.patch D util/crossgcc/patches/make-4.2.1_0068-configure.ac-Support-GLIBC-glob-interface-version-2.patch D util/crossgcc/patches/make-4.2.1_alloca.patch D util/crossgcc/sum/make-4.2.1.tar.bz2.cksum 5 files changed, 2 insertions(+), 131 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/83/38483/15
Hello build bot (Jenkins), Martin Roth, Patrick Georgi, Paul Menzel, Jacob Garber,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/38483
to look at the new patch set (#16).
Change subject: crossgcc: Remove "Make" ......................................................................
crossgcc: Remove "Make"
"Make" is not needed anymore.
Change-Id: I08f592731c3da2ac19e1f93682256f559a067fc4 Signed-off-by: Elyes HAOUAS ehaouas@noos.fr --- M util/crossgcc/buildgcc D util/crossgcc/patches/make-4.2.1_0053-glob-Do-not-assume-glibc-glob-internals.patch D util/crossgcc/patches/make-4.2.1_0068-configure.ac-Support-GLIBC-glob-interface-version-2.patch D util/crossgcc/patches/make-4.2.1_alloca.patch D util/crossgcc/sum/make-4.2.1.tar.bz2.cksum 5 files changed, 2 insertions(+), 131 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/83/38483/16
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38483 )
Change subject: crossgcc: Remove "Make" ......................................................................
Patch Set 16:
(1 comment)
https://review.coreboot.org/c/coreboot/+/38483/16//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/38483/16//COMMIT_MSG@9 PS16, Line 9: "Make" is not needed anymore. What did we use it for?
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38483 )
Change subject: crossgcc: Remove "Make" ......................................................................
Patch Set 16:
(1 comment)
https://review.coreboot.org/c/coreboot/+/38483/16//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/38483/16//COMMIT_MSG@9 PS16, Line 9: "Make" is not needed anymore.
What did we use it for?
See original commit, to have a compatible version available on OSs that don't ship one. However, its patching (I don't remember what for) led to even harder dependencies to build it and lots of wasted resources to maintain compatibility (e.g. to build test buildgcc changes, we now have hacks to provide the expected autotools).
Also, there is no clue if anybody ever used the built make. Its path is not automatically picked up, obviously.
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38483 )
Change subject: crossgcc: Remove "Make" ......................................................................
Patch Set 16: Code-Review+2
Maybe rephrase the commit message:
In its current state, it draws more dependencies in than it solves which makes it useless.
Hello build bot (Jenkins), Nico Huber, Martin Roth, Patrick Georgi, Paul Menzel, Jacob Garber,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/38483
to look at the new patch set (#17).
Change subject: crossgcc: Remove "Make" ......................................................................
crossgcc: Remove "Make"
In its current state, it draws more dependencies in than it solves which makes it useless.
Change-Id: I08f592731c3da2ac19e1f93682256f559a067fc4 Signed-off-by: Elyes HAOUAS ehaouas@noos.fr --- M util/crossgcc/buildgcc D util/crossgcc/patches/make-4.2.1_0053-glob-Do-not-assume-glibc-glob-internals.patch D util/crossgcc/patches/make-4.2.1_0068-configure.ac-Support-GLIBC-glob-interface-version-2.patch D util/crossgcc/patches/make-4.2.1_alloca.patch D util/crossgcc/sum/make-4.2.1.tar.bz2.cksum 5 files changed, 2 insertions(+), 131 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/83/38483/17
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38483 )
Change subject: crossgcc: Remove "Make" ......................................................................
Patch Set 17: Code-Review+1
(1 comment)
https://review.coreboot.org/c/coreboot/+/38483/16//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/38483/16//COMMIT_MSG@9 PS16, Line 9: "Make" is not needed anymore.
See original commit, to have a compatible version available on OSs […]
Right. It would be nice to mention so in the commit message (a single sentence is enough).
Hello build bot (Jenkins), Nico Huber, Martin Roth, Patrick Georgi, Paul Menzel, Angel Pons, Jacob Garber,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/38483
to look at the new patch set (#18).
Change subject: crossgcc: Remove "Make" ......................................................................
crossgcc: Remove "Make"
"Make" was added for old Os's in order to use Make-v4.1 (see CB:13519). Now all "modern" OS's have at least "Make-v4.2". In its current state, "Make" draws more dependencies in than it solves which makes it useless.
Change-Id: I08f592731c3da2ac19e1f93682256f559a067fc4 Signed-off-by: Elyes HAOUAS ehaouas@noos.fr --- M util/crossgcc/buildgcc D util/crossgcc/patches/make-4.2.1_0053-glob-Do-not-assume-glibc-glob-internals.patch D util/crossgcc/patches/make-4.2.1_0068-configure.ac-Support-GLIBC-glob-interface-version-2.patch D util/crossgcc/patches/make-4.2.1_alloca.patch D util/crossgcc/sum/make-4.2.1.tar.bz2.cksum 5 files changed, 2 insertions(+), 131 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/83/38483/18
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38483 )
Change subject: crossgcc: Remove "Make" ......................................................................
Patch Set 18:
(1 comment)
https://review.coreboot.org/c/coreboot/+/38483/18//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/38483/18//COMMIT_MSG@9 PS18, Line 9: "Make" was added for old Os's in order to use Make-v4.1 (see CB:13519). I prefer patchset 17's commit message.
Hello build bot (Jenkins), Nico Huber, Martin Roth, Patrick Georgi, Paul Menzel, Angel Pons, Jacob Garber,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/38483
to look at the new patch set (#19).
Change subject: crossgcc: Remove "Make" ......................................................................
crossgcc: Remove "Make"
In its current state, it draws more dependencies in than it solves which makes it useless.
Change-Id: I08f592731c3da2ac19e1f93682256f559a067fc4 Signed-off-by: Elyes HAOUAS ehaouas@noos.fr --- M util/crossgcc/buildgcc D util/crossgcc/patches/make-4.2.1_0053-glob-Do-not-assume-glibc-glob-internals.patch D util/crossgcc/patches/make-4.2.1_0068-configure.ac-Support-GLIBC-glob-interface-version-2.patch D util/crossgcc/patches/make-4.2.1_alloca.patch D util/crossgcc/sum/make-4.2.1.tar.bz2.cksum 5 files changed, 2 insertions(+), 131 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/83/38483/19
Hello build bot (Jenkins), Nico Huber, Martin Roth, Patrick Georgi, Paul Menzel, Angel Pons, Jacob Garber,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/38483
to look at the new patch set (#20).
Change subject: crossgcc: Remove "Make" ......................................................................
crossgcc: Remove "Make"
In its current state, it draws more dependencies in than it solves which makes it useless.
Change-Id: I08f592731c3da2ac19e1f93682256f559a067fc4 Signed-off-by: Elyes HAOUAS ehaouas@noos.fr --- M util/crossgcc/Makefile.inc M util/crossgcc/buildgcc D util/crossgcc/patches/make-4.2.1_0053-glob-Do-not-assume-glibc-glob-internals.patch D util/crossgcc/patches/make-4.2.1_0068-configure.ac-Support-GLIBC-glob-interface-version-2.patch D util/crossgcc/patches/make-4.2.1_alloca.patch D util/crossgcc/sum/make-4.2.1.tar.bz2.cksum 6 files changed, 3 insertions(+), 136 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/83/38483/20
Hello build bot (Jenkins), Nico Huber, Martin Roth, Patrick Georgi, Paul Menzel, Angel Pons, Jacob Garber,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/38483
to look at the new patch set (#21).
Change subject: crossgcc: Remove "Make" ......................................................................
crossgcc: Remove "Make"
In its current state, it draws more dependencies in than it solves which makes it useless.
Change-Id: I08f592731c3da2ac19e1f93682256f559a067fc4 Signed-off-by: Elyes HAOUAS ehaouas@noos.fr --- M Makefile M util/crossgcc/Makefile M util/crossgcc/Makefile.inc M util/crossgcc/buildgcc D util/crossgcc/patches/make-4.2.1_0053-glob-Do-not-assume-glibc-glob-internals.patch D util/crossgcc/patches/make-4.2.1_0068-configure.ac-Support-GLIBC-glob-interface-version-2.patch D util/crossgcc/patches/make-4.2.1_alloca.patch D util/crossgcc/sum/make-4.2.1.tar.bz2.cksum 8 files changed, 6 insertions(+), 139 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/83/38483/21
HAOUAS Elyes has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38483 )
Change subject: crossgcc: Remove "Make" ......................................................................
Patch Set 21:
(2 comments)
https://review.coreboot.org/c/coreboot/+/38483/16//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/38483/16//COMMIT_MSG@9 PS16, Line 9: "Make" is not needed anymore.
Right. It would be nice to mention so in the commit message (a single sentence is enough).
Done
https://review.coreboot.org/c/coreboot/+/38483/18//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/38483/18//COMMIT_MSG@9 PS18, Line 9: "Make" was added for old Os's in order to use Make-v4.1 (see CB:13519).
I prefer patchset 17's commit message.
Done
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38483 )
Change subject: crossgcc: Remove "Make" ......................................................................
Patch Set 21: Code-Review+2
Nico Huber has submitted this change. ( https://review.coreboot.org/c/coreboot/+/38483 )
Change subject: crossgcc: Remove "Make" ......................................................................
crossgcc: Remove "Make"
In its current state, it draws more dependencies in than it solves which makes it useless.
Change-Id: I08f592731c3da2ac19e1f93682256f559a067fc4 Signed-off-by: Elyes HAOUAS ehaouas@noos.fr Reviewed-on: https://review.coreboot.org/c/coreboot/+/38483 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Nico Huber nico.h@gmx.de --- M Makefile M util/crossgcc/Makefile M util/crossgcc/Makefile.inc M util/crossgcc/buildgcc D util/crossgcc/patches/make-4.2.1_0053-glob-Do-not-assume-glibc-glob-internals.patch D util/crossgcc/patches/make-4.2.1_0068-configure.ac-Support-GLIBC-glob-interface-version-2.patch D util/crossgcc/patches/make-4.2.1_alloca.patch D util/crossgcc/sum/make-4.2.1.tar.bz2.cksum 8 files changed, 6 insertions(+), 139 deletions(-)
Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved
diff --git a/Makefile b/Makefile index 2bc2a6f..d60f585 100644 --- a/Makefile +++ b/Makefile @@ -103,7 +103,7 @@ NOCOMPILE:=1 endif ifneq ($(MAKECMDGOALS),) -ifneq ($(filter %config %clean cross% clang iasl gnumake lint% help% what-jenkins-does,$(MAKECMDGOALS)),) +ifneq ($(filter %config %clean cross% clang iasl lint% help% what-jenkins-does,$(MAKECMDGOALS)),) NOCOMPILE:=1 endif ifneq ($(filter %clean lint% help% what-jenkins-does,$(MAKECMDGOALS)),) diff --git a/util/crossgcc/Makefile b/util/crossgcc/Makefile index db8b769..bb30fa4 100644 --- a/util/crossgcc/Makefile +++ b/util/crossgcc/Makefile @@ -10,12 +10,12 @@ all all_with_gdb: $(MAKE) build-i386 build-x64 build-arm \ build-riscv build-aarch64 build-ppc64 build-nds32le \ - build_clang build_iasl build_make build_nasm + build_clang build_iasl build_nasm
all_without_gdb: $(MAKE) SKIP_GDB=1 build-i386 build-x64 build-arm \ build-riscv build-aarch64 build-ppc64 build-nds32le \ - build_clang build_iasl build_make build_nasm + build_clang build_iasl build_nasm
build_tools: build_gcc build_gdb
diff --git a/util/crossgcc/Makefile.inc b/util/crossgcc/Makefile.inc index 0735b7d..582e600 100644 --- a/util/crossgcc/Makefile.inc +++ b/util/crossgcc/Makefile.inc @@ -9,7 +9,6 @@ @echo ' crossgcc-clean - Remove all built coreboot cross-compilers' @echo ' iasl - Build coreboot IASL compiler (built by all cross targets)' @echo ' clang - Build coreboot clang compiler' - @echo ' gnumake - Build coreboot make' @echo ' nasm - Build coreboot nasm' @echo ' test-toolchain - Reports if toolchain components are out of date' @echo ' crossgcc-ARCH - Build cross-compiler for specific architecture' @@ -29,7 +28,7 @@ crossgcc-riscv crossgcc-power8 crossgcc-clean iasl \ clang crosstools-i386 crosstools-x64 crosstools-arm \ crosstools-aarch64 crosstools-riscv crosstools-power8 \ - jenkins-build-toolchain gnumake nasm + jenkins-build-toolchain nasm
$(foreach arch,$(TOOLCHAIN_ARCHES),crossgcc-$(arch)): clean-for-update $(MAKE) -C util/crossgcc $(patsubst crossgcc-%,build-%,$@) build_iasl SKIP_GDB=1 @@ -43,9 +42,6 @@ clang: clean-for-update $(MAKE) -C util/crossgcc build_clang
-gnumake: clean-for-update - $(MAKE) -C util/crossgcc build_make - nasm: clean-for-update $(MAKE) -C util/crossgcc build_nasm
diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index 8770e02..180ac1a 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -45,7 +45,6 @@ EXPAT_VERSION=2.2.9 # CLANG version number CLANG_VERSION=9.0.0 -MAKE_VERSION=4.2.1 CMAKE_VERSION=3.16.2 NASM_VERSION=2.14.02
@@ -67,15 +66,13 @@ CFE_ARCHIVE="https://releases.llvm.org/$%7BCLANG_VERSION%7D/cfe-$%7BCLANG_VERSION%7D.src...." CRT_ARCHIVE="https://releases.llvm.org/$%7BCLANG_VERSION%7D/compiler-rt-$%7BCLANG_VERSION..." CTE_ARCHIVE="https://releases.llvm.org/$%7BCLANG_VERSION%7D/clang-tools-extra-$%7BCLANG_V..." -MAKE_ARCHIVE="https://ftpmirror.gnu.org/make/make-$%7BMAKE_VERSION%7D.tar.bz2" CMAKE_ARCHIVE="https://cmake.org/files/v3.16/cmake-$%7BCMAKE_VERSION%7D.tar.gz" NASM_ARCHIVE="https://www.nasm.us/pub/nasm/releasebuilds/$%7BNASM_VERSION%7D/nasm-$%7BNASM..."
ALL_ARCHIVES="$GMP_ARCHIVE $MPFR_ARCHIVE $MPC_ARCHIVE \ $GCC_ARCHIVE $BINUTILS_ARCHIVE $GDB_ARCHIVE $IASL_ARCHIVE \ $PYTHON_ARCHIVE $EXPAT_ARCHIVE $LLVM_ARCHIVE $CFE_ARCHIVE \ - $CRT_ARCHIVE $CTE_ARCHIVE $MAKE_ARCHIVE $CMAKE_ARCHIVE \ - $NASM_ARCHIVE" + $CRT_ARCHIVE $CTE_ARCHIVE $CMAKE_ARCHIVE $NASM_ARCHIVE"
# GCC toolchain directories GMP_DIR="gmp-${GMP_VERSION}" @@ -94,7 +91,6 @@ CFE_DIR="cfe-${CLANG_VERSION}.src" CRT_DIR="compiler-rt-${CLANG_VERSION}.src" CTE_DIR="clang-tools-extra-${CLANG_VERSION}.src" -MAKE_DIR="make-${MAKE_VERSION}" CMAKE_DIR="cmake-${CMAKE_VERSION}" NASM_DIR="nasm-${NASM_VERSION}"
@@ -878,19 +874,6 @@ done }
-build_MAKE() { - ( cd ../${MAKE_DIR}/ && aclocal && autoconf ) - CC="$(hostcc host)" CXX="$(hostcxx host)" CFLAGS="$HOSTCFLAGS" \ - ../${MAKE_DIR}/configure --prefix="$TARGETDIR" --disable-nls \ - || touch .failed - $MAKE -k clean - # shellcheck disable=SC2086 - $MAKE $JOBS || touch .failed - $MAKE install DESTDIR=$DESTDIR || touch .failed - - normalize_dirs -} - build_CMAKE() { CC="$(hostcc host)" CXX="$(hostcxx host)" CFLAGS="$HOSTCFLAGS" \ ../${CMAKE_DIR}/configure --prefix="$TARGETDIR" \ @@ -926,7 +909,6 @@ MPC|mpc) printf "%s\n" "$MPC_VERSION";; MPFR|mpfr) printf "%s\n" "$MPFR_VERSION";; PYTHON|python) printf "%s\n" "$PYTHON_VERSION";; - MAKE|make) printf "%s\n" "$MAKE_VERSION";; NASM|nasm) printf "%s\n" "${NASM_VERSION}";; *) printf "Unknown tool %s\n" "$PRINTSUPPORTED";; esac @@ -1039,10 +1021,6 @@ NAME="IASL ACPI compiler" PACKAGES=IASL ;; - MAKE|make) - NAME="GNU Make" - PACKAGES=MAKE - ;; CMAKE|cmake) NAME="CMake" PACKAGES=CMAKE @@ -1052,7 +1030,7 @@ PACKAGES=NASM ;; *) - printf "${red}ERROR: Unsupported package $PACKAGE. (Supported packages are GCC, GDB, CLANG, IASL, MAKE, and NASM)${NC}\n\n"; + printf "${red}ERROR: Unsupported package $PACKAGE. (Supported packages are GCC, GDB, CLANG, IASL, and NASM)${NC}\n\n"; exit 1 ;; esac diff --git a/util/crossgcc/patches/make-4.2.1_0053-glob-Do-not-assume-glibc-glob-internals.patch b/util/crossgcc/patches/make-4.2.1_0053-glob-Do-not-assume-glibc-glob-internals.patch deleted file mode 100644 index 3d45025..0000000 --- a/util/crossgcc/patches/make-4.2.1_0053-glob-Do-not-assume-glibc-glob-internals.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 193f1e81edd6b1b56b0eb0ff8aa4b41c7b4257b4 Mon Sep 17 00:00:00 2001 -From: Paul Eggert eggert@cs.ucla.edu -Date: Sun, 24 Sep 2017 09:12:58 -0400 -Subject: [PATCH 53/78] glob: Do not assume glibc glob internals. - -It has been proposed that glibc glob start using gl_lstat, -which the API allows it to do. GNU 'make' should not get in -the way of this. See: -https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html - -* dir.c (local_lstat): New function, like local_stat. -(dir_setup_glob): Use it to initialize gl_lstat too, as the API -requires. ---- - dir.c | 29 +++++++++++++++++++++++++++-- - 1 file changed, 27 insertions(+), 2 deletions(-) - -diff --git a/dir.c b/dir.c -index adbb8a9..c343e4c 100644 ---- a/dir.c -+++ b/dir.c -@@ -1299,15 +1299,40 @@ local_stat (const char *path, struct stat *buf) - } - #endif - -+/* Similarly for lstat. */ -+#if !defined(lstat) && !defined(WINDOWS32) || defined(VMS) -+# ifndef VMS -+# ifndef HAVE_SYS_STAT_H -+int lstat (const char *path, struct stat *sbuf); -+# endif -+# else -+ /* We are done with the fake lstat. Go back to the real lstat */ -+# ifdef lstat -+# undef lstat -+# endif -+# endif -+# define local_lstat lstat -+#elif defined(WINDOWS32) -+/* Windows doesn't support lstat(). */ -+# define local_lstat local_stat -+#else -+static int -+local_lstat (const char *path, struct stat *buf) -+{ -+ int e; -+ EINTRLOOP (e, lstat (path, buf)); -+ return e; -+} -+#endif -+ - void - dir_setup_glob (glob_t *gl) - { - gl->gl_opendir = open_dirstream; - gl->gl_readdir = read_dirstream; - gl->gl_closedir = free; -+ gl->gl_lstat = local_lstat; - gl->gl_stat = local_stat; -- /* We don't bother setting gl_lstat, since glob never calls it. -- The slot is only there for compatibility with 4.4 BSD. */ - } - - void --- -2.18.0 - diff --git a/util/crossgcc/patches/make-4.2.1_0068-configure.ac-Support-GLIBC-glob-interface-version-2.patch b/util/crossgcc/patches/make-4.2.1_0068-configure.ac-Support-GLIBC-glob-interface-version-2.patch deleted file mode 100644 index 53e61b8..0000000 --- a/util/crossgcc/patches/make-4.2.1_0068-configure.ac-Support-GLIBC-glob-interface-version-2.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 48c8a116a914a325a0497721f5d8b58d5bba34d4 Mon Sep 17 00:00:00 2001 -From: Paul Smith psmith@gnu.org -Date: Sun, 19 Nov 2017 15:09:16 -0500 -Subject: [PATCH 68/78] * configure.ac: Support GLIBC glob interface version 2 - ---- - configure.ac | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 8c72568..4710832 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -404,10 +404,9 @@ AC_CACHE_CHECK([if system libc has GNU glob], [make_cv_sys_gnu_glob], - #include <glob.h> - #include <fnmatch.h> - --#define GLOB_INTERFACE_VERSION 1 - #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1 - # include <gnu-versions.h> --# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION -+# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2 - gnu glob - # endif - #endif], --- -2.18.0 - diff --git a/util/crossgcc/patches/make-4.2.1_alloca.patch b/util/crossgcc/patches/make-4.2.1_alloca.patch deleted file mode 100644 index 61a3581..0000000 --- a/util/crossgcc/patches/make-4.2.1_alloca.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- clean/make-4.2/glob/glob.c 2013-10-20 17:14:38.000000000 +0000 -+++ make-4.2/glob/glob.c 2018-09-18 10:16:03.860886356 +0000 -@@ -208,7 +208,7 @@ - #endif /* __GNU_LIBRARY__ || __DJGPP__ */ - - --#if !defined __alloca && !defined __GNU_LIBRARY__ -+#if !defined __alloca && defined __GNU_LIBRARY__ - - # ifdef __GNUC__ - # undef alloca diff --git a/util/crossgcc/sum/make-4.2.1.tar.bz2.cksum b/util/crossgcc/sum/make-4.2.1.tar.bz2.cksum deleted file mode 100644 index 34af72c..0000000 --- a/util/crossgcc/sum/make-4.2.1.tar.bz2.cksum +++ /dev/null @@ -1 +0,0 @@ -7d9d11eb36cfb752da1fb11bb3e521d2a3cc8830 tarballs/make-4.2.1.tar.bz2