summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2024-05-05 17:40:36 +0100
committerSam James <sam@gentoo.org>2024-05-05 17:41:03 +0100
commit736ee1f27b0f84869cb6b99db0afffd833e69413 (patch)
tree983df63640494d0418edb7379368ad518bb4e385 /media-gfx
parentsys-kernel/gentoo-sources: drop 6.6.13 (diff)
downloadgentoo-736ee1f27b0f84869cb6b99db0afffd833e69413.tar.gz
gentoo-736ee1f27b0f84869cb6b99db0afffd833e69413.tar.bz2
gentoo-736ee1f27b0f84869cb6b99db0afffd833e69413.zip
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>
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/jhead/files/jhead-3.08-fix-makefile.patch4
-rw-r--r--media-gfx/jhead/jhead-3.08-r1.ebuild (renamed from media-gfx/jhead/jhead-3.08.ebuild)0
2 files changed, 2 insertions, 2 deletions
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.ebuild b/media-gfx/jhead/jhead-3.08-r1.ebuild
index 236107212ff2..236107212ff2 100644
--- a/media-gfx/jhead/jhead-3.08.ebuild
+++ b/media-gfx/jhead/jhead-3.08-r1.ebuild