diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2022-11-02 20:01:17 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2022-11-03 07:00:18 +0100 |
commit | e008ee0ca4db6fa12d7c9df411b375b967e03a74 (patch) | |
tree | 1f2f1721e96a369b3442b543cf6198a859e779c0 /source/l/glibc | |
parent | f866235e9a78fbc4e112f5d1357692540eae60c0 (diff) | |
download | current-e008ee0ca4db6fa12d7c9df411b375b967e03a74.tar.gz current-e008ee0ca4db6fa12d7c9df411b375b967e03a74.tar.xz |
Wed Nov 2 20:01:17 UTC 202220221102200117
a/hwdata-0.364-noarch-1.txz: Upgraded.
ap/inxi-3.3.23_1-noarch-1.txz: Upgraded.
ap/mpg123-1.31.1-x86_64-1.txz: Upgraded.
d/cmake-3.24.3-x86_64-1.txz: Upgraded.
l/SDL2-2.24.2-x86_64-1.txz: Upgraded.
l/liburing-2.3-x86_64-1.txz: Upgraded.
l/speech-dispatcher-0.11.4-x86_64-1.txz: Upgraded.
n/irssi-1.4.3-x86_64-1.txz: Upgraded.
n/stunnel-5.67-x86_64-1.txz: Upgraded.
x/ibus-table-1.16.13-x86_64-1.txz: Upgraded.
x/pixman-0.42.2-x86_64-1.txz: Upgraded.
x/xorg-server-xwayland-22.1.5-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/l/glibc')
-rw-r--r-- | source/l/glibc/glibc-2.35-make-4.4-MAKEFLAGS.patch | 102 | ||||
-rwxr-xr-x | source/l/glibc/glibc.SlackBuild | 2 |
2 files changed, 104 insertions, 0 deletions
diff --git a/source/l/glibc/glibc-2.35-make-4.4-MAKEFLAGS.patch b/source/l/glibc/glibc-2.35-make-4.4-MAKEFLAGS.patch new file mode 100644 index 000000000..51fbe5f54 --- /dev/null +++ b/source/l/glibc/glibc-2.35-make-4.4-MAKEFLAGS.patch @@ -0,0 +1,102 @@ +https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=2d7ed98add14f75041499ac189696c9bd3d757fe +https://bugs.gentoo.org/869263 + +From 2d7ed98add14f75041499ac189696c9bd3d757fe Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich <slyich@gmail.com> +Date: Tue, 13 Sep 2022 13:39:13 -0400 +Subject: [PATCH] Makerules: fix MAKEFLAGS assignment for upcoming make-4.4 + [BZ# 29564] + +make-4.4 will add long flags to MAKEFLAGS variable: + + * WARNING: Backward-incompatibility! + Previously only simple (one-letter) options were added to the MAKEFLAGS + variable that was visible while parsing makefiles. Now, all options + are available in MAKEFLAGS. + +This causes locale builds to fail when long options are used: + + $ make --shuffle + ... + make -C localedata install-locales + make: invalid shuffle mode: '1662724426r' + +The change fixes it by passing eash option via whitespace and dashes. +That way option is appended to both single-word form and whitespace +separated form. + +While at it fixed --silent mode detection in $(MAKEFLAGS) by filtering +out --long-options. Otherwise options like --shuffle flag enable silent +mode unintentionally. $(silent-make) variable consolidates the checks. + +Resolves: BZ# 29564 + +CC: Paul Smith <psmith@gnu.org> +CC: Siddhesh Poyarekar <siddhesh@gotplt.org> +Signed-off-by: Sergei Trofimovich <slyich@gmail.com> +Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org> +--- a/Makeconfig ++++ b/Makeconfig +@@ -43,6 +43,22 @@ else + $(error objdir must be defined by the build-directory Makefile) + endif + ++# Did we request 'make -s' run? "yes" or "no". ++# Starting from make-4.4 MAKEFLAGS now contains long ++# options like '--shuffle'. To detect presence of 's' ++# we pick first word with short options. Long options ++# are guaranteed to come after whitespace. We use '-' ++# prefix to always have a word before long options ++# even if no short options were passed. ++# Typical MAKEFLAGS values to watch for: ++# "rs --shuffle=42" (silent) ++# " --shuffle" (not silent) ++ifeq ($(findstring s, $(firstword -$(MAKEFLAGS))),) ++silent-make := no ++else ++silent-make := yes ++endif ++ + # Root of the sysdeps tree. + sysdep_dir := $(..)sysdeps + export sysdep_dir := $(sysdep_dir) +@@ -917,7 +933,7 @@ endif + # umpteen zillion filenames along with it (we use `...' instead) + # but we don't want this echoing done when the user has said + # he doesn't want to see commands echoed by using -s. +-ifneq "$(findstring s,$(MAKEFLAGS))" "" # if -s ++ifeq ($(silent-make),yes) # if -s + +cmdecho := echo >/dev/null + else # not -s + +cmdecho := echo +--- a/Makerules ++++ b/Makerules +@@ -794,7 +794,7 @@ endif + # Maximize efficiency by minimizing the number of rules. + .SUFFIXES: # Clear the suffix list. We don't use suffix rules. + # Don't define any builtin rules. +-MAKEFLAGS := $(MAKEFLAGS)r ++MAKEFLAGS := $(MAKEFLAGS) -r + + # Generic rule for making directories. + %/: +@@ -811,7 +811,7 @@ MAKEFLAGS := $(MAKEFLAGS)r + .PRECIOUS: $(foreach l,$(libtypes),$(patsubst %,$(common-objpfx)$l,c)) + + # Use the verbose option of ar and tar when not running silently. +-ifeq "$(findstring s,$(MAKEFLAGS))" "" # if not -s ++ifeq ($(silent-make),no) # if not -s + verbose := v + else # -s + verbose := +--- a/elf/rtld-Rules ++++ b/elf/rtld-Rules +@@ -52,7 +52,7 @@ $(objpfx)rtld-libc.a: $(foreach dir,$(rtld-subdirs),\ + mv -f $@T $@ + + # Use the verbose option of ar and tar when not running silently. +-ifeq "$(findstring s,$(MAKEFLAGS))" "" # if not -s ++ifeq ($(silent-make),no) # if not -s + verbose := v + else # -s + verbose := diff --git a/source/l/glibc/glibc.SlackBuild b/source/l/glibc/glibc.SlackBuild index 208bc8d82..9147c68ce 100755 --- a/source/l/glibc/glibc.SlackBuild +++ b/source/l/glibc/glibc.SlackBuild @@ -153,6 +153,8 @@ apply_patches() { zcat $CWD/glibc.ru_RU.CP1251.diff.gz | patch -p1 --verbose || exit 1 # Don't use AM/PM format for date(1). That's just plain crazy. zcat $CWD/glibc-2.32.en_US.no.am.pm.date.format.diff.gz | patch -p1 --verbose || exit 1 + # Fix build with make-4.4: + zcat $CWD/glibc-2.35-make-4.4-MAKEFLAGS.patch.gz | patch -p1 --verbose || exit 1 # Other regression fixes from git: for git_patch in $CWD/patches/*.patch.gz ; do zcat $git_patch | patch -p1 --verbose || exit 1 |