diff --git a/meta/recipes-extended/scdoc/scdoc/0001-Makefile-dont-add-static-to-LDFLAGS.patch b/meta/recipes-extended/scdoc/scdoc/0001-Makefile-dont-add-static-to-LDFLAGS.patch deleted file mode 100644 index b520e949c0..0000000000 --- a/meta/recipes-extended/scdoc/scdoc/0001-Makefile-dont-add-static-to-LDFLAGS.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 2cac433806d9622dbc005fe5738f1ae8c33a98cb Mon Sep 17 00:00:00 2001 -From: Markus Volk -Date: Thu, 13 Jul 2023 19:26:40 +0200 -Subject: [PATCH] Makefile: dont add -static to LDFLAGS - -Signed-off-by: Markus Volk - -Upstream-Status: Inappropriate [oe-specific] ---- - Makefile | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 60a80b8..49021fa 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,7 +1,6 @@ - VERSION=1.11.2 - CFLAGS?=-g - MAINFLAGS:=-DVERSION='"$(VERSION)"' -Wall -Wextra -Werror -Wno-unused-parameter --LDFLAGS+=-static - INCLUDE+=-Iinclude - PREFIX?=/usr/local - BINDIR?=$(PREFIX)/bin --- -2.39.3 - diff --git a/meta/recipes-extended/scdoc/scdoc/0001-Makefile-drop-static.patch b/meta/recipes-extended/scdoc/scdoc/0001-Makefile-drop-static.patch new file mode 100644 index 0000000000..631d06375b --- /dev/null +++ b/meta/recipes-extended/scdoc/scdoc/0001-Makefile-drop-static.patch @@ -0,0 +1,23 @@ +From 3667cced504bc40b176d4570d99a83fe67599f3a Mon Sep 17 00:00:00 2001 +From: Drew DeVault +Date: Wed, 4 Sep 2024 10:07:46 +0200 +Subject: [PATCH] Makefile: drop -static + +Upstream-Status: Backport [https://git.sr.ht/~sircmpwn/scdoc/commit/3667cced504bc40b176d4570d99a83fe67599f3a] +Signed-off-by: Alex Kiernan +--- + Makefile | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 96ad48cd04a6..49f076aadd39 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,7 +1,6 @@ + VERSION=1.11.3 + CFLAGS?=-g + MAINFLAGS:=-DVERSION='"$(VERSION)"' -Wall -Wextra -Werror -Wno-unused-parameter +-LDFLAGS+=-static + INCLUDE+=-Iinclude + PREFIX?=/usr/local + BINDIR?=$(PREFIX)/bin diff --git a/meta/recipes-extended/scdoc/scdoc_1.11.3.bb b/meta/recipes-extended/scdoc/scdoc_1.11.3.bb new file mode 100644 index 0000000000..7bbedcb66d --- /dev/null +++ b/meta/recipes-extended/scdoc/scdoc_1.11.3.bb @@ -0,0 +1,22 @@ +SUMMARY = "scdoc is a simple man page generator for POSIX systems written in C99." +HOMEPAGE = "https://git.sr.ht/~sircmpwn/scdoc" +SECTION = "base/doc" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=31752b4a8edd3fb9ddba1cb90fada74d" + +DEPENDS = "scdoc-native" + +SRC_URI = "git://git.sr.ht/~sircmpwn/scdoc;protocol=https;branch=master \ + file://0001-Makefile-drop-static.patch " +SRCREV = "0528bcb993cac6c412acd3ae2e09539e994c0a59" + +S = "${WORKDIR}/git" + +do_install() { + oe_runmake 'DESTDIR=${D}' install +} + +EXTRA_OEMAKE = "PREFIX=${prefix}" +EXTRA_OEMAKE:append:class-target = " HOST_SCDOC=${STAGING_BINDIR_NATIVE}/scdoc" + +BBCLASSEXTEND = "native" diff --git a/meta/recipes-extended/scdoc/scdoc_git.bb b/meta/recipes-extended/scdoc/scdoc_git.bb deleted file mode 100644 index 224e541734..0000000000 --- a/meta/recipes-extended/scdoc/scdoc_git.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "scdoc is a simple man page generator for POSIX systems written in C99." -HOMEPAGE = "https://github.com/ddevault/scdoc" -BUGTRACKER = "https://github.com/ddevault/scdoc/issues" -SECTION = "base/doc" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=31752b4a8edd3fb9ddba1cb90fada74d" - -SRC_URI = " \ - git://git.sr.ht/~sircmpwn/scdoc;protocol=https;branch=master \ - file://0001-Makefile-dont-add-static-to-LDFLAGS.patch \ -" - -DEPENDS = "scdoc-native" - -S = "${WORKDIR}/git" -PV = "1.11.2" -SRCREV = "afeda241f3f9b2c27e461f32d9c2a704ab82ef61" - -EXTRA_OEMAKE:class-native = "PREFIX=${prefix}" -EXTRA_OEMAKE:class-target = "PREFIX=${prefix} HOST_SCDOC=${STAGING_BINDIR_NATIVE}/scdoc" - -inherit autotools-brokensep - -BBCLASSEXTEND = "native" -