summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIonen Wolkens <ionen@gentoo.org>2022-10-11 03:30:30 -0400
committerIonen Wolkens <ionen@gentoo.org>2022-10-11 04:55:59 -0400
commit3bb8aa60bc4f0066dc5804bb4a705a5ae17ece42 (patch)
treebdb0c9431fa51ea2716960f341673a959c9e9f09 /media-libs
parentwww-client/seamonkey: Update to www-client/seamonkey-2.35.14 (diff)
downloadgentoo-3bb8aa60bc4f0066dc5804bb4a705a5ae17ece42.tar.gz
gentoo-3bb8aa60bc4f0066dc5804bb4a705a5ae17ece42.tar.bz2
gentoo-3bb8aa60bc4f0066dc5804bb4a705a5ae17ece42.zip
media-libs/volpack: respect flags for makeopts and CBUILD env
Was failing with C2x because gnu89 wasn't being passed only there. This is executed at build time, so also an occasion to use CBUILD. Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/volpack/files/volpack-1.0_p7-cbuild-env.patch15
-rw-r--r--media-libs/volpack/volpack-1.0_p7-r2.ebuild4
2 files changed, 18 insertions, 1 deletions
diff --git a/media-libs/volpack/files/volpack-1.0_p7-cbuild-env.patch b/media-libs/volpack/files/volpack-1.0_p7-cbuild-env.patch
new file mode 100644
index 000000000000..189bc8abb006
--- /dev/null
+++ b/media-libs/volpack/files/volpack-1.0_p7-cbuild-env.patch
@@ -0,0 +1,15 @@
+Gentoo specific to go with `tc-export_build_env BUILD_CC` + respect flags.
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -96,3 +96,3 @@
+ makeopts: makeopts.c
+- $(CC) -o makeopts makeopts.c
++ $(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) -o makeopts makeopts.c
+
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -643,3 +643,3 @@
+ makeopts: makeopts.c
+- $(CC) -o makeopts makeopts.c
++ $(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) -o makeopts makeopts.c
+
diff --git a/media-libs/volpack/volpack-1.0_p7-r2.ebuild b/media-libs/volpack/volpack-1.0_p7-r2.ebuild
index e3a3ed9dca75..a88d88cf481d 100644
--- a/media-libs/volpack/volpack-1.0_p7-r2.ebuild
+++ b/media-libs/volpack/volpack-1.0_p7-r2.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit flag-o-matic
+inherit flag-o-matic toolchain-funcs
MY_P="${PN}-${PV/_p/c}"
@@ -22,10 +22,12 @@ BDEPEND="sys-devel/m4"
PATCHES=(
"${FILESDIR}"/${P}-skip-examples.patch
"${FILESDIR}"/${P}-clang16.patch
+ "${FILESDIR}"/${P}-cbuild-env.patch
)
src_configure() {
append-cflags -std=gnu89 # old codebase, will break with c2x
+ tc-export_build_env BUILD_CC # see cbuild-env.patch
default
}