summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Szuba <marecki@gentoo.org>2023-08-21 16:21:40 +0100
committerMarek Szuba <marecki@gentoo.org>2023-08-21 16:49:26 +0100
commit8fc99cd067618885adf566cb2437d7f056e2d1a9 (patch)
tree23b4808a8fd1311b9a8ae139e5feb449c668f2ae /media-gfx
parentmedia-gfx/gmic: drop 3.2.5 (diff)
downloadgentoo-8fc99cd067618885adf566cb2437d7f056e2d1a9.tar.gz
gentoo-8fc99cd067618885adf566cb2437d7f056e2d1a9.tar.bz2
gentoo-8fc99cd067618885adf566cb2437d7f056e2d1a9.zip
media-gfx/gmic: fix Makefile dependency chain
It helps if libcgmic.so exists before make attempts to link use_libcgmic against it. Closes: https://bugs.gentoo.org/912239 Signed-off-by: Marek Szuba <marecki@gentoo.org>
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/gmic/files/gmic-3.2.6-makefile_target_deps.patch11
-rw-r--r--media-gfx/gmic/gmic-3.2.6.ebuild1
2 files changed, 12 insertions, 0 deletions
diff --git a/media-gfx/gmic/files/gmic-3.2.6-makefile_target_deps.patch b/media-gfx/gmic/files/gmic-3.2.6-makefile_target_deps.patch
new file mode 100644
index 000000000000..6aea9e1579eb
--- /dev/null
+++ b/media-gfx/gmic/files/gmic-3.2.6-makefile_target_deps.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -503,7 +503,7 @@
+ libcgmic.o: gmic_libc.cpp CImg.h gmic_libc.h gmic.h
+ $(CXX) -o libcgmic.o -c gmic_libc.cpp -Dgmic_core $(PIC) $(CFLAGS)
+
+-use_libcgmic: use_libcgmic.c gmic_libc.h
++use_libcgmic: use_libcgmic.c libcgmic.so
+ $(CC) -std=c99 -o use_libcgmic use_libcgmic.c -lcgmic $(LIBS)
+
+ # libcgmic (static).
diff --git a/media-gfx/gmic/gmic-3.2.6.ebuild b/media-gfx/gmic/gmic-3.2.6.ebuild
index e49f4fe6fe0d..6987b6673d70 100644
--- a/media-gfx/gmic/gmic-3.2.6.ebuild
+++ b/media-gfx/gmic/gmic-3.2.6.ebuild
@@ -65,6 +65,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.2.0-grep38.patch
"${FILESDIR}"/${PN}-3.2.4-makefile_automagic.patch
"${FILESDIR}"/${PN}-3.2.5-relative_rpath.patch
+ "${FILESDIR}"/${PN}-3.2.6-makefile_target_deps.patch
)
pkg_pretend() {