| 1 |
commit: 4c8ea9beed8f910f3789e6b10980e3613f6a1f86 |
| 2 |
Author: Marek Szuba <marecki <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Sep 1 23:14:49 2022 +0000 |
| 4 |
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Sep 1 23:14:49 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c8ea9be |
| 7 |
|
| 8 |
media-gfx/gmic: do not build static libraries |
| 9 |
|
| 10 |
I don't even want to know why upstream has targets for SHARED libraries |
| 11 |
generating static libraries as well. |
| 12 |
|
| 13 |
Closes: https://bugs.gentoo.org/867880 |
| 14 |
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> |
| 15 |
|
| 16 |
media-gfx/gmic/files/gmic-3.1.6-ar_so.patch | 26 ++++++++++++++++++++++++++ |
| 17 |
media-gfx/gmic/gmic-3.1.6.ebuild | 3 +-- |
| 18 |
2 files changed, 27 insertions(+), 2 deletions(-) |
| 19 |
|
| 20 |
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 |
| 21 |
new file mode 100644 |
| 22 |
index 000000000000..007cdfb50de5 |
| 23 |
--- /dev/null |
| 24 |
+++ b/media-gfx/gmic/files/gmic-3.1.6-ar_so.patch |
| 25 |
@@ -0,0 +1,26 @@ |
| 26 |
+--- a/src/Makefile |
| 27 |
++++ b/src/Makefile |
| 28 |
+@@ -414,7 +414,6 @@ |
| 29 |
+ _lib : libgmic.so use_libgmic |
| 30 |
+ |
| 31 |
+ libgmic.so: libgmic.o |
| 32 |
+- ar rcs libgmic.a libgmic.o |
| 33 |
+ ifeq ($(OS),Darwin) |
| 34 |
+ $(CXX) -shared -std=c++11 -pedantic -o libgmic.so.$(VERSION) libgmic.o $(LIBS) |
| 35 |
+ else |
| 36 |
+@@ -508,7 +507,6 @@ |
| 37 |
+ @echo " done!" |
| 38 |
+ |
| 39 |
+ libcgmic.so: libcgmic.o |
| 40 |
+- ar rcs libcgmic.a libcgmic.o |
| 41 |
+ ifeq ($(OS),Darwin) |
| 42 |
+ $(CXX) -shared -o libcgmic.so.$(VERSION) libcgmic.o libgmic.o $(LIBS) |
| 43 |
+ else |
| 44 |
+@@ -558,7 +556,6 @@ |
| 45 |
+ _libc_static: libcgmic_files libcgmic_static.so use_libcgmic_static |
| 46 |
+ |
| 47 |
+ libcgmic_static.so: libcgmic_static.o |
| 48 |
+- ar rcs libcgmic_static.a libcgmic_static.o |
| 49 |
+ ifeq ($(OS),Darwin) |
| 50 |
+ $(CXX) -shared -static -o libcgmic_static.so.$(VERSION) libcgmic_static.o libgmic.o $(PIC) $(CFLAGS) $(LIBS) |
| 51 |
+ else |
| 52 |
|
| 53 |
diff --git a/media-gfx/gmic/gmic-3.1.6.ebuild b/media-gfx/gmic/gmic-3.1.6.ebuild |
| 54 |
index 06ca0c8a4cc3..1f33517bc284 100644 |
| 55 |
--- a/media-gfx/gmic/gmic-3.1.6.ebuild |
| 56 |
+++ b/media-gfx/gmic/gmic-3.1.6.ebuild |
| 57 |
@@ -66,6 +66,7 @@ BDEPEND=" |
| 58 |
" |
| 59 |
|
| 60 |
PATCHES=( |
| 61 |
+ "${FILESDIR}"/${PN}-3.1.6-ar_so.patch |
| 62 |
"${FILESDIR}"/${PN}-3.1.6-makefile_automagic.patch |
| 63 |
"${FILESDIR}"/${PN}-3.1.6-relative_rpath.patch |
| 64 |
) |
| 65 |
@@ -100,8 +101,6 @@ gmic_emake() { |
| 66 |
$@ |
| 67 |
} |
| 68 |
|
| 69 |
-# FIXME: |
| 70 |
-# - honour user CFLAGS while building C binaries (i.e. 'use_libcgmic') |
| 71 |
src_compile() { |
| 72 |
gmic_emake lib libc |
| 73 |
use cli && gmic_emake cli_shared |
Archives