summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGwendal Grignou <gwendal@chromium.org>2023-06-28 16:25:01 -0700
committerSam James <sam@gentoo.org>2023-07-15 07:02:57 +0100
commit69c7647ae0eab2937fd4e7d75b8073e99866f594 (patch)
tree306e7c132eefd693ba915efcdf36b236b1dbbeac
parentdev-ruby/faraday-net_http_persistent: add missing test dep (diff)
downloadgentoo-69c7647ae0eab2937fd4e7d75b8073e99866f594.tar.gz
gentoo-69c7647ae0eab2937fd4e7d75b8073e99866f594.tar.bz2
gentoo-69c7647ae0eab2937fd4e7d75b8073e99866f594.zip
sys-block/thin-provisioning-tools: Do not use gcc directly
Use $(CXX) when linking libft.so. BUG=b:271479944 TEST=Install on brya, check the new version. Closes: https://bugs.gentoo.org/721500 Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Closes: https://github.com/gentoo/gentoo/pull/31886 Signed-off-by: Sam James <sam@gentoo.org>
-rw-r--r--sys-block/thin-provisioning-tools/files/thin-provisioning-tools-0.9.0-build-fixes.patch25
-rw-r--r--sys-block/thin-provisioning-tools/thin-provisioning-tools-0.9.0-r2.ebuild (renamed from sys-block/thin-provisioning-tools/thin-provisioning-tools-0.9.0-r1.ebuild)1
2 files changed, 26 insertions, 0 deletions
diff --git a/sys-block/thin-provisioning-tools/files/thin-provisioning-tools-0.9.0-build-fixes.patch b/sys-block/thin-provisioning-tools/files/thin-provisioning-tools-0.9.0-build-fixes.patch
new file mode 100644
index 000000000000..da2a10e0afbf
--- /dev/null
+++ b/sys-block/thin-provisioning-tools/files/thin-provisioning-tools-0.9.0-build-fixes.patch
@@ -0,0 +1,25 @@
+From f912f6630eada34dcfb1320bb46b02d149c32ad4 Mon Sep 17 00:00:00 2001
+From: Gwendal Grignou <gwendal@chromium.org>
+Date: Wed, 28 Jun 2023 16:08:41 -0700
+Subject: [PATCH] [base] Never use gcc directly
+
+---
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index b1fd4aa..342daf7 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -363,7 +363,7 @@ LIBFT_OBJECTS=$(subst .c,.o,$(LIBFT_SOURCE))
+
+ lib/libft.so: $(LIBFT_OBJECTS)
+ @echo " [LD]" $@
+- $(V) gcc -shared -o $@ $+ -laio
++ $(V) $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $+ -laio
+
+ .PHONEY: functional-test unit-test
+
+--
+2.41.0.255.g8b1d071c50-goog
+
diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.9.0-r1.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.9.0-r2.ebuild
index 42ab5f59eb01..072dbecae727 100644
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.9.0-r1.ebuild
+++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.9.0-r2.ebuild
@@ -33,6 +33,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-0.7.0-build-fixes.patch
+ "${FILESDIR}"/${PN}-0.9.0-build-fixes.patch
"${FILESDIR}"/0.9.0-remove-boost_iostreams.patch
)