glibc - use headers from linux directory

5 files changed, 5 insertions, 84 deletions

diff --git a/libs/glibc/BUILD b/libs/glibc/BUILD
index 7e6882801d..1ec50f6cbc 100755
--- a/libs/glibc/BUILD
+++ b/libs/glibc/BUILD
@@ -40,6 +40,7 @@ unset  LD_LIBRARY_PATH  &&
 # Setup sanitised glibc-kernel-headers for the glibc compile
 # ...as well as other arch-dependend specialties
 #
+GLIBC_HEADERS_DIR=/usr/sr/linux &&
   cd ${GLIBC_HEADERS_DIR} &&
   GL_ARCH=${SMGL_COMPAT_ARCHS[1]}  &&
   if [[ ${SMGL_COMPAT_ARCHS[0]} == 64 ]];then
diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index ad7d0caeaf..de1d1eb5c7 100755
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -9,54 +9,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
   SOURCE2_IGNORE=signature
   SECURITY_PATCH=1
       PATCHLEVEL=1
-  if [[ $GLIBC_SANITIZE_HEADERS == n ]]; then
- HEADERS_VERSION=2.6.38
-         SOURCE3=linux-${HEADERS_VERSION}.tar.bz2
-         SOURCE6=${SOURCE3}.sign
-  SOURCE6_IGNORE=signature
-     SOURCE3_GPG="kernel.gpg:${SOURCE6}:ESTABLISHED_UPSTREAM_KEY"
-  SOURCE3_URL[0]="$KERNEL_URL/pub/linux/kernel/v2.6/$SOURCE3"
-  SOURCE6_URL[0]="${SOURCE3_URL[0]}.sign"
-  else
-    local LINUX_DIRECTORY
- LINUX_DIRECTORY=$(gaze where -path linux | sed "s/linux -> //")
-    . $LINUX_DIRECTORY/latest.defaults
-if  [[  $(uname -r)  =  3.*  ]];  then
- HEADERS_VERSION=$(echo $LATEST_maintenance_patches_3 | sed "s/patch-//")
- HEADERS_VERSION=${HEADERS_VERSION:-$LATEST_3}
-         SOURCE3=linux-${LATEST_3}.tar.bz2
-         SOURCE6="${SOURCE3}.sign"
-  SOURCE6_IGNORE=signature
-     SOURCE3_GPG="kernel.gpg:${SOURCE6}:ESTABLISHED_UPSTREAM_KEY"
-     SOURCE3_URL="${KERNEL_URL}/pub/linux/kernel/v3.0/${SOURCE3}"
-     SOURCE6_URL="${SOURCE3_URL}.sign"
-    if [[ $HEADERS_VERSION != $LATEST_3 ]]; then
-         SOURCE7=patch-${HEADERS_VERSION}.bz2
-         SOURCE8="${SOURCE7}.sign"
-  SOURCE8_IGNORE=signature
-     SOURCE7_GPG="kernel.gpg:${SOURCE8}:ESTABLISHED_UPSTREAM_KEY"
-     SOURCE7_URL="${KERNEL_URL}/pub/linux/kernel/v3.0/${SOURCE7}"
-     SOURCE8_URL="${SOURCE7_URL}.sign"
-    fi
-else
- HEADERS_VERSION=$(echo $LATEST_maintenance_patches | sed "s/patch-//")
- HEADERS_VERSION=${HEADERS_VERSION:-$LATEST_2_6}
-         SOURCE3=linux-${LATEST_2_6}.tar.bz2
-         SOURCE6="${SOURCE3}.sign"
-  SOURCE6_IGNORE=signature
-     SOURCE3_GPG="kernel.gpg:${SOURCE6}:ESTABLISHED_UPSTREAM_KEY"
-     SOURCE3_URL="${KERNEL_URL}/pub/linux/kernel/v2.6/${SOURCE3}"
-     SOURCE6_URL="${SOURCE3_URL}.sign"
-    if [[ $HEADERS_VERSION != $LATEST_2_6 ]]; then
-         SOURCE7=patch-${HEADERS_VERSION}.bz2
-         SOURCE8="${SOURCE7}.sign"
-  SOURCE8_IGNORE=signature
-     SOURCE7_GPG="kernel.gpg:${SOURCE8}:ESTABLISHED_UPSTREAM_KEY"
-     SOURCE7_URL="${KERNEL_URL}/pub/linux/kernel/v2.6/${SOURCE7}"
-     SOURCE8_URL="${SOURCE7_URL}.sign"
-    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 9a238ab644..d406187dee 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -2,6 +2,7 @@
 	* *: remove support for linux-2.4
 	* remove obsolete fixups
 	* remove sparc/alpha support
+	* use linux headers from existing source directory
 	
 2011-09-20 Ismael Luceno <ismael@sourcemage.org>
 	* DEPENDS, DETAILS, PREPARE: Use prepare_select_branch
diff --git a/libs/glibc/PREPARE b/libs/glibc/PREPARE
index 47a10f2945..273f6f546b 100755
--- a/libs/glibc/PREPARE
+++ b/libs/glibc/PREPARE
@@ -1,5 +1,2 @@
 . ${GRIMOIRE}/FUNCTIONS &&
-if  [[  $(uname -r)  =  2.6.*  ]] || [[  $(uname -r)  =  3.*  ]];  then
-    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
+    config_query  GLIBC_USEIDN  "Would you like to compile glibc with libidn support?" y
diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD
index 1a55e30e92..014a34b908 100755
--- a/libs/glibc/PRE_BUILD
+++ b/libs/glibc/PRE_BUILD
@@ -4,43 +4,13 @@ default_pre_build  &&
   patch $SOURCE_DIRECTORY/timezone/Makefile  \
         $SCRIPT_DIRECTORY/localtime.patch    &&
 
-  #
-  # Unpack glibc-kernel-headers
-  #
-  #
-  # Set GLIBC_HEADERS_DIR for use later
-  #
-  persistent_add  GLIBC_HEADERS_DIR                        &&
-  GLIBC_HEADERS_DIR=$SOURCE_DIRECTORY/${SOURCE3/.tar.bz2}  &&
-
-  unpack_file 3                         &&
-  if [[ $GLIBC_SANITIZE_HEADERS == n ]]; then
-    cd  $GLIBC_HEADERS_DIR &&
-    if [ ! -z $SOURCE3 ]; then
-      bzcat ${SOURCE_CACHE}/$SOURCE3 > ${SOURCE3%.bz2}
-    fi  &&
-    make mrproper
-  else
-    cd  $GLIBC_HEADERS_DIR &&
-    if [ ! -z $SOURCE7 ]; then
-      verify_file 7 || return 1 &&
-      bzcat ${SOURCE_CACHE}/$SOURCE7 > ${SOURCE7%.bz2} &&
-      message "${MESSAGE_COLOR}Patching ${!patch}${DEFAULT_COLOR}" &&
-      patch -p1 < ${SOURCE7%.bz2} &&
-      if [[ $? != 0 ]]; then
-        message "${PROBLEM_COLOR}Patch ${!patch} failed${DEFAULT_COLOR}" &&
-        return 1
-      fi
-    fi &&
-    make mrproper
-  fi
 
 #
 # Remove kernel DRM headers
 # Fixes Bug #15547
 #
-sed -i '/^header-y += drm\//d' $GLIBC_HEADERS_DIR/include/Kbuild &&
-rm -rf $GLIBC_HEADERS_DIR/include/drm &&
+#sed -i '/^header-y += drm\//d' $GLIBC_HEADERS_DIR/include/Kbuild &&
+#rm -rf $GLIBC_HEADERS_DIR/include/drm &&
 
 #
 # Now fixup the normal glibc