| 1 |
commit: 9c671ac48e02078dad50e8e97bc453bea777609e |
| 2 |
Author: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> |
| 3 |
AuthorDate: Mon May 30 22:49:12 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 30 23:05:33 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c671ac4 |
| 7 |
|
| 8 |
app-accessibility/edbrowse: respect flags and toolchain |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/843059 |
| 11 |
Signed-off-by: Anna Vyalkova <cyber+gentoo <AT> sysrq.in> |
| 12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 13 |
|
| 14 |
.../edbrowse/edbrowse-3.8.2.1-r2.ebuild | 14 +++++++- |
| 15 |
.../edbrowse-3.8.2.1-quickjs-respect-flags.patch | 41 ++++++++++++++++++++++ |
| 16 |
2 files changed, 54 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
diff --git a/app-accessibility/edbrowse/edbrowse-3.8.2.1-r2.ebuild b/app-accessibility/edbrowse/edbrowse-3.8.2.1-r2.ebuild |
| 19 |
index 6c2cb5e77961..e9d16a2ecad8 100644 |
| 20 |
--- a/app-accessibility/edbrowse/edbrowse-3.8.2.1-r2.ebuild |
| 21 |
+++ b/app-accessibility/edbrowse/edbrowse-3.8.2.1-r2.ebuild |
| 22 |
@@ -2,6 +2,9 @@ |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
|
| 25 |
EAPI=8 |
| 26 |
+ |
| 27 |
+inherit toolchain-funcs |
| 28 |
+ |
| 29 |
QUICKJS_HASH=2788d71e823b522b178db3b3660ce93689534e6d |
| 30 |
QUICKJS_SHORT=2788d71 |
| 31 |
QUICKJS_S="${WORKDIR}/quickjs-${QUICKJS_HASH}" |
| 32 |
@@ -34,11 +37,20 @@ PATCHES=( |
| 33 |
"${FILESDIR}/${P}"-respect-ldflags.patch |
| 34 |
) |
| 35 |
|
| 36 |
+src_prepare() { |
| 37 |
+ default |
| 38 |
+ |
| 39 |
+ cd "${QUICKJS_S}" || die |
| 40 |
+ eapply "${FILESDIR}/${P}"-quickjs-respect-flags.patch |
| 41 |
+} |
| 42 |
+ |
| 43 |
src_compile() { |
| 44 |
# First build quickjs so we can link to its static library. |
| 45 |
# Also, quickjs doesn't appear to tag releases. |
| 46 |
tools/quickjobfixup "${QUICKJS_S}" || die |
| 47 |
- emake -C "${QUICKJS_S}" libquickjs.a |
| 48 |
+ emake -C "${QUICKJS_S}" CC="$(tc-getCC)" AR="$(tc-getAR)" libquickjs.a |
| 49 |
+ |
| 50 |
+ tc-export CC |
| 51 |
emake -C src QUICKJS_DIR="${QUICKJS_S}" STRIP= |
| 52 |
} |
| 53 |
|
| 54 |
|
| 55 |
diff --git a/app-accessibility/edbrowse/files/edbrowse-3.8.2.1-quickjs-respect-flags.patch b/app-accessibility/edbrowse/files/edbrowse-3.8.2.1-quickjs-respect-flags.patch |
| 56 |
new file mode 100644 |
| 57 |
index 000000000000..f0af474427f0 |
| 58 |
--- /dev/null |
| 59 |
+++ b/app-accessibility/edbrowse/files/edbrowse-3.8.2.1-quickjs-respect-flags.patch |
| 60 |
@@ -0,0 +1,41 @@ |
| 61 |
+* Don't overwrite CFLAGS |
| 62 |
+* Respect CPPFLAGS |
| 63 |
+ |
| 64 |
+--- a/Makefile |
| 65 |
++++ b/Makefile |
| 66 |
+@@ -66,7 +66,7 @@ |
| 67 |
+ ifdef CONFIG_CLANG |
| 68 |
+ HOST_CC=clang |
| 69 |
+ CC=$(CROSS_PREFIX)clang |
| 70 |
+- CFLAGS=-g -Wall -MMD -MF $(OBJDIR)/$(@F).d |
| 71 |
++ CFLAGS += -Wall -MMD -MF $(OBJDIR)/$(@F).d |
| 72 |
+ CFLAGS += -Wextra |
| 73 |
+ CFLAGS += -Wno-sign-compare |
| 74 |
+ CFLAGS += -Wno-missing-field-initializers |
| 75 |
+@@ -87,7 +87,7 @@ |
| 76 |
+ else |
| 77 |
+ HOST_CC=gcc |
| 78 |
+ CC=$(CROSS_PREFIX)gcc |
| 79 |
+- CFLAGS=-g -Wall -MMD -MF $(OBJDIR)/$(@F).d |
| 80 |
++ CFLAGS += -Wall -MMD -MF $(OBJDIR)/$(@F).d |
| 81 |
+ CFLAGS += -Wno-array-bounds -Wno-format-truncation |
| 82 |
+ ifdef CONFIG_LTO |
| 83 |
+ AR=$(CROSS_PREFIX)gcc-ar |
| 84 |
+@@ -110,7 +110,7 @@ |
| 85 |
+ CFLAGS+=$(DEFINES) |
| 86 |
+ CFLAGS_DEBUG=$(CFLAGS) -O0 |
| 87 |
+ CFLAGS_SMALL=$(CFLAGS) -Os |
| 88 |
+-CFLAGS_OPT=$(CFLAGS) -O2 |
| 89 |
++CFLAGS_OPT=$(CFLAGS) |
| 90 |
+ CFLAGS_NOLTO:=$(CFLAGS_OPT) |
| 91 |
+ LDFLAGS=-g |
| 92 |
+ ifdef CONFIG_LTO |
| 93 |
+@@ -269,7 +269,7 @@ |
| 94 |
+ $(CC) $(CFLAGS_OPT) -fPIC -DJS_SHARED_LIBRARY -c -o $@ $< |
| 95 |
+ |
| 96 |
+ $(OBJDIR)/%.nolto.o: %.c | $(OBJDIR) |
| 97 |
+- $(CC) $(CFLAGS_NOLTO) -c -o $@ $< |
| 98 |
++ $(CC) $(CFLAGS_NOLTO) $(CPPFLAGS) -c -o $@ $< |
| 99 |
+ |
| 100 |
+ $(OBJDIR)/%.m32.o: %.c | $(OBJDIR) |
| 101 |
+ $(CC) -m32 $(CFLAGS_OPT) -c -o $@ $< |
Archives