Skip to content

Commit

Permalink
webos-backports: giflib=v5.2.2
Browse files Browse the repository at this point in the history
:Release Notes:
The upgrade was backported to meta-oe/kirkstone and broke build
with gold which we're using.
The fix is now merged in master:
https://git.openembedded.org/meta-openembedded/commit/?id=23e3b5e97191175036c53f0983dedbe3940c87e2
add it to webos-backports to unblock the meta-oe/kirkstone update.

:Detailed Notes:
See:
https://lists.openembedded.org/g/openembedded-devel/message/111263
and the fix for master:
https://lists.openembedded.org/g/openembedded-devel/message/111265
and the same for kirkstone:
https://lists.openembedded.org/g/openembedded-devel/message/111266

:Testing Performed:
Only build tested.

:QA Notes:
N/A

:Issues Addressed:
[WRQ-27354] CCC: Various build fixes

Cherry-picked-from-commit: c757bf65474f9142f6f4d6151987ecae54faf20c
Cherry-picked-from-branch:
  • Loading branch information
shr-project authored and ywbyun0815 committed Oct 26, 2024
1 parent 2360eb8 commit 609c362
Show file tree
Hide file tree
Showing 2 changed files with 63 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
From 7f0cd4b6b56183b0afbefd01425e5ebd2b8733b4 Mon Sep 17 00:00:00 2001
From: Martin Jansa <[email protected]>
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 <[email protected]>
---
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)
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
SUMMARY = "shared library for GIF images"
SECTION = "libs"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=ae11c61b04b2917be39b11f78d71519a"

CVE_PRODUCT = "giflib_project:giflib"

DEPENDS = "xmlto-native"

SRC_URI = "${SOURCEFORGE_MIRROR}/giflib/${BP}.tar.gz \
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
}

PACKAGES += "${PN}-utils"
FILES:${PN} = "${libdir}/libgif.so.*"
FILES:${PN}-utils = "${bindir}"

BBCLASSEXTEND = "native"

RDEPENDS:${PN}-utils = "perl"

0 comments on commit 609c362

Please sign in to comment.