From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3E87215800A for ; Mon, 21 Aug 2023 15:49:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 74E882BC018; Mon, 21 Aug 2023 15:49:42 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5E3252BC018 for ; Mon, 21 Aug 2023 15:49:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7B0BC3411E5 for ; Mon, 21 Aug 2023 15:49:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D5963104E for ; Mon, 21 Aug 2023 15:49:39 +0000 (UTC) From: "Marek Szuba" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" Message-ID: <1692632966.8fc99cd067618885adf566cb2437d7f056e2d1a9.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/files/, media-gfx/gmic/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/gmic/files/gmic-3.2.6-makefile_target_deps.patch media-gfx/gmic/gmic-3.2.6.ebuild X-VCS-Directories: media-gfx/gmic/files/ media-gfx/gmic/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: 8fc99cd067618885adf566cb2437d7f056e2d1a9 X-VCS-Branch: master Date: Mon, 21 Aug 2023 15:49:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 04d2e6c2-3faf-4b82-8190-1864ba48a479 X-Archives-Hash: c19a58b427b8256b936fe5d833b06170 commit: 8fc99cd067618885adf566cb2437d7f056e2d1a9 Author: Marek Szuba gentoo org> AuthorDate: Mon Aug 21 15:21:40 2023 +0000 Commit: Marek Szuba gentoo org> CommitDate: Mon Aug 21 15:49:26 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fc99cd0 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 gentoo.org> media-gfx/gmic/files/gmic-3.2.6-makefile_target_deps.patch | 11 +++++++++++ media-gfx/gmic/gmic-3.2.6.ebuild | 1 + 2 files changed, 12 insertions(+) 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() {