Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (f742729eadaf6620b217264df6520c2c68405f97)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Remko van der Vossen <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (f742729eadaf6620b217264df6520c2c68405f97)
  • Date: Sat, 16 Dec 2023 14:22:18 +0000

GIT changes to master grimoire by Remko van der Vossen <wich AT sourcemage.org>:

gnu/gcc/DEPENDS | 1 +
gnu/gcc/HISTORY | 3 +++
gnu/gcc/PRE_BUILD | 8 +++++++-
3 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit f742729eadaf6620b217264df6520c2c68405f97
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

gcc: optional depends libxcrypt

diff --git a/gnu/gcc/DEPENDS b/gnu/gcc/DEPENDS
index 2ef94a3..05c6b30 100755
--- a/gnu/gcc/DEPENDS
+++ b/gnu/gcc/DEPENDS
@@ -14,6 +14,7 @@ optional_depends GETTEXT \
"--disable-nls" \
"for Native Language Support" &&

+optional_depends libxcrypt '' '' 'use libcrypt' &&

if is_version_less $(installed_version $SPELL) 4.9.0; then
depends gcc49
diff --git a/gnu/gcc/HISTORY b/gnu/gcc/HISTORY
index 61a1f45..40c9672 100644
--- a/gnu/gcc/HISTORY
+++ b/gnu/gcc/HISTORY
@@ -1,3 +1,6 @@
+2023-12-16 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS, PRE_BUILD: optional depends libxcrypt
+
2023-07-27 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 13.2.0

diff --git a/gnu/gcc/PRE_BUILD b/gnu/gcc/PRE_BUILD
index 1f89668..f557f4f 100755
--- a/gnu/gcc/PRE_BUILD
+++ b/gnu/gcc/PRE_BUILD
@@ -40,4 +40,10 @@ find . -name Makefile.in \
mk_source_dir $SOURCE_DIRECTORY.bld &&

sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in &&
-sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
+sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in &&
+
+# Fix build without libxcrypt
+if ! is_depends_enabled $SPELL libxcrypt; then
+ sed -i -e 's/^#define SANITIZER_INTERCEPT_CRYPT_R .*/#define
SANITIZER_INTERCEPT_CRYPT_R 0/' \
+ libsanitizer/sanitizer_common/sanitizer_platform_interceptors.h
+fi



  • [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (f742729eadaf6620b217264df6520c2c68405f97), Remko van der Vossen, 12/16/2023

Archive powered by MHonArc 2.6.24.

Top of Page