commit: 9c671ac48e02078dad50e8e97bc453bea777609e Author: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> AuthorDate: Mon May 30 22:49:12 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon May 30 23:05:33 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c671ac4
app-accessibility/edbrowse: respect flags and toolchain Closes: https://bugs.gentoo.org/843059 Signed-off-by: Anna Vyalkova <cyber+gentoo <AT> sysrq.in> Signed-off-by: Sam James <sam <AT> gentoo.org> .../edbrowse/edbrowse-3.8.2.1-r2.ebuild | 14 +++++++- .../edbrowse-3.8.2.1-quickjs-respect-flags.patch | 41 ++++++++++++++++++++++ 2 files changed, 54 insertions(+), 1 deletion(-) diff --git a/app-accessibility/edbrowse/edbrowse-3.8.2.1-r2.ebuild b/app-accessibility/edbrowse/edbrowse-3.8.2.1-r2.ebuild index 6c2cb5e77961..e9d16a2ecad8 100644 --- a/app-accessibility/edbrowse/edbrowse-3.8.2.1-r2.ebuild +++ b/app-accessibility/edbrowse/edbrowse-3.8.2.1-r2.ebuild @@ -2,6 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=8 + +inherit toolchain-funcs + QUICKJS_HASH=2788d71e823b522b178db3b3660ce93689534e6d QUICKJS_SHORT=2788d71 QUICKJS_S="${WORKDIR}/quickjs-${QUICKJS_HASH}" @@ -34,11 +37,20 @@ PATCHES=( "${FILESDIR}/${P}"-respect-ldflags.patch ) +src_prepare() { + default + + cd "${QUICKJS_S}" || die + eapply "${FILESDIR}/${P}"-quickjs-respect-flags.patch +} + src_compile() { # First build quickjs so we can link to its static library. # Also, quickjs doesn't appear to tag releases. tools/quickjobfixup "${QUICKJS_S}" || die - emake -C "${QUICKJS_S}" libquickjs.a + emake -C "${QUICKJS_S}" CC="$(tc-getCC)" AR="$(tc-getAR)" libquickjs.a + + tc-export CC emake -C src QUICKJS_DIR="${QUICKJS_S}" STRIP= } 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 new file mode 100644 index 000000000000..f0af474427f0 --- /dev/null +++ b/app-accessibility/edbrowse/files/edbrowse-3.8.2.1-quickjs-respect-flags.patch @@ -0,0 +1,41 @@ +* Don't overwrite CFLAGS +* Respect CPPFLAGS + +--- a/Makefile ++++ b/Makefile +@@ -66,7 +66,7 @@ + ifdef CONFIG_CLANG + HOST_CC=clang + CC=$(CROSS_PREFIX)clang +- CFLAGS=-g -Wall -MMD -MF $(OBJDIR)/$(@F).d ++ CFLAGS += -Wall -MMD -MF $(OBJDIR)/$(@F).d + CFLAGS += -Wextra + CFLAGS += -Wno-sign-compare + CFLAGS += -Wno-missing-field-initializers +@@ -87,7 +87,7 @@ + else + HOST_CC=gcc + CC=$(CROSS_PREFIX)gcc +- CFLAGS=-g -Wall -MMD -MF $(OBJDIR)/$(@F).d ++ CFLAGS += -Wall -MMD -MF $(OBJDIR)/$(@F).d + CFLAGS += -Wno-array-bounds -Wno-format-truncation + ifdef CONFIG_LTO + AR=$(CROSS_PREFIX)gcc-ar +@@ -110,7 +110,7 @@ + CFLAGS+=$(DEFINES) + CFLAGS_DEBUG=$(CFLAGS) -O0 + CFLAGS_SMALL=$(CFLAGS) -Os +-CFLAGS_OPT=$(CFLAGS) -O2 ++CFLAGS_OPT=$(CFLAGS) + CFLAGS_NOLTO:=$(CFLAGS_OPT) + LDFLAGS=-g + ifdef CONFIG_LTO +@@ -269,7 +269,7 @@ + $(CC) $(CFLAGS_OPT) -fPIC -DJS_SHARED_LIBRARY -c -o $@ $< + + $(OBJDIR)/%.nolto.o: %.c | $(OBJDIR) +- $(CC) $(CFLAGS_NOLTO) -c -o $@ $< ++ $(CC) $(CFLAGS_NOLTO) $(CPPFLAGS) -c -o $@ $< + + $(OBJDIR)/%.m32.o: %.c | $(OBJDIR) + $(CC) -m32 $(CFLAGS_OPT) -c -o $@ $<
