From 4f9a8d39d2e92fe20d60d5481ca52bd3a0de24e1 Mon Sep 17 00:00:00 2001 From: Oliver Reiche Date: Mon, 23 Oct 2023 10:34:34 +0200 Subject: Fix typos --- README.md | 6 ++--- ...01-strip-build-directory-from-fixincludes.patch | 29 ++++++++++++++++++++++ ...001-strip-build-directory-from-fixinclues.patch | 29 ---------------------- etc/patches/gcc-4.7.4/reproducibility/series | 2 +- 4 files changed, 33 insertions(+), 33 deletions(-) create mode 100644 etc/patches/gcc-4.7.4/reproducibility/0001-strip-build-directory-from-fixincludes.patch delete mode 100644 etc/patches/gcc-4.7.4/reproducibility/0001-strip-build-directory-from-fixinclues.patch diff --git a/README.md b/README.md index 9af8dad..c773473 100644 --- a/README.md +++ b/README.md @@ -122,12 +122,12 @@ All compiler toolchains additionally provide: The `CC` toolchain definition for use with [rules-cc](https://github.com/just-buildsystem/rules-cc) -All tool toolchains (including `+tools`) provide: +All tool toolchains (including `+tools`) provide: - `["CC/foreign", "defaults"]`: The `CC/foreign` toolchain definition for use with [rules-cc](https://github.com/just-buildsystem/rules-cc) -The `busybox` toolchain (including `+tools`) additionally provides: +The `busybox` toolchains (including `+tools`) additionally provide: - `["patch", "defaults"]`: The `patch` toolchain definition for use with [rules-cc](https://github.com/just-buildsystem/rules-cc) @@ -182,5 +182,5 @@ Example configuration for bootstrapping on NixOS (hashes may vary): ## License All files are copyright Huawei Cloud Computing Technology Co., Ltd., license -Apache-2.0, expect for the patches in `etc/patches`, which are license GPL-2.0 +Apache-2.0, except for the patches in `etc/patches`, which are license GPL-2.0 (the same license as the respective upstream project). diff --git a/etc/patches/gcc-4.7.4/reproducibility/0001-strip-build-directory-from-fixincludes.patch b/etc/patches/gcc-4.7.4/reproducibility/0001-strip-build-directory-from-fixincludes.patch new file mode 100644 index 0000000..bb32f46 --- /dev/null +++ b/etc/patches/gcc-4.7.4/reproducibility/0001-strip-build-directory-from-fixincludes.patch @@ -0,0 +1,29 @@ +From 95563f6ef2366acb57557c11b8301d468a87e04f Mon Sep 17 00:00:00 2001 +From: Oliver Reiche +Date: Fri, 18 Aug 2023 14:36:57 +0200 +Subject: [PATCH 1/2] Strip build directory from fixincludes + +... to achieve a reproducible binary, which contains the +configure string. For this to work, the user needs to set +"BUILD_ROOT_DIR" before building. +--- + fixincludes/configure | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/fixincludes/configure b/fixincludes/configure +index 4a28cd1f3..45fdab2be 100755 +--- a/fixincludes/configure ++++ b/fixincludes/configure +@@ -6236,6 +6236,9 @@ cat >"$tmp/defines.awk" <<\_ACAWK || + BEGIN { + _ACEOF + ++# Remove host machine's build path from confdefs.h ++sed -i 's|'${BUILD_ROOT_DIR:-/nonexistent}'|/build|g' confdefs.h ++ + # Transform confdefs.h into an awk script `defines.awk', embedded as + # here-document in config.status, that substitutes the proper values into + # config.h.in to produce config.h. +-- +2.30.2 + diff --git a/etc/patches/gcc-4.7.4/reproducibility/0001-strip-build-directory-from-fixinclues.patch b/etc/patches/gcc-4.7.4/reproducibility/0001-strip-build-directory-from-fixinclues.patch deleted file mode 100644 index 885c7d0..0000000 --- a/etc/patches/gcc-4.7.4/reproducibility/0001-strip-build-directory-from-fixinclues.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 95563f6ef2366acb57557c11b8301d468a87e04f Mon Sep 17 00:00:00 2001 -From: Oliver Reiche -Date: Fri, 18 Aug 2023 14:36:57 +0200 -Subject: [PATCH 1/2] Strip build directory from fixinclues - -... to achieve a reproducible binary, which contains the -configure string. For this to work, the user needs to set -"BUILD_ROOT_DIR" before building. ---- - fixincludes/configure | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/fixincludes/configure b/fixincludes/configure -index 4a28cd1f3..45fdab2be 100755 ---- a/fixincludes/configure -+++ b/fixincludes/configure -@@ -6236,6 +6236,9 @@ cat >"$tmp/defines.awk" <<\_ACAWK || - BEGIN { - _ACEOF - -+# Remove host machine's build path from confdefs.h -+sed -i 's|'${BUILD_ROOT_DIR:-/nonexistent}'|/build|g' confdefs.h -+ - # Transform confdefs.h into an awk script `defines.awk', embedded as - # here-document in config.status, that substitutes the proper values into - # config.h.in to produce config.h. --- -2.30.2 - diff --git a/etc/patches/gcc-4.7.4/reproducibility/series b/etc/patches/gcc-4.7.4/reproducibility/series index 1ec9fe3..23d38d7 100644 --- a/etc/patches/gcc-4.7.4/reproducibility/series +++ b/etc/patches/gcc-4.7.4/reproducibility/series @@ -1,2 +1,2 @@ -0001-strip-build-directory-from-fixinclues.patch +0001-strip-build-directory-from-fixincludes.patch 0002-compute-reproducible-checksums.patch -- cgit v1.2.3