summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Szuba <marecki@gentoo.org>2022-09-02 00:14:49 +0100
committerMarek Szuba <marecki@gentoo.org>2022-09-02 00:14:49 +0100
commit4c8ea9beed8f910f3789e6b10980e3613f6a1f86 (patch)
tree74476ee7694cfcc5b5603632f63e166acf106041 /media-gfx
parentsys-apps/apparmor-utils: Keyword 3.0.4 arm64, #867751 (diff)
downloadgentoo-4c8ea9beed8f910f3789e6b10980e3613f6a1f86.tar.gz
gentoo-4c8ea9beed8f910f3789e6b10980e3613f6a1f86.tar.bz2
gentoo-4c8ea9beed8f910f3789e6b10980e3613f6a1f86.zip
media-gfx/gmic: do not build static libraries
I don't even want to know why upstream has targets for SHARED libraries generating static libraries as well. Closes: https://bugs.gentoo.org/867880 Signed-off-by: Marek Szuba <marecki@gentoo.org>
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/gmic/files/gmic-3.1.6-ar_so.patch26
-rw-r--r--media-gfx/gmic/gmic-3.1.6.ebuild3
2 files changed, 27 insertions, 2 deletions
diff --git a/media-gfx/gmic/files/gmic-3.1.6-ar_so.patch b/media-gfx/gmic/files/gmic-3.1.6-ar_so.patch
new file mode 100644
index 000000000000..007cdfb50de5
--- /dev/null
+++ b/media-gfx/gmic/files/gmic-3.1.6-ar_so.patch
@@ -0,0 +1,26 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -414,7 +414,6 @@
+ _lib : libgmic.so use_libgmic
+
+ libgmic.so: libgmic.o
+- ar rcs libgmic.a libgmic.o
+ ifeq ($(OS),Darwin)
+ $(CXX) -shared -std=c++11 -pedantic -o libgmic.so.$(VERSION) libgmic.o $(LIBS)
+ else
+@@ -508,7 +507,6 @@
+ @echo " done!"
+
+ libcgmic.so: libcgmic.o
+- ar rcs libcgmic.a libcgmic.o
+ ifeq ($(OS),Darwin)
+ $(CXX) -shared -o libcgmic.so.$(VERSION) libcgmic.o libgmic.o $(LIBS)
+ else
+@@ -558,7 +556,6 @@
+ _libc_static: libcgmic_files libcgmic_static.so use_libcgmic_static
+
+ libcgmic_static.so: libcgmic_static.o
+- ar rcs libcgmic_static.a libcgmic_static.o
+ ifeq ($(OS),Darwin)
+ $(CXX) -shared -static -o libcgmic_static.so.$(VERSION) libcgmic_static.o libgmic.o $(PIC) $(CFLAGS) $(LIBS)
+ else
diff --git a/media-gfx/gmic/gmic-3.1.6.ebuild b/media-gfx/gmic/gmic-3.1.6.ebuild
index 06ca0c8a4cc3..1f33517bc284 100644
--- a/media-gfx/gmic/gmic-3.1.6.ebuild
+++ b/media-gfx/gmic/gmic-3.1.6.ebuild
@@ -66,6 +66,7 @@ BDEPEND="
"
PATCHES=(
+ "${FILESDIR}"/${PN}-3.1.6-ar_so.patch
"${FILESDIR}"/${PN}-3.1.6-makefile_automagic.patch
"${FILESDIR}"/${PN}-3.1.6-relative_rpath.patch
)
@@ -100,8 +101,6 @@ gmic_emake() {
$@
}
-# FIXME:
-# - honour user CFLAGS while building C binaries (i.e. 'use_libcgmic')
src_compile() {
gmic_emake lib libc
use cli && gmic_emake cli_shared