New commits:
commit b0dc296180e0e960286cb402331ac575bd1e2cd0
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>
glibc fixes syntax errors as a result of removing GLIBC_ARCH
commit d22384b8264745f8c04eed7203761340aad31bc3
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>
glibc removed GLIBC_ARCH altogether its only getting set and not used
anywhere
commit 82917477eeb66e6a9d2ea2b9f66af27dd7bc2e26
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>
merged arwed's fixes for GLIBC_ARCH variable
commit f50f4c78c5e91d14a622738ab5a1e64a7395b769
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>
merged in tests from lynx commit (I think)
commit 3a36f4e8bbeb99c555551cbbeb6f860c2bebca77
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>
merged the big update of 2.6.1 into test
commit 2688c2d74a815ebbd2f5d0a004285b42e6b2e4c9
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>
Revert "glibc: Fix Bug #14004 (fails to find acceptable grep)"
This reverts commit 9adf2ef0ec74d3cca578bdd9d12a9f29556fe22b.
diff --git a/libs/glibc/BUILD b/libs/glibc/BUILD
index 7ffc310..6a02339 100755
--- a/libs/glibc/BUILD
+++ b/libs/glibc/BUILD
@@ -62,23 +62,13 @@ unset LD_LIBRARY_PATH &&
# Setup sanitised glibc-kernel-headers for the glibc compile
# ...as well as other arch-dependend specialties
#
-persistent_add GLIBC_ARCH &&
-if [[ ${SMGL_COMPAT_ARCHS[1]} == x86_64 ]]; then
- GLIBC_ARCH=x86_64
-elif [[ ${SMGL_COMPAT_ARCHS[1]} == ppc ]]; then
- GLIBC_ARCH=ppc
-elif [[ ${SMGL_COMPAT_ARCHS[1]} == ia32 ]]; then
- GLIBC_ARCH=i386
-elif [[ ${SMGL_COMPAT_ARCHS[0]} == 64 && ${SMGL_COMPAT_ARCHS[1]} == sparc
]]; then
+if [[ ${SMGL_COMPAT_ARCHS[0]} == 64 && ${SMGL_COMPAT_ARCHS[1]} == sparc ]];
then
#
# If we're not compiling for 64-bit SPARC then we need to use the sparc
# headers, not sparc64
#
if echo "$CFLAGS" | grep -q -- "-m64"; then
- GLIBC_ARCH=sparc64 &&
export CC=gcc64
- else
- GLIBC_ARCH=sparc
fi &&
#
@@ -98,7 +88,6 @@ elif [[ ${SMGL_COMPAT_ARCHS[0]} == 64 &&
${SMGL_COMPAT_ARCHS[1]} == sparc ]]; th
[ "$BUILD" = "sparc-unknown-linux-gnu" ] &&
export BUILD="sparcv9-unknown-linux-gnu"
elif [[ ${SMGL_COMPAT_ARCHS[0]} == 32 && ${SMGL_COMPAT_ARCHS[1]} == sparc
]]; then
- GLIBC_ARCH=sparc &&
#
# Fixes from Gentoo's 2.3.3.20040420-r2 ebuild
#
@@ -111,24 +100,21 @@ elif [[ ${SMGL_COMPAT_ARCHS[1]} == alpha ]]; then
# either an elf/ld.so that segfaults (build failing at sunrpc) or
# internal compiler error(s) in intl/
# glibc knows itself what flags to choose
- export CFLAGS="" &&
- GLIBC_ARCH=alpha
-else
- message "Glibc spell doesn't know your architecture!" &&
- false
+ export CFLAGS=""
fi &&
-# set the asm headers to point to the correct architecture
-cd $GLIBC_HEADERS_DIR/include &&
-ln -sf asm-$GLIBC_ARCH asm &&
-
# CPPFLAGS setting is needed so the check for cpp works on boxes that don't
# have any kernel headers in /usr/include yet
-export CPPFLAGS="$CPPFLAGS -I$GLIBC_HEADERS_DIR/include" &&
+export CPPFLAGS="$CPPFLAGS -I$GLIBC_HEADERS_DIR/usr/include" &&
#
# End sanitised glibc-kernel-headers setup
#
+# this is weird but nscd needs this header from libcap but not the rest of
+# the standard includes so doing this will make nscd pick it up
+mkdir -p $SOURCE_DIRECTORY/nscd/sys &&
+ln -s /usr/include/sys/capability.h $SOURCE_DIRECTORY/nscd/sys/capability.h
&&
+
#
# Change to where we're going to actually build
#
@@ -147,6 +133,6 @@ $SOURCE_DIRECTORY/configure --host=$HOST
\
--with-elf \
--enable-shared \
--disable-profile \
- --with-headers=$GLIBC_HEADERS_DIR/include \
+ --with-headers=$GLIBC_HEADERS_DIR/usr/include \
$OPTS &&
make
diff --git a/libs/glibc/DEPENDS b/libs/glibc/DEPENDS
index b6e2214..7d79478 100755
--- a/libs/glibc/DEPENDS
+++ b/libs/glibc/DEPENDS
@@ -4,6 +4,7 @@ depends gnupg &&
depends perl &&
depends smgl-fhs &&
depends smgl-archspecs &&
+optional_depends libselinux '--with-selinux' '--without-selinux' 'for
selinux support' &&
+ fi
+ ;;
+ *)
+ SOURCE3=UNKNOWN
+ message "${PROBLEM_COLOR}You have an unknown architecture, you
should file a bug for this${DEFAULT_COLOR}"
+ return 222
+ ;;
+esac
SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
-
SOURCE3_URL[0]=http://ep09.pld-linux.org/~mmazur/linux-libc-headers/$SOURCE3
+ SOURCE3_URL[0]=http://dmlb2000.homelinux.org/pub/kernel-headers/$SOURCE3
if [ "$GLIBC_USEIDN" = "y" ]; then
SOURCE4=$SPELL-libidn-$VERSION.tar.bz2
SOURCE5=$SOURCE4.sig
@@ -18,8 +50,6 @@ if [ "$GLIBC_NPTL" = "y" ]; then
fi
SOURCE_GPG=gnu.gpg:$SOURCE.sig:UPSTREAM_KEY
SOURCE2_IGNORE=signature
-
SOURCE3_HASH=sha512:e7ee7a09880d19dea3d2c0d498631ee9d269738e7acdeba0a346da3b8bd0629628582973de33e6ac0c913e8c691806a50e07d520d6f6d078b76a3e74b9b61fd7
- PATCHLEVEL=1
else
VERSION=2.3.6
HEADERS_VERSION=2.4.24
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 905b619..ab54b58 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,8 +1,28 @@
-2007-09-20 Eric Sandall <sandalle AT sourcemage.org>
- * PRE_BUILD: Apply as-test-x.patch: Fixes Bug #14004
- * as-test-x.patch: Added from David Brown's devel update of glibc to
2.6.1
- in commit 199874422bbb17772cb0257187151007ab398463
- Fixes Bug #14004
+2007-09-16 David Brown <dmlb2000 AT gmail.com>
+ * DETAILS: removed GLIBC_ARCH altogether
+ * BUILD: removed GLIBC_ARCH gone... and some syntax errors as a result
+
+2007-09-16 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * PREPARE: removed the persistent_add GLIBC_ARCH, there seems to be
+ problem with persistent vars set in DETAILS
+ * PRE_BUILD: derive GLIBC_HEADERS_DIR from SOURCE3 instead of using
+ GLIBC_ARCH, set GLIBC_HEADERS_DIR to something sane for non-nptl
+ builds
+
+2007-09-16 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * TESTS: added my info
+ * DETAILS: don't return negative values
+
+2007-09-15 David Brown <dmlb2000 AT gmail.com>
+ * BUILD: changed out old headers for new headers and removed
GLIBC_ARCH
+ * DEPENDS: optionally on selinux some of the apps glibc builds use it
+ * DETAILS: updated to 2.6.1 and moved checks for GLIBC_ARCH to here
+ * INSTALL: install all the headers not just asm and linux
+ * PREPARE: add GLIBC_ARCH as persistant here so it gets tracked before
+ details sets it
+ * PRE_BUILD: added a patch for autoconf not setting as_test_x for
egrep
+ * as-test-x.patch: added to add as_text_x to the appropriate configure
+ * config.h.patch: changed file to patch so p stays the same
2007-08-06 Treeve Jelbert <treeve AT sourcemage.org>
* BUILD: fix typo (bug #13925)
diff --git a/libs/glibc/INSTALL b/libs/glibc/INSTALL
index 35d8acc..ce2d948 100755
--- a/libs/glibc/INSTALL
+++ b/libs/glibc/INSTALL
@@ -3,7 +3,7 @@
# glibc decides to compile stuff during 'make install', which it does in 2.4
#
install -d ${INSTALL_ROOT}/usr/include &&
-cd $GLIBC_HEADERS_DIR/include &&
+cd $GLIBC_HEADERS_DIR/usr/include &&
if [ ! "$GLIBC_NPTL" = "y" ]; then
echo "installing asm-generic headers" &&
@@ -12,15 +12,11 @@ if [ ! "$GLIBC_NPTL" = "y" ]; then
fi &&
echo "installing glibc linux headers" &&
-install -d ${INSTALL_ROOT}/usr/include/linux &&
-cp -fa linux/* ${INSTALL_ROOT}/usr/include/linux &&
-
-echo "installing asm-$GLIBC_ARCH headers to /usr/include/asm" &&
-#
-# asm is a symlink to asm-$GLIBC-ARCH
-#
-install -d ${INSTALL_ROOT}/usr/include/asm &&
-cp -fa asm/* ${INSTALL_ROOT}/usr/include/asm &&
+for dir in *
+do
+ install -d ${INSTALL_ROOT}/usr/include/$dir &&
+ cp -fa $dir/* ${INSTALL_ROOT}/usr/include/$dir
+done