glibc - remove support for linux-2.4

7 files changed, 4 insertions, 85 deletions

diff --git a/libs/glibc/BUILD b/libs/glibc/BUILD
index f9c2ec69af..9adf5455ac 100755
--- a/libs/glibc/BUILD
+++ b/libs/glibc/BUILD
@@ -23,7 +23,6 @@ export  CCACHE_RECACHE=true  &&
 #
 
 local ADDONS
-if  [  "$GLIBC_NPTL"  =  "y"  ];  then
   ADDONS="nptl"                &&
   #
   # Enable IDN?
@@ -34,25 +33,12 @@ if  [  "$GLIBC_NPTL"  =  "y"  ];  then
 
   OPTS="$OPTS  --with-tls             \
                --enable-kernel=2.6"
-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="${CFLAGS//-O?/}"  &&
   CFLAGS="-O2 ${CFLAGS//-Os/}"
-else
-  #
-  # Fixes Bug #8595
-  #
-  CFLAGS="-Os $CFLAGS"
-fi &&
 
 export  CFLAGS="${CFLAGS/-ffast-math/}"  &&
 export  CC=gcc                           &&
@@ -66,7 +52,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
@@ -79,7 +64,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/DEPENDS b/libs/glibc/DEPENDS
index 299866affe..6b0eefd4f9 100755
--- a/libs/glibc/DEPENDS
+++ b/libs/glibc/DEPENDS
@@ -7,9 +7,6 @@ depends  smgl-fhs       &&
 depends  smgl-archspecs &&
 optional_depends libselinux '--with-selinux' '--without-selinux' 'for selinux support' &&
 
-if  [  "${GLIBC_BRANCH/-*}" = "scm"  ]; then
-	depends git
-fi                                     &&
 
 if  [  "$GLIBC_USEIDN" = "y"  ]; then
 	depends libidn
diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index 44cbac3f7b..ad7d0caeaf 100755
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -1,37 +1,4 @@
            SPELL=glibc
-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
-      PATCHLEVEL=1
-else
-  if [[ "${GLIBC_BRANCH/-*}" == "scm" ]]; then
-    if [[ "${GLIBC_AUTOUPDATE}" == "y" ]]; then
-         VERSION=${GLIBC_BRANCH}-$(date +%Y%m%d)
-    else 
-         VERSION=${GLIBC_BRANCH}
-    fi
-  FORCE_DOWNLOAD=on
-          SOURCE=$SPELL-git.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
-      SOURCE_URL="git://sourceware.org/git/glibc.git:$SPELL-git:release/${GLIBC_BRANCH#scm-}/master"
-   SOURCE_IGNORE=volatile
-  else
          VERSION=2.13
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
@@ -42,7 +9,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
   SOURCE2_IGNORE=signature
   SECURITY_PATCH=1
       PATCHLEVEL=1
-  fi
   if [[ $GLIBC_SANITIZE_HEADERS == n ]]; then
  HEADERS_VERSION=2.6.38
          SOURCE3=linux-${HEADERS_VERSION}.tar.bz2
@@ -91,7 +57,6 @@ else
     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 7cc36586b6..70ae3345f5 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,6 @@
+2012-02-09 Treeve Jelbert <treeve@sourcemage.org>
+	* *: remove support for linux-2.4
+	
 2011-09-20 Ismael Luceno <ismael@sourcemage.org>
 	* DEPENDS, DETAILS, PREPARE: Use prepare_select_branch
 
diff --git a/libs/glibc/INSTALL b/libs/glibc/INSTALL
index b880dde001..a5792ce124 100755
--- a/libs/glibc/INSTALL
+++ b/libs/glibc/INSTALL
@@ -5,11 +5,9 @@
 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  &&
+  cp  -fa  asm-generic/*  ${INSTALL_ROOT}/usr/include/asm-generic &&
 
 echo  "installing glibc linux headers"               &&
 for dir in *
diff --git a/libs/glibc/PREPARE b/libs/glibc/PREPARE
index 5387658072..47a10f2945 100755
--- a/libs/glibc/PREPARE
+++ b/libs/glibc/PREPARE
@@ -1,14 +1,5 @@
 . ${GRIMOIRE}/FUNCTIONS &&
 if  [[  $(uname -r)  =  2.6.*  ]] || [[  $(uname -r)  =  3.*  ]];  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-2.13
-    fi &&
     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
diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD
index 3ff8bad2e9..1a55e30e92 100755
--- a/libs/glibc/PRE_BUILD
+++ b/libs/glibc/PRE_BUILD
@@ -1,6 +1,5 @@
 default_pre_build  &&
 
-if  [  "$GLIBC_NPTL"  =  "y"  ];  then
   cd      $SOURCE_DIRECTORY                  &&
   patch $SOURCE_DIRECTORY/timezone/Makefile  \
         $SCRIPT_DIRECTORY/localtime.patch    &&
@@ -35,24 +34,6 @@ if  [  "$GLIBC_NPTL"  =  "y"  ];  then
     fi &&
     make mrproper
   fi
-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  &&
 
 #
 # Remove kernel DRM headers