public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-util/maxcso/files/, dev-util/maxcso/
@ 2021-12-09  1:10 Sam James
  0 siblings, 0 replies; only message in thread
From: Sam James @ 2021-12-09  1:10 UTC (permalink / raw
  To: gentoo-commits

commit:     24faf6e7e362d24a6fe49c2d653007c21fb7f356
Author:     orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Wed Dec  8 14:19:34 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec  9 01:10:00 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24faf6e7

dev-util/maxcso: Add patch to support LDFLAGS

Closes: https://bugs.gentoo.org/828416
Upstream-PR: https://github.com/unknownbrackets/maxcso/pull/58
Upstream commit: a97c03ef16bffe535a05d01d5ab856d40a70863b
Signed-off-by: orbea <orbea <AT> riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/23224
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/maxcso/files/maxcso-1.13.0-ldflags.patch | 26 +++++++++++++++++++++++
 dev-util/maxcso/maxcso-1.13.0.ebuild              |  2 ++
 2 files changed, 28 insertions(+)

diff --git a/dev-util/maxcso/files/maxcso-1.13.0-ldflags.patch b/dev-util/maxcso/files/maxcso-1.13.0-ldflags.patch
new file mode 100644
index 000000000000..ba6b92b0627a
--- /dev/null
+++ b/dev-util/maxcso/files/maxcso-1.13.0-ldflags.patch
@@ -0,0 +1,26 @@
+From 29458b4586c8bec1a025a71eab06146fc646ccc4 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Tue, 7 Dec 2021 07:17:28 -0800
+Subject: [PATCH] build: Support LDFLAGS
+
+Fixes the gentoo issue: https://bugs.gentoo.org/828416
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 4a93ec74..1cc7fc63 100644
+--- a/Makefile
++++ b/Makefile
+@@ -32,7 +32,7 @@ ZOPFLI_C_OBJ = $(ZOPFLI_C_SRC:.c=.o)
+ 
+ # TODO: Perhaps detect and use system libdeflate if available.
+ maxcso: $(SRC_CXX_OBJ) $(CLI_CXX_OBJ) $(ZOPFLI_C_OBJ) 7zip/7zip.a libdeflate/libdeflate.a
+-	$(CXX) -o $@ $(SRC_CXXFLAGS) $(CXXFLAGS) $^ -luv -llz4 -lz
++	$(CXX) $(LDFLAGS) -o $@ $(SRC_CXXFLAGS) $(CXXFLAGS) $^ -luv -llz4 -lz
+ 
+ 7zip/7zip.a:
+ 	$(MAKE) -C 7zip 7zip.a
+-- 
+2.32.0
+

diff --git a/dev-util/maxcso/maxcso-1.13.0.ebuild b/dev-util/maxcso/maxcso-1.13.0.ebuild
index a9f29908ada6..ba5155edd760 100644
--- a/dev-util/maxcso/maxcso-1.13.0.ebuild
+++ b/dev-util/maxcso/maxcso-1.13.0.ebuild
@@ -26,6 +26,8 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=("${FILESDIR}/${P}-ldflags.patch")
+
 src_compile() {
 	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)"
 }


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2021-12-09  1:10 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-12-09  1:10 [gentoo-commits] repo/gentoo:master commit in: dev-util/maxcso/files/, dev-util/maxcso/ Sam James

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox