threads / patch / 54619

patch, 2 partsconfig.mak.uname: remove unused flags

Subject: [PATCH 0/2] config.mak.uname: remove unused flags

## tl;dr

4 messages between Nov 11, 2020 and Nov 11, 2020. Diffs are folded; open one to read it.

replies: 3people: 2as markdown or json

Ævar Arnfjörð Bjarmason· Nov 11, 2020, 09:54 UTC · lore

A trivial cleanup series to remove flags we're not using anymore.

I don't think there's any more unsed flags, I looked with:

    for flag in $(grep -o -P '[A-Z0-9_]+(?= = )' config.mak.uname|sort|uniq); do echo $(grep -c $flag Makefile) $flag; done|sort -n

Ævar Arnfjörð Bjarmason (2):
  config.mak.uname: remove unused the NO_R_TO_GCC_LINKER flag
  config.mak.uname: remove unused NEEDS_SSL_WITH_CURL flag

 config.mak.uname | 8 --------
 1 file changed, 8 deletions(-)

-- 
2.29.2.222.g5d2a92d10f8

Ævar Arnfjörð Bjarmason· Nov 11, 2020, 09:54 UTC · re: Ævar Arnfjörð Bjarmason · lore

[PATCH 1/2] config.mak.uname: remove unused the NO_R_TO_GCC_LINKER flag

The NO_R_TO_GCC_LINKER flag was still being on some platforms. It hasn't been used since my 0f50c8e32c8 ("Makefile: remove the NO_R_TO_GCC_LINKER flag", 2019-05-17).

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 config.mak.uname | 3 ---
 1 file changed, 3 deletions(-)

Show changes to config.mak.uname +0 −3

diff --git a/config.mak.uname b/config.mak.uname
index c7eba69e54e..8d7b96f8b9b 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -636,7 +636,6 @@ ifneq (,$(wildcard ../THIS_IS_MSYSGIT))
 	prefix =
 	INSTALL = /bin/install
 	EXTLIBS += /mingw/lib/libz.a
-	NO_R_TO_GCC_LINKER = YesPlease
 	INTERNAL_QSORT = YesPlease
 	HAVE_LIBCHARSET_H = YesPlease
 	NO_GETTEXT = YesPlease
@@ -669,7 +668,6 @@ else
 			-fstack-protector-strong
 		EXTLIBS += -lntdll
 		INSTALL = /bin/install
-		NO_R_TO_GCC_LINKER = YesPlease
 		INTERNAL_QSORT = YesPlease
 		HAVE_LIBCHARSET_H = YesPlease
 		NO_GETTEXT =
@@ -695,7 +693,6 @@ ifeq ($(uname_S),QNX)
 	NO_MKDTEMP = YesPlease
 	NO_NSEC = YesPlease
 	NO_PTHREADS = YesPlease
-	NO_R_TO_GCC_LINKER = YesPlease
 	NO_STRCASESTR = YesPlease
 	NO_STRLCPY = YesPlease
 endif

-- 
2.29.2.222.g5d2a92d10f8

Ævar Arnfjörð Bjarmason· Nov 11, 2020, 09:54 UTC · re: Ævar Arnfjörð Bjarmason · lore

[PATCH 2/2] config.mak.uname: remove unused NEEDS_SSL_WITH_CURL flag

The NEEDS_SSL_WITH_CURL flag was still being set in one case, but hasn't existed since 23c4bbe28e6 ("build: link with curl-defined linker flags", 2018-11-03). Remove it, and a comment which referred to it. See 6c109904bc8 ("Port to HP NonStop", 2012-09-19) for the initial addition of the comment.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 config.mak.uname | 5 -----
 1 file changed, 5 deletions(-)

Show changes to config.mak.uname +0 −5

diff --git a/config.mak.uname b/config.mak.uname
index 8d7b96f8b9b..5b30a9154ac 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -541,11 +541,6 @@ ifeq ($(uname_S),NONSTOP_KERNEL)
 	# removing the directory at OS releases J06.21 and L17.02.
 	# Default to the older rm until those two releases are deprecated.
 	RM = /bin/rm -f
-	# As detected by './configure'.
-	# Missdetected, hence commented out, see below.
-	#NO_CURL = YesPlease
-	# Added manually, see above.
-	NEEDS_SSL_WITH_CURL = YesPlease
 	NEEDS_CRYPTO_WITH_SSL = YesPlease
 	HAVE_DEV_TTY = YesPlease
 	HAVE_LIBCHARSET_H = YesPlease

-- 
2.29.2.222.g5d2a92d10f8

Randall S. Becker· Nov 11, 2020, 16:09 UTC · re: Ævar Arnfjörð Bjarmason · lore

RE: [PATCH 2/2] config.mak.uname: remove unused NEEDS_SSL_WITH_CURL flag

On November 11, 2020 4:54 AM, Ævar Arnfjörð Bjarmason wrote:

Show 28 quoted lines

> The NEEDS_SSL_WITH_CURL flag was still being set in one case, but hasn't
> existed since 23c4bbe28e6 ("build: link with curl-defined linker flags", 2018-
> 11-03). Remove it, and a comment which referred to it. See 6c109904bc8
> ("Port to HP NonStop", 2012-09-19) for the initial addition of the comment.
> 
> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
> ---
>  config.mak.uname | 5 -----
>  1 file changed, 5 deletions(-)
> 
> diff --git a/config.mak.uname b/config.mak.uname index
> 8d7b96f8b9b..5b30a9154ac 100644
> --- a/config.mak.uname
> +++ b/config.mak.uname
> @@ -541,11 +541,6 @@ ifeq ($(uname_S),NONSTOP_KERNEL)
>  	# removing the directory at OS releases J06.21 and L17.02.
>  	# Default to the older rm until those two releases are deprecated.
>  	RM = /bin/rm -f
> -	# As detected by './configure'.
> -	# Missdetected, hence commented out, see below.
> -	#NO_CURL = YesPlease
> -	# Added manually, see above.
> -	NEEDS_SSL_WITH_CURL = YesPlease
>  	NEEDS_CRYPTO_WITH_SSL = YesPlease
>  	HAVE_DEV_TTY = YesPlease
>  	HAVE_LIBCHARSET_H = YesPlease
> --
> 2.29.2.222.g5d2a92d10f8

This should be fine. We will test when rolled in, but I can't see an issue here. Sadly, I can't remove the junk above those deletions yet.

Thanks, Randall

-- Brief whoami:
 NonStop developer since approximately 211288444200000000
 UNIX developer since approximately 421664400
-- In my real life, I talk too much.