From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/jhead/, media-gfx/jhead/files/
Date: Sun, 5 May 2024 16:41:17 +0000 (UTC) [thread overview]
Message-ID: <1714927263.736ee1f27b0f84869cb6b99db0afffd833e69413.sam@gentoo> (raw)
commit: 736ee1f27b0f84869cb6b99db0afffd833e69413
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun May 5 16:40:36 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun May 5 16:41:03 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=736ee1f2
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 <AT> gentoo.org>
media-gfx/jhead/files/jhead-3.08-fix-makefile.patch | 4 ++--
media-gfx/jhead/{jhead-3.08.ebuild => jhead-3.08-r1.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
similarity index 100%
rename from media-gfx/jhead/jhead-3.08.ebuild
rename to media-gfx/jhead/jhead-3.08-r1.ebuild
next reply other threads:[~2024-05-05 16:41 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-05 16:41 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-07-27 3:15 [gentoo-commits] repo/gentoo:master commit in: media-gfx/jhead/, media-gfx/jhead/files/ Sam James
2020-07-04 14:27 Andreas K. Hüttel
2017-11-22 15:51 Amy Liffey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1714927263.736ee1f27b0f84869cb6b99db0afffd833e69413.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox