Re: [ptxdist] [PATCH] gawk: version bump 3.1.6 -> 5.0.1

[Christian Hermann <christian.hermann@hytera.de>]

For GPL* licensed code it's usually necessary to peek into source 
headers, which variant (*-only, *-or-later) actually applies, as the 
top-level COPYING files are generic.
So I'd add something like
	file://main.c;startline=5;endline=24;md5=f471bca08ffe28738729b5bfd1d6ae86
as well.

On 07.02.20 12:43, Ladislav Michl wrote:
> Since pgawk was merged into gawk meanwhile, remove that option.
> 
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> ---
>   rules/gawk.in   |  6 +++---
>   rules/gawk.make | 48 +++++++++++++++++++++++++++---------------------
>   2 files changed, 30 insertions(+), 24 deletions(-)
> 
> diff --git a/rules/gawk.in b/rules/gawk.in
> index e9efaa10d..bc290b296 100644
> --- a/rules/gawk.in
> +++ b/rules/gawk.in
> @@ -13,12 +13,12 @@ menuconfig GAWK
>   
>   if GAWK
>   
> -config GAWK_PGAWK
> -	bool "Install pgawk"
> -
>   config GAWK_AWKLIB
>   	bool "Install awklib"
>   
> +config GAWK_EXTENSIONS
> +	bool "Install extensions"
> +
>   endif
>   
>   comment "BusyBox' awk is selected!"
> diff --git a/rules/gawk.make b/rules/gawk.make
> index 7561d86c2..b17dcec70 100644
> --- a/rules/gawk.make
> +++ b/rules/gawk.make
> @@ -14,25 +14,32 @@ PACKAGES-$(PTXCONF_GAWK) += gawk
>   #
>   # Paths and names
>   #
> -GAWK_VERSION	:= 3.1.6
> -GAWK_MD5	:= b237751aef53c9ead9644e376bc53386
> +GAWK_VERSION	:= 5.0.1
> +GAWK_MD5	:= f9db3f6715207c6f13719713abc9c707
>   GAWK		:= gawk-$(GAWK_VERSION)
> -GAWK_SUFFIX	:= tar.gz
> +GAWK_SUFFIX	:= tar.xz
>   GAWK_URL	:= $(call ptx/mirror, GNU, gawk/$(GAWK).$(GAWK_SUFFIX))
>   GAWK_SOURCE	:= $(SRCDIR)/$(GAWK).$(GAWK_SUFFIX)
>   GAWK_DIR	:= $(BUILDDIR)/$(GAWK)
> +GAWK_LICENSE	:= GPL-3.0-or-later
> +GAWK_LICENSE_FILES := file://COPYING;md5=d32239bcb673463ab874e80d47fae504
>   
>   # ----------------------------------------------------------------------------
>   # Prepare
>   # ----------------------------------------------------------------------------
>   
> -GAWK_PATH	:= PATH=$(CROSS_PATH)
> -GAWK_ENV 	:= $(CROSS_ENV)
> -
> -#
> -# autoconf
> -#
> -GAWK_AUTOCONF := $(CROSS_AUTOCONF_USR)
> +GAWK_CONF_TOOL	:= autoconf
> +GAWK_CONF_OPT	:= \
> +	$(CROSS_AUTOCONF_USR) \
> +	--disable-silent-rules \
> +	--enable-lint \
> +	--enable-builtin-intdiv0 \
> +	--disable-mpfr \
> +	--disable-versioned-extension-dir \
> +	$(GLOBAL_LARGE_FILE_OPTION) \
> +	--disable-nls \
> +	--disable-rpath \
> +	--$(call ptx/endis, PTXCONF_GAWK_EXTENSIONS)-extensions
>   
>   # ----------------------------------------------------------------------------
>   # Target-Install
> @@ -42,22 +49,21 @@ $(STATEDIR)/gawk.targetinstall:
>   	@$(call targetinfo)
>   
>   	@$(call install_init, gawk)
> -	@$(call install_fixup, gawk,PRIORITY,optional)
> -	@$(call install_fixup, gawk,SECTION,base)
> -	@$(call install_fixup, gawk,AUTHOR,"Carsten Schlote <schlote@konzeptpark.de>")
> -	@$(call install_fixup, gawk,DESCRIPTION,missing)
> +	@$(call install_fixup, gawk, PRIORITY, optional)
> +	@$(call install_fixup, gawk, SECTION, base)
> +	@$(call install_fixup, gawk, AUTHOR, \
> +		"Carsten Schlote <schlote@konzeptpark.de>")
> +	@$(call install_fixup, gawk,DESCRIPTION, \
> +		"gawk - pattern scanning and processing language")
>   
>   	@$(call install_copy, gawk, 0, 0, 0755, -, /usr/bin/gawk)
>   	@$(call install_link, gawk, gawk, /usr/bin/awk)
>   
> -ifdef PTXCONF_GAWK_PGAWK
> -	@$(call install_copy, gawk, 0, 0, 0755, -, /usr/bin/pgawk)
> -endif
> -
>   ifdef PTXCONF_GAWK_AWKLIB
> -	@$(call install_copy, gawk, 0, 0, 0755, -, /usr/bin/igawk)
> -	@$(call install_copy, gawk, 0, 0, 0755, -, /usr/libexec/awk/pwcat)
> -	@$(call install_copy, gawk, 0, 0, 0755, -, /usr/libexec/awk/grcat)
> +	@$(call install_tree, gawk, 0, 0, -, /usr/libexec/awk)
> +endif
> +ifdef PTXCONF_GAWK_EXTENSIONS
> +	@$(call install_tree, gawk, 0, 0, -, /usr/lib/gawk)
>   endif
>   
>   	@$(call install_finish, gawk)
> 

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de