summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Kiernan <alex.kiernan@gmail.com>2025-03-15 10:24:39 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-03-17 17:09:22 +0000
commit8553d3e1ca542ac65e00d943a1521c5e2ebf98e5 (patch)
treed06f83d40b1736d7f24462a7a9e3b750675410a2
parent113bf90b00eb15f5f588b75097656c710c31d1a3 (diff)
downloadpoky-8553d3e1ca542ac65e00d943a1521c5e2ebf98e5.tar.gz
scdoc: Upgrade 1.11.2 -> 1.11.3
Swap static link removal patch to a backport of upstream, remove autotools usage (this is just a Makefile recipe), fix up metadata. Changes: Dimitry Andric (1): Fix clang 15 -Wstrict-prototypes warnings Drew DeVault (2): README.md: mention system packages Update version to 1.11.3 Eli Schwartz (2): remove useless re-declarations of standard functions get rid of some unused includes Humm (3): use .PP for paragraph breaks scdoc(1), scdoc(5): follow conventions more closely simplify list output Max Schillinger (1): fix formatting of escaped backticks Simon Branch (2): scdoc.5: fix capitalization of subsection headers scdoc.5: fix formatting in the preamble Simon Ser (1): man: add section about SOURCE_DATE_EPOCH jturtle (1): Emit '\e' instead of '\\' (From OE-Core rev: a57fa257b4e64a790ee649661c0a386803acf0a5) Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/scdoc/scdoc/0001-Makefile-dont-add-static-to-LDFLAGS.patch27
-rw-r--r--meta/recipes-extended/scdoc/scdoc/0001-Makefile-drop-static.patch23
-rw-r--r--meta/recipes-extended/scdoc/scdoc_1.11.3.bb22
-rw-r--r--meta/recipes-extended/scdoc/scdoc_git.bb25
4 files changed, 45 insertions, 52 deletions
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 @@
1From 2cac433806d9622dbc005fe5738f1ae8c33a98cb Mon Sep 17 00:00:00 2001
2From: Markus Volk <f_l_k@t-online.de>
3Date: Thu, 13 Jul 2023 19:26:40 +0200
4Subject: [PATCH] Makefile: dont add -static to LDFLAGS
5
6Signed-off-by: Markus Volk <f_l_k@t-online.de>
7
8Upstream-Status: Inappropriate [oe-specific]
9---
10 Makefile | 1 -
11 1 file changed, 1 deletion(-)
12
13diff --git a/Makefile b/Makefile
14index 60a80b8..49021fa 100644
15--- a/Makefile
16+++ b/Makefile
17@@ -1,7 +1,6 @@
18 VERSION=1.11.2
19 CFLAGS?=-g
20 MAINFLAGS:=-DVERSION='"$(VERSION)"' -Wall -Wextra -Werror -Wno-unused-parameter
21-LDFLAGS+=-static
22 INCLUDE+=-Iinclude
23 PREFIX?=/usr/local
24 BINDIR?=$(PREFIX)/bin
25--
262.39.3
27
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 @@
1From 3667cced504bc40b176d4570d99a83fe67599f3a Mon Sep 17 00:00:00 2001
2From: Drew DeVault <sir@cmpwn.com>
3Date: Wed, 4 Sep 2024 10:07:46 +0200
4Subject: [PATCH] Makefile: drop -static
5
6Upstream-Status: Backport [https://git.sr.ht/~sircmpwn/scdoc/commit/3667cced504bc40b176d4570d99a83fe67599f3a]
7Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
8---
9 Makefile | 1 -
10 1 file changed, 1 deletion(-)
11
12diff --git a/Makefile b/Makefile
13index 96ad48cd04a6..49f076aadd39 100644
14--- a/Makefile
15+++ b/Makefile
16@@ -1,7 +1,6 @@
17 VERSION=1.11.3
18 CFLAGS?=-g
19 MAINFLAGS:=-DVERSION='"$(VERSION)"' -Wall -Wextra -Werror -Wno-unused-parameter
20-LDFLAGS+=-static
21 INCLUDE+=-Iinclude
22 PREFIX?=/usr/local
23 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 @@
1SUMMARY = "scdoc is a simple man page generator for POSIX systems written in C99."
2HOMEPAGE = "https://git.sr.ht/~sircmpwn/scdoc"
3SECTION = "base/doc"
4LICENSE = "MIT"
5LIC_FILES_CHKSUM = "file://COPYING;md5=31752b4a8edd3fb9ddba1cb90fada74d"
6
7DEPENDS = "scdoc-native"
8
9SRC_URI = "git://git.sr.ht/~sircmpwn/scdoc;protocol=https;branch=master \
10 file://0001-Makefile-drop-static.patch "
11SRCREV = "0528bcb993cac6c412acd3ae2e09539e994c0a59"
12
13S = "${WORKDIR}/git"
14
15do_install() {
16 oe_runmake 'DESTDIR=${D}' install
17}
18
19EXTRA_OEMAKE = "PREFIX=${prefix}"
20EXTRA_OEMAKE:append:class-target = " HOST_SCDOC=${STAGING_BINDIR_NATIVE}/scdoc"
21
22BBCLASSEXTEND = "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 @@
1SUMMARY = "scdoc is a simple man page generator for POSIX systems written in C99."
2HOMEPAGE = "https://github.com/ddevault/scdoc"
3BUGTRACKER = "https://github.com/ddevault/scdoc/issues"
4SECTION = "base/doc"
5LICENSE = "MIT"
6LIC_FILES_CHKSUM = "file://COPYING;md5=31752b4a8edd3fb9ddba1cb90fada74d"
7
8SRC_URI = " \
9 git://git.sr.ht/~sircmpwn/scdoc;protocol=https;branch=master \
10 file://0001-Makefile-dont-add-static-to-LDFLAGS.patch \
11"
12
13DEPENDS = "scdoc-native"
14
15S = "${WORKDIR}/git"
16PV = "1.11.2"
17SRCREV = "afeda241f3f9b2c27e461f32d9c2a704ab82ef61"
18
19EXTRA_OEMAKE:class-native = "PREFIX=${prefix}"
20EXTRA_OEMAKE:class-target = "PREFIX=${prefix} HOST_SCDOC=${STAGING_BINDIR_NATIVE}/scdoc"
21
22inherit autotools-brokensep
23
24BBCLASSEXTEND = "native"
25