From 736ee1f27b0f84869cb6b99db0afffd833e69413 Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Sun, 5 May 2024 17:40:36 +0100
Subject: media-gfx/jhead: fix LDFLAGS patch

We don't want to build jhead itself with -shared, just libjhead.

Closes: https://bugs.gentoo.org/931225
Signed-off-by: Sam James <sam@gentoo.org>
---
 .../jhead/files/jhead-3.08-fix-makefile.patch      |  4 +--
 media-gfx/jhead/jhead-3.08-r1.ebuild               | 36 ++++++++++++++++++++++
 media-gfx/jhead/jhead-3.08.ebuild                  | 36 ----------------------
 3 files changed, 38 insertions(+), 38 deletions(-)
 create mode 100644 media-gfx/jhead/jhead-3.08-r1.ebuild
 delete mode 100644 media-gfx/jhead/jhead-3.08.ebuild

(limited to 'media-gfx')

diff --git a/media-gfx/jhead/files/jhead-3.08-fix-makefile.patch b/media-gfx/jhead/files/jhead-3.08-fix-makefile.patch
index 7f4e80be57ea..edf19da410dc 100644
--- a/media-gfx/jhead/files/jhead-3.08-fix-makefile.patch
+++ b/media-gfx/jhead/files/jhead-3.08-fix-makefile.patch
@@ -10,7 +10,7 @@
 -LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
 -endif
 +CFLAGS ?= -O2
-+LDFLAGS += -fPIC -shared -Wl,-soname,libjhead.so.1
++LFLAGS += -fPIC -shared -Wl,-soname,libjhead.so.1
 +
 +TARGET = libjhead.so.1.0.0
 +TARGET0        = libjhead.so
@@ -36,7 +36,7 @@
  	install -m 0644 jhead.1 $(MANDIR)
 +
 +$(TARGET): $(objs) jhead
-+	${CC} $(LDFLAGS) $(LFLAGS) -o $(TARGET) $(objs)
++	${CC} $(CFLAGS) $(LDFLAGS) $(LFLAGS) -o $(TARGET) $(objs)
 +	ln -s ${TARGET} ${TARGET0}
 +	ln -s ${TARGET} ${TARGET1}
 +	ln -s ${TARGET} ${TARGET2}
diff --git a/media-gfx/jhead/jhead-3.08-r1.ebuild b/media-gfx/jhead/jhead-3.08-r1.ebuild
new file mode 100644
index 000000000000..236107212ff2
--- /dev/null
+++ b/media-gfx/jhead/jhead-3.08-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="EXIF JPEG camera setting parser and thumbnail remover"
+HOMEPAGE="http://www.sentex.net/~mwandel/jhead"
+SRC_URI="https://github.com/Matthias-Wandel/jhead/archive/refs/tags/${PV}.tar.gz -> ${P}.tgz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.08-fix-makefile.patch
+)
+
+src_compile() {
+	# Older codebase with aliasing violations (bug #890252)
+	append-flags -fno-strict-aliasing
+	filter-lto
+
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc *.txt
+	docinto html
+	dodoc *.html
+	doman ${PN}.1
+	doheader ${PN}.h
+	dolib.so lib${PN}.so*
+}
diff --git a/media-gfx/jhead/jhead-3.08.ebuild b/media-gfx/jhead/jhead-3.08.ebuild
deleted file mode 100644
index 236107212ff2..000000000000
--- a/media-gfx/jhead/jhead-3.08.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="EXIF JPEG camera setting parser and thumbnail remover"
-HOMEPAGE="http://www.sentex.net/~mwandel/jhead"
-SRC_URI="https://github.com/Matthias-Wandel/jhead/archive/refs/tags/${PV}.tar.gz -> ${P}.tgz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.08-fix-makefile.patch
-)
-
-src_compile() {
-	# Older codebase with aliasing violations (bug #890252)
-	append-flags -fno-strict-aliasing
-	filter-lto
-
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc *.txt
-	docinto html
-	dodoc *.html
-	doman ${PN}.1
-	doheader ${PN}.h
-	dolib.so lib${PN}.so*
-}
-- 
cgit v1.2.3-65-gdbad