Re: [ptxdist] [APPLIED] slang: version bump 2.3.2 -> 2.3.3

[Michael Olbrich <m.olbrich@pengutronix.de>]

Thanks, applied as 04728a5d10817deddb65099658e87f32ed6e0880.

Michael

[sent from post-receive hook]

On Fri, 13 Nov 2026 09:38:43 +0100, Sven Püschel <s.pueschel@pengutronix.de> wrote:
> 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>
> Message-Id: <20261020101218.2640309-1-s.pueschel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> 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 5df77cf9c57e..ab3eec1786d2 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 766162110955..3ec2208d87e6 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 54fd438ad14f..ef3b8daab46a 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	:= \