sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (44381b9cbbdaea69fe69741084e08aaa5d0e5d88)

From: Treeve Jelbert <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (44381b9cbbdaea69fe69741084e08aaa5d0e5d88)
Date: Mon, 18 Feb 2019 19:55:35 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

libs/glibc/BUILD | 16 ----------------
libs/glibc/DETAILS | 21 ---------------------
libs/glibc/HISTORY | 4 ++++
libs/glibc/INSTALL | 6 ------
libs/glibc/PREPARE | 15 ++-------------
libs/glibc/PRE_BUILD | 21 +--------------------
6 files changed, 7 insertions(+), 76 deletions(-)

New commits:
commit 44381b9cbbdaea69fe69741084e08aaa5d0e5d88
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

glibc - remove non NPTL support

diff --git a/libs/glibc/BUILD b/libs/glibc/BUILD
index 6b17033..0d18489 100755
--- a/libs/glibc/BUILD
+++ b/libs/glibc/BUILD
@@ -26,7 +26,6 @@ export CCACHE_RECACHE=true &&
#

local ADDONS
-if [ "$GLIBC_NPTL" = "y" ]; then
#
# Enable IDN?
#
@@ -36,25 +35,12 @@ if [ "$GLIBC_NPTL" = "y" ]; then

OPTS="$OPTS --with-tls \
--enable-kernel=3.2.0"
-else
- ADDONS="linuxthreads" &&
- OPTS="$OPTS --without-__thread \
- --enable-kernel=2.4"
-fi &&

OPTS="$OPTS --enable-add-ons=${ADDONS/ /,}" &&

-if [ "$GLIBC_NPTL" = "y" ]
-then
# minimise optimisation level
CFLAGS=$(echo ${CFLAGS} | sed -r "s;-O([0-9]|fast);;g") &&
CFLAGS="-O2 ${CFLAGS//-Os/}"
-else
- #
- # Fixes Bug #8595
- #
- CFLAGS="-Os $CFLAGS"
-fi &&

export CFLAGS="${CFLAGS/-ffast-math/}" &&
export CC=gcc &&
@@ -68,7 +54,6 @@ unset LD_LIBRARY_PATH &&
# Setup sanitised glibc-kernel-headers for the glibc compile
# ...as well as other arch-dependend specialties
#
-if [[ ${GLIBC_NPTL} == y ]]; then
cd ${GLIBC_HEADERS_DIR} &&
GL_ARCH=${SMGL_COMPAT_ARCHS[1]} &&
if [[ ${SMGL_COMPAT_ARCHS[0]} == 64 ]];then
@@ -81,7 +66,6 @@ if [[ ${GLIBC_NPTL} == y ]]; then
fi
fi &&
make ARCH=$GL_ARCH INSTALL_HDR_PATH=usr headers_install
-fi

if [[ ${SMGL_COMPAT_ARCHS[0]} == 64 && ${SMGL_COMPAT_ARCHS[1]} == sparc ]];
then
#
diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index 0a0688d..772ca98 100755
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -1,26 +1,6 @@
. "$GRIMOIRE/FUNCTIONS"
SPELL=glibc
TMPFS=off
-if [ "$GLIBC_NPTL" = "n" ]; then
- VERSION=2.3.6
- HEADERS_VERSION=2.4.24
- SOURCE=$SPELL-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE2=$SOURCE.sig
- SOURCE3=glibc-linuxthreads-$VERSION.tar.bz2
- SOURCE4=$SOURCE3.sig
- SOURCE5=$HEADERS_VERSION-kernel-headers.tar.bz2
- SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
- SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
- SOURCE3_URL[0]=$GNU_URL/$SPELL/$SOURCE3
- SOURCE4_URL[0]=${SOURCE3_URL[0]}.sig
- SOURCE5_URL[0]=http://download.sourcemage.org/mirror/$SOURCE5
- SOURCE_GPG=gnu.gpg:$SOURCE.sig:UPSTREAM_KEY
- SOURCE2_IGNORE=signature
- SOURCE3_GPG=gnu.gpg:$SOURCE3.sig:UPSTREAM_KEY
- SOURCE4_IGNORE=signature
-
SOURCE5_HASH=sha512:c1931495915c8461de97e4156c9d0edd7b44e4b48cbce2d4c3a52b83d331a9ce48f3c7abb7dd787ed897f1e7d0e81c5cdb4eb3986bc24a5e2788708427e2dcb1
-else
if [[ "${GLIBC_BRANCH}" == "scm" ]]; then
VERSION=$(get_scm_version)
FORCE_DOWNLOAD=on
@@ -104,7 +84,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
fi
fi
fi
-fi
WEB_SITE=http://www.gnu.org/software/libc
LICENSE[0]=LGPL
LICENSE[1]=LGPL
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 69e523f..6d9264c 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,7 @@
+2019-02-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * BUILD DETAILS INSTALL PREPARE PRE_BUILD: remove non NPTL support,
+ it implies kerenl-2.4, which is not supported
+
2019-02-15 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS, PRE_BUILD: removed 2.x kernels support in sanitized
headers code
diff --git a/libs/glibc/INSTALL b/libs/glibc/INSTALL
index bbc47af..2e9fdc0 100755
--- a/libs/glibc/INSTALL
+++ b/libs/glibc/INSTALL
@@ -5,12 +5,6 @@
install -d ${INSTALL_ROOT}/usr/include &&
cd $GLIBC_HEADERS_DIR/usr/include &&

-if [ ! "$GLIBC_NPTL" = "y" ]; then
- echo "installing asm-generic headers" &&
- install -d ${INSTALL_ROOT}/usr/include/asm-generic &&
- cp -fa asm-generic/* ${INSTALL_ROOT}/usr/include/asm-generic
-fi &&
-
echo "installing glibc linux headers" &&
for dir in *
do
diff --git a/libs/glibc/PREPARE b/libs/glibc/PREPARE
index 04a05d5..641a8d0 100755
--- a/libs/glibc/PREPARE
+++ b/libs/glibc/PREPARE
@@ -1,17 +1,6 @@
. ${GRIMOIRE}/FUNCTIONS &&
-if [[ $(uname -r) = 2.6.* ]] \
- || [[ $(uname -r) = 3.* ]] \
- || [[ $(uname -r) = 4.* ]]; then
- if test "$HOST" == "i386-pc-linux-gnu"; then
- message "[[ ${QUERY_COLOR}Not building with NPTL as that's unsupported
on i386; use i486 or higher.${DEFAULT} ]]" &&
- config_set_option GLIBC_NPTL n
- else
- config_query GLIBC_NPTL "As you are running a $(uname -r | cut -f1,2
-d.) kernel, would you like to use the new nptl (Native Posix Thread
Libary)?" y &&
- if [[ "$GLIBC_NPTL" == "y" ]]; then
- prepare_select_branch stable scm
- fi &&
+persistent_delete $GLIBC_NPTL &&
+prepare_select_branch stable scm
config_query GLIBC_USEIDN "Would you like to compile glibc with libidn
support?" y &&
config_query GLIBC_SANITIZE_HEADERS "Do you want to use sanitized linux
kernel headers from the latest stable release" n
- fi
-fi
message "it is recommended to run this spell at runlevel 1"
diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD
index 6e85aec..ca3b799 100755
--- a/libs/glibc/PRE_BUILD
+++ b/libs/glibc/PRE_BUILD
@@ -3,7 +3,6 @@ default_pre_build &&
# seems perl script scripts/test-installation.pl is broken now
sed -i 's:CC="$(CC)" $(PERL) scripts/test-installation.pl
$(common-objpfx)::' $SOURCE_DIRECTORY/Makefile &&

-if [ "$GLIBC_NPTL" = "y" ]; then
cd $SOURCE_DIRECTORY &&
#
# Unpack glibc-kernel-headers
@@ -52,25 +51,7 @@ if [ "$GLIBC_NPTL" = "y" ]; then
return 1
fi
fi &&
- make mrproper
-else
- cd $SOURCE_DIRECTORY &&
- #
- # Now unpack the rest of glibc fixes in the normal location
- #
- unpack_file 3 &&
- #
- # Unpack glibc-kernel-headers
- #
- #
- # Set GLIBC_HEADERS_DIR for use later
- #
- persistent_add GLIBC_HEADERS_DIR &&
- GLIBC_HEADERS_DIR=$SOURCE_DIRECTORY/kernel-headers &&
- mkdir -p $GLIBC_HEADERS_DIR/usr/include &&
- cd $GLIBC_HEADERS_DIR/usr/include &&
- unpack_file 5
-fi &&
+ make mrproper &&

#
# Remove kernel DRM headers

[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (44381b9cbbdaea69fe69741084e08aaa5d0e5d88), Treeve Jelbert, 02/18/2019