From: "Sven Püschel" <s.pueschel@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: "Sven Püschel" <s.pueschel@pengutronix.de>
Subject: [ptxdist] [PATCH] slang: version bump 2.3.2 -> 2.3.3
Date: Tue, 20 Oct 2026 12:12:15 +0200 [thread overview]
Message-ID: <20261020101218.2640309-1-s.pueschel@pengutronix.de> (raw)
The ELFDIR_TSTAMP part of the patches has also been added in the
official release and was therefore dropped in the PTXDist patches.
Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
---
...0001-Makefile.in-fix-cross-compiling.patch | 6 +++---
.../0002-fix-parallel-building.patch | 20 ++-----------------
patches/{slang-2.3.2 => slang-2.3.3}/series | 0
rules/slang.make | 4 ++--
4 files changed, 7 insertions(+), 23 deletions(-)
rename patches/{slang-2.3.2 => slang-2.3.3}/0001-Makefile.in-fix-cross-compiling.patch (83%)
rename patches/{slang-2.3.2 => slang-2.3.3}/0002-fix-parallel-building.patch (61%)
rename patches/{slang-2.3.2 => slang-2.3.3}/series (100%)
diff --git a/patches/slang-2.3.2/0001-Makefile.in-fix-cross-compiling.patch b/patches/slang-2.3.3/0001-Makefile.in-fix-cross-compiling.patch
similarity index 83%
rename from patches/slang-2.3.2/0001-Makefile.in-fix-cross-compiling.patch
rename to patches/slang-2.3.3/0001-Makefile.in-fix-cross-compiling.patch
index 5df77cf9c..ab3eec178 100644
--- a/patches/slang-2.3.2/0001-Makefile.in-fix-cross-compiling.patch
+++ b/patches/slang-2.3.3/0001-Makefile.in-fix-cross-compiling.patch
@@ -11,15 +11,15 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/slsh/Makefile.in b/slsh/Makefile.in
-index cba9d81fe6d9..4c1c3708d735 100644
+index addd343a1b91..63a5c9b97d48 100644
--- a/slsh/Makefile.in
+++ b/slsh/Makefile.in
@@ -77,7 +77,7 @@ SLSYSWRAP_LIB = @LIB_SLSYSWRAP@
#----------------------------------------------------------------------------
@SET_MAKE@
SHELL = /bin/sh
--INST_LIBS = $(DEST_LIB_DIR) $(RPATH) $(SLANG_INST_LIB) -lslang $(READLINE_LIB) $(DYNAMIC_LIBS)
-+INST_LIBS = $(DEST_LIB_DIR) $(RPATH) -lslang $(READLINE_LIB) $(DYNAMIC_LIBS)
+-INST_LIBS = $(DEST_LIB_DIR) $(RPATH) $(SLANG_INST_LIB) -lslang $(LDFLAGS) $(READLINE_LIB) $(DYNAMIC_LIBS)
++INST_LIBS = $(DEST_LIB_DIR) $(RPATH) -lslang $(LDFLAGS) $(READLINE_LIB) $(DYNAMIC_LIBS)
DEFS = -DSLSH_CONF_DIR='"$(SLSH_CONF_DIR)"' -DSLSH_PATH='"$(SLSH_LIB_DIR)"' \
-DSLSH_CONF_DIR_ENV='$(SLSH_CONF_DIR_ENV)' -DSLSH_LIB_DIR_ENV='$(SLSH_LIB_DIR_ENV)' \
-DSLSH_PATH_ENV='$(SLSH_PATH_ENV)' $(SLSYSWRAP_DEF)
diff --git a/patches/slang-2.3.2/0002-fix-parallel-building.patch b/patches/slang-2.3.3/0002-fix-parallel-building.patch
similarity index 61%
rename from patches/slang-2.3.2/0002-fix-parallel-building.patch
rename to patches/slang-2.3.3/0002-fix-parallel-building.patch
index 766162110..3ec2208d8 100644
--- a/patches/slang-2.3.2/0002-fix-parallel-building.patch
+++ b/patches/slang-2.3.3/0002-fix-parallel-building.patch
@@ -6,16 +6,13 @@ Just use the original config.h instead of copying it. The directory is
already in the include path anyways. This is easier than adding all missing
dependencies on config.h.
-Make sure that the elfdir is created before using it.
-
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
modules/Makefile.in | 4 +---
- src/Makefile.in | 2 +-
- 2 files changed, 2 insertions(+), 4 deletions(-)
+ 1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/modules/Makefile.in b/modules/Makefile.in
-index f82f0edbb1c9..f3a677076526 100644
+index 34ac674e81ad..939ce5531e90 100644
--- a/modules/Makefile.in
+++ b/modules/Makefile.in
@@ -21,7 +21,7 @@ CC_SHARED_FLAGS = @CC_SHARED_FLAGS@
@@ -36,16 +33,3 @@ index f82f0edbb1c9..f3a677076526 100644
$(SLINT_H): $(CONFIG_DIR)/src/_slint.h
cp $(CONFIG_DIR)/src/_slint.h $(SLINT_H)
$(OBJDIR_TSTAMP):
-diff --git a/src/Makefile.in b/src/Makefile.in
-index 60681422ddfc..2df737816742 100644
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -159,7 +159,7 @@ $(OBJDIR_NORMAL_LIB): $(OBJDIR_TSTAMP) $(CONFIG_H) $(OBJS)
- @echo ""
- @echo $(NORMAL_LIB) created in $(OBJDIR)
-
--$(ELFDIR_ELF_LIB): $(ELFDIR) $(CONFIG_H) $(ELFOBJS) $(VERSION_SCRIPT)
-+$(ELFDIR_ELF_LIB): $(ELFDIR_TSTAMP) $(CONFIG_H) $(ELFOBJS) $(VERSION_SCRIPT)
- -$(RM) $(ELFDIR_ELF_LIB)
- cd $(ELFDIR) && $(ELF_LINK_CMD) -o $(ELFLIB_BUILD_NAME) $(OFILES) $(LDFLAGS) $(ELF_DEP_LIBS)
- if [ $(ELFLIB_MAJOR) != $(ELFLIB_BUILD_NAME) ]; then \
diff --git a/patches/slang-2.3.2/series b/patches/slang-2.3.3/series
similarity index 100%
rename from patches/slang-2.3.2/series
rename to patches/slang-2.3.3/series
diff --git a/rules/slang.make b/rules/slang.make
index 54fd438ad..ef3b8daab 100644
--- a/rules/slang.make
+++ b/rules/slang.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_SLANG) += slang
#
# Paths and names
#
-SLANG_VERSION := 2.3.2
-SLANG_SHA256 := fc9e3b0fc4f67c3c1f6d43c90c16a5c42d117b8e28457c5b46831b8b5d3ae31a
+SLANG_VERSION := 2.3.3
+SLANG_SHA256 := f9145054ae131973c61208ea82486d5dd10e3c5cdad23b7c4a0617743c8f5a18
SLANG := slang-$(SLANG_VERSION)
SLANG_SUFFIX := tar.bz2
SLANG_URL := \
--
2.47.3
reply other threads:[~2026-10-20 10:12 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20261020101218.2640309-1-s.pueschel@pengutronix.de \
--to=s.pueschel@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/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