commit:     d4cec827f330dd0ff4ec7c51f2599916cabacda3
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 20 18:36:34 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Oct 20 18:37:13 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4cec827

media-libs/libcaca: build with -fno-strict-overflow

There's UB in at least one place and probably others from looking at
upstream bug reports.

I get a `test-caca` test failure w/ GCC trunk at just -O2 which prompted
me to look at this.

Bug: https://github.com/cacalabs/libcaca/issues/86
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...9_beta19-r11.ebuild => libcaca-0.99_beta19-r12.ebuild} | 15 +++++++++++----
 ...a-0.99_beta20.ebuild => libcaca-0.99_beta20-r1.ebuild} | 15 +++++++++++----
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/media-libs/libcaca/libcaca-0.99_beta19-r11.ebuild 
b/media-libs/libcaca/libcaca-0.99_beta19-r12.ebuild
similarity index 96%
rename from media-libs/libcaca/libcaca-0.99_beta19-r11.ebuild
rename to media-libs/libcaca/libcaca-0.99_beta19-r12.ebuild
index 7ea78d4784c9..e29a95ed66c6 100644
--- a/media-libs/libcaca/libcaca-0.99_beta19-r11.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta19-r12.ebuild
@@ -77,6 +77,14 @@ src_prepare() {
                sed -i -e '/PKG_CHECK_MODULES/s:ftgl:dIsAbLe&:' configure.ac || 
die
        fi
 
+       # fix docs install path, bug 543870#c14
+       sed -i "s/libcaca-dev/${PF}/g" doc/Makefile.am || die
+
+       default
+       eautoreconf
+}
+
+src_configure() {
        if use imlib && ! use X; then
                append-cflags -DX_DISPLAY_MISSING
        fi
@@ -87,11 +95,10 @@ src_prepare() {
        # bug #601902, bug #825058
        use ncurses && append-libs $($(tc-getPKG_CONFIG) --libs tinfow || die)
 
-       # fix docs install path, bug 543870#c14
-       sed -i "s/libcaca-dev/${PF}/g" doc/Makefile.am || die
+       # https://github.com/cacalabs/libcaca/issues/86
+       append-flags -fno-strict-overflow
 
-       default
-       eautoreconf
+       multilib-minimal_src_configure
 }
 
 multilib_src_configure() {

diff --git a/media-libs/libcaca/libcaca-0.99_beta20.ebuild 
b/media-libs/libcaca/libcaca-0.99_beta20-r1.ebuild
similarity index 95%
rename from media-libs/libcaca/libcaca-0.99_beta20.ebuild
rename to media-libs/libcaca/libcaca-0.99_beta20-r1.ebuild
index ea533c1c43a8..4e0ee3c169b2 100644
--- a/media-libs/libcaca/libcaca-0.99_beta20.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta20-r1.ebuild
@@ -67,6 +67,14 @@ src_prepare() {
                sed -i -e '/PKG_CHECK_MODULES/s:ftgl:dIsAbLe&:' configure.ac || 
die
        fi
 
+       # fix docs install path, bug 543870#c14
+       sed -i "s/libcaca-dev/${PF}/g" doc/Makefile.am || die
+
+       default
+       eautoreconf
+}
+
+src_configure() {
        if use imlib && ! use X; then
                append-cflags -DX_DISPLAY_MISSING
        fi
@@ -77,11 +85,10 @@ src_prepare() {
        # bug #601902, bug #825058
        use ncurses && append-libs $($(tc-getPKG_CONFIG) --libs tinfow || die)
 
-       # fix docs install path, bug 543870#c14
-       sed -i "s/libcaca-dev/${PF}/g" doc/Makefile.am || die
+       # https://github.com/cacalabs/libcaca/issues/86
+       append-flags -fno-strict-overflow
 
-       default
-       eautoreconf
+       multilib-minimal_src_configure
 }
 
 multilib_src_configure() {

Reply via email to