helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2025-12-31 13:38:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

giflib: fix build with gold and avoid imagemagick-native dependency

Browse Source 
* avoid imagemagick-native like upstream did in:
  d54b45b024/

Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Martin Jansa 2024-07-08 14:10:52 +02:00 committed by Khem Raj
parent cdd196388a
commit 23e3b5e971
No known key found for this signature in database
GPG Key ID: BB053355919D3314
3 changed files with 39 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
meta-oe/recipes-devtools/giflib/files/add_suffix_to_convert_binary_used_in_Makefile.patch
View File

@ -1,42 +0,0 @@
Subject: Modify binary name "convert" to "convert.im7"
The change is needed to resolve the below compilation error
after giflib version upgrade. Log data follows:
| DEBUG: Executing shell function do_compile
| NOTE: make -j 8
| make -C doc
| make[1]: Entering directory '../giflib/5.2.2/giflib-5.2.2/doc'
| convert ../pic/gifgrid.gif -resize 50x50 giflib-logo.gif
| make[1]: convert: No such file or directory
| make[1]: *** [Makefile:46: giflib-logo.gif] Error 127
| make[1]: Leaving directory '../giflib/5.2.2/giflib-5.2.2/doc'
| make: *** [Makefile:93: all] Error 2
| ERROR: oe_runmake failed
Added dependency on ImageMagick which includes "convert" utility,
to ensure availability of required tool during compilation process.
This patch updates the binary name used in Makefile from
"convert" to "convert.im7" for resizing the logo image used in HTML
documentation as Imagemagick installs binary in this format.
Below commits justify the cause of adding the suffix to binaries
provided by ImageMagic package:
https://git.openembedded.org/meta-openembedded/commit/meta-oe/recipes-support/imagemagick?id=dcbb49f707e7ad9bf755dd3275ffc442154b8144
https://git.openembedded.org/meta-openembedded/commit/meta-oe/recipes-support/imagemagick?id=6e0c24e9b3f9d430dec57f61f8c12c74bca5375d
Signed-off-by: Bhabu Bindu <bhabubindu@kpit.com>
Upstream-Status: Inappropriate [OE specific]
===================================================================
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -43,7 +43,7 @@
# Logo image file for HTML docs
giflib-logo.gif: ../pic/gifgrid.gif
- convert $^ -resize 50x50 $@
+ convert.im7 $^ -resize 50x50 $@
# Philosophical choice: the website gets the internal manual pages
allhtml: $(XMLALL:.xml=.html) giflib-logo.gif

34
meta-oe/recipes-devtools/giflib/giflib/0001-Makefile-fix-typo-in-soname-argument.patch Normal file
View File

@ -0,0 +1,34 @@
From 7f0cd4b6b56183b0afbefd01425e5ebd2b8733b4 Mon Sep 17 00:00:00 2001
From: Martin Jansa <martin.jansa@gmail.com>
Date: Mon, 8 Jul 2024 13:18:11 +0200
Subject: [PATCH] Makefile: fix typo in soname argument
* introduced in:
https://sourceforge.net/p/giflib/code/ci/b65c7ac2905c0842e7977a7b51d83af4486ca7b8/
there is no LIBUTILMAJOR variable only LIBUTILSOMAJOR leading to:
ld: fatal error: -soname: must take a non-empty argument
collect2: error: ld returned 1 exit status
with some linkers like GOLD
Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
---
Upstream-Status: Submitted [https://sourceforge.net/p/giflib/code/merge-requests/17/]
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 87966a9..41b149e 100644
--- a/Makefile
+++ b/Makefile
@@ -109,7 +109,7 @@ $(LIBUTILSO): $(UOBJECTS) $(UHEADERS)
ifeq ($(UNAME), Darwin)
$(CC) $(CFLAGS) -dynamiclib -current_version $(LIBVER) $(OBJECTS) -o $(LIBUTILSO)
else
- $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,$(LIBUTILMAJOR) -o $(LIBUTILSO) $(UOBJECTS)
+ $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,$(LIBUTILSOMAJOR) -o $(LIBUTILSO) $(UOBJECTS)
endif
libutil.a: $(UOBJECTS) $(UHEADERS)

8
meta-oe/recipes-devtools/giflib/giflib_5.2.2.bb
View File

@ -5,14 +5,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ae11c61b04b2917be39b11f78d71519a"
CVE_PRODUCT = "giflib_project:giflib"
DEPENDS = "xmlto-native imagemagick-native"
DEPENDS = "xmlto-native"
SRC_URI = "${SOURCEFORGE_MIRROR}/giflib/${BP}.tar.gz \
file://add_suffix_to_convert_binary_used_in_Makefile.patch"
https://sourceforge.net/p/giflib/code/ci/d54b45b0240d455bbaedee4be5203d2703e59967/tree/doc/giflib-logo.gif?format=raw;subdir=${BP}/doc;name=logo;downloadfilename=giflib-logo.gif \
file://0001-Makefile-fix-typo-in-soname-argument.patch \
"
SRC_URI[logo.sha256sum] = "1a54383986adad1521d00e003b4c482c27e8bc60690be944a1f3319c75abc2c9"
SRC_URI[sha256sum] = "be7ffbd057cadebe2aa144542fd90c6838c6a083b5e8a9048b8ee3b66b29d5fb"
do_install() {
# using autotools's default will end up in /usr/local
oe_runmake DESTDIR=${D} PREFIX=${prefix} LIBDIR=${libdir} install