| 1 |
commit: b41c080c3595a1cd80bad72222887866b8372f0c |
| 2 |
Author: Christopher Byrne <salah.coronya <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Tue Dec 21 18:49:28 2021 +0000 |
| 4 |
Commit: John Helmert III <ajak <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Dec 22 19:55:43 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b41c080c |
| 7 |
|
| 8 |
sys-boot/tboot: Don't call ar directly |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/829745 |
| 11 |
Package-Manager: Portage-3.0.28, Repoman-3.0.3 |
| 12 |
Signed-off-by: Christopher Byrne <salah.coronya <AT> gmail.com> |
| 13 |
Closes: https://github.com/gentoo/gentoo/pull/23456 |
| 14 |
Signed-off-by: John Helmert III <ajak <AT> gentoo.org> |
| 15 |
|
| 16 |
.../tboot-1.10.3-dont-call-strip-directly.patch | 12 ----------- |
| 17 |
...tboot-1.10.3-dont-call-toolchain-directly.patch | 24 ++++++++++++++++++++++ |
| 18 |
sys-boot/tboot/tboot-1.10.3.ebuild | 2 +- |
| 19 |
3 files changed, 25 insertions(+), 13 deletions(-) |
| 20 |
|
| 21 |
diff --git a/sys-boot/tboot/files/tboot-1.10.3-dont-call-strip-directly.patch b/sys-boot/tboot/files/tboot-1.10.3-dont-call-strip-directly.patch |
| 22 |
deleted file mode 100644 |
| 23 |
index 83adeda6d5ac..000000000000 |
| 24 |
--- a/sys-boot/tboot/files/tboot-1.10.3-dont-call-strip-directly.patch |
| 25 |
+++ /dev/null |
| 26 |
@@ -1,12 +0,0 @@ |
| 27 |
-diff -r 5a30b6b09e77 tboot/Makefile |
| 28 |
---- a/tboot/Makefile Fri Dec 10 15:35:42 2021 +0100 |
| 29 |
-+++ b/tboot/Makefile Mon Dec 20 13:06:09 2021 -0600 |
| 30 |
-@@ -34,7 +34,7 @@ |
| 31 |
- TARGET_LDS := $(CURDIR)/common/tboot.lds |
| 32 |
- |
| 33 |
- $(TARGET).strip : $(TARGET) |
| 34 |
-- strip $< -o $@ |
| 35 |
-+ $(STRIP) $< -o $@ |
| 36 |
- |
| 37 |
- $(TARGET).gz : $(TARGET).strip |
| 38 |
- gzip -n -f -9 < $< > $@ |
| 39 |
|
| 40 |
diff --git a/sys-boot/tboot/files/tboot-1.10.3-dont-call-toolchain-directly.patch b/sys-boot/tboot/files/tboot-1.10.3-dont-call-toolchain-directly.patch |
| 41 |
new file mode 100644 |
| 42 |
index 000000000000..29840e9113e4 |
| 43 |
--- /dev/null |
| 44 |
+++ b/sys-boot/tboot/files/tboot-1.10.3-dont-call-toolchain-directly.patch |
| 45 |
@@ -0,0 +1,24 @@ |
| 46 |
+diff -r 5a30b6b09e77 safestringlib/makefile |
| 47 |
+--- a/safestringlib/makefile Fri Dec 10 15:35:42 2021 +0100 |
| 48 |
++++ b/safestringlib/makefile Tue Dec 21 12:40:01 2021 -0600 |
| 49 |
+@@ -29,7 +29,7 @@ |
| 50 |
+ $(CC) $(LDFLAGS) -c -o $@ $< $(CFLAGS) |
| 51 |
+ |
| 52 |
+ libsafestring.a: $(OBJ) |
| 53 |
+- ar rcs $@ $^ |
| 54 |
++ $(AR) rcs $@ $^ |
| 55 |
+ |
| 56 |
+ |
| 57 |
+ _TESTFUNCS = Safe_String_UnitTestMain.c test_strcmp_s.c test_strnlen_s.c test_memcmp16_s.c test_strcpyfldin_s.c test_strnterminate_s.c test_memcmp32_s.c test_strcpyfldout_s.c test_strpbrk_s.c test_memcmp_s.c test_strcpyfld_s.c test_strprefix_s.c test_memcpy16_s.c test_strcpy_s.c test_strremovews_s.c test_memcpy32_s.c test_strcspn_s.c test_strspn_s.c test_memcpy_s.c test_strfirstchar_s.c test_strstr_s.c test_memmove16_s.c test_strfirstdiff_s.c test_strtok_s.c test_memmove32_s.c test_strfirstsame_s.c test_strtolowercase_s.c test_memmove_s.c test_strisalphanumeric_s.c test_strtouppercase_s.c test_memset16_s.c test_strisascii_s.c test_strzero_s.c test_memset32_s.c test_strisdigit_s.c test_wcpcpy_s.c test_memset_s.c test_strishex_s.c test_wcscat_s.c test_memzero16_s.c test_strislowercase_s.c test_wcscpy_s.c test_memzero32_s.c test_strismixed_s.c test_wcsncat_s.c test_memzero_s.c test_strispassword_s.c test_wcsncpy_s.c test_strisuppercase_s.c test_wcsnlen_s.c test_stpcpy_s.c test_strl |
| 58 |
astchar_s.c test_wmemcmp_s.c test_stpncpy_s.c test_strlastdiff_s.c test_wmemcpy_s.c test_strcasecmp_s.c test_strlastsame_s.c test_wmemmove_s.c test_strcasestr_s.c test_strljustify_s.c test_wmemset_s.c test_strcat_s.c test_strncat_s.c test_strcmpfld_s.c test_strncpy_s.c |
| 59 |
+diff -r 5a30b6b09e77 tboot/Makefile |
| 60 |
+--- a/tboot/Makefile Fri Dec 10 15:35:42 2021 +0100 |
| 61 |
++++ b/tboot/Makefile Tue Dec 21 12:40:01 2021 -0600 |
| 62 |
+@@ -34,7 +34,7 @@ |
| 63 |
+ TARGET_LDS := $(CURDIR)/common/tboot.lds |
| 64 |
+ |
| 65 |
+ $(TARGET).strip : $(TARGET) |
| 66 |
+- strip $< -o $@ |
| 67 |
++ $(STRIP) $< -o $@ |
| 68 |
+ |
| 69 |
+ $(TARGET).gz : $(TARGET).strip |
| 70 |
+ gzip -n -f -9 < $< > $@ |
| 71 |
|
| 72 |
diff --git a/sys-boot/tboot/tboot-1.10.3.ebuild b/sys-boot/tboot/tboot-1.10.3.ebuild |
| 73 |
index 1c4693a6e37b..cdb682a949ff 100644 |
| 74 |
--- a/sys-boot/tboot/tboot-1.10.3.ebuild |
| 75 |
+++ b/sys-boot/tboot/tboot-1.10.3.ebuild |
| 76 |
@@ -26,7 +26,7 @@ RDEPEND="${DEPEND} |
| 77 |
DOCS=( README.md COPYING CHANGELOG ) |
| 78 |
PATCHES=( "${FILESDIR}/${PN}-1.10.3-disable-Werror.patch" |
| 79 |
"${FILESDIR}/${PN}-1.10.3-disable-strip.patch" |
| 80 |
- "${FILESDIR}/${PN}-1.10.3-dont-call-strip-directly.patch" ) |
| 81 |
+ "${FILESDIR}/${PN}-1.10.3-dont-call-toolchain-directly.patch" ) |
| 82 |
|
| 83 |
src_configure() { |
| 84 |
tc-export AS LD CC CPP AR RANLIB NM OBJCOPY OBJDUMP STRIP |
Archives