[Lunar-commits] <moonbase> glibc: use right kernel-headers

[Zbigniew Luszpinski]

commit 7804bf3f39d5e3e019b780d92832efe7a35a927b
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Sat Dec 17 11:04:35 2011 +0100

    glibc: use right kernel-headers
---
 libs/glibc/BUILD        |    8 +++++++-
 libs/glibc/BUILD.x86_64 |    8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/libs/glibc/BUILD b/libs/glibc/BUILD
index 0a5d921..02fabe8 100644
--- a/libs/glibc/BUILD
+++ b/libs/glibc/BUILD
@@ -8,8 +8,14 @@
 
   export CC_OPTS=( Pipe ) &&
 
+  if module_installed kernel-headers; then
+  KVER=`installed_version kernel-headers`
+  else
+  KVER=`installed_version kernel-headers-2.6`
+  fi &&
+
   # There is no other option but nptl
-  OPTS+=" --enable-add-ons=nptl,libidn --with-__thread --with-tls --disable-profile --enable-kernel=`installed_version kernel-headers-2.6`" &&
+  OPTS+=" --enable-add-ons=nptl,libidn --with-__thread --with-tls --disable-profile --enable-kernel=$KVER" &&
 
   if [ -n "$MAKES" ] && [ "$MAKES" -gt 1 ] ; then
     sedit "s/# PARALLELMFLAGS = -j 4/PARALLELMFLAGS = -j $MAKES/" Makefile.in
diff --git a/libs/glibc/BUILD.x86_64 b/libs/glibc/BUILD.x86_64
index 8cb9c2a..d98c1f1 100644
--- a/libs/glibc/BUILD.x86_64
+++ b/libs/glibc/BUILD.x86_64
@@ -8,8 +8,14 @@
 
   export CC_OPTS=( Pipe ) &&
 
+  if module_installed kernel-headers; then
+  KVER=`installed_version kernel-headers`
+  else
+  KVER=`installed_version kernel-headers-2.6`
+  fi &&
+
   # There is no other option but nptl
-  OPTS+=" --enable-add-ons=nptl,libidn --with-__thread --with-tls --disable-profile --enable-kernel=`installed_version kernel-headers-2.6`" &&
+  OPTS+=" --enable-add-ons=nptl,libidn --with-__thread --with-tls --disable-profile --enable-kernel=$KVER" &&
 
   if [ -n "$MAKES" ] && [ "$MAKES" -gt 1 ] ; then
     sedit "s/# PARALLELMFLAGS = -j 4/PARALLELMFLAGS = -j $MAKES/" Makefile.in