summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeve Jelbert2012-02-09 21:26:41 +0100
committerTreeve Jelbert2012-02-10 10:39:39 +0100
commit633879926435fae4fb9d895e294f9edde2ebdd77 (patch)
tree186de2ae3cd31cc5de08d61f9157818ae4d27002
parentaf833f0910a19368fbf3c405d5a898613eb44683 (diff)
use a tarball from archlinux, which contains a tarball + patches improve copying of old libraries fix case where previous install attempt failed, but files exist
-rwxr-xr-xlibs/glibc/BUILD17
-rwxr-xr-xlibs/glibc/DETAILS17
-rw-r--r--libs/glibc/HISTORY1
-rwxr-xr-xlibs/glibc/INSTALL2
-rwxr-xr-xlibs/glibc/PRE_BUILD14
-rwxr-xr-xlibs/glibc/PRE_INSTALL15
-rw-r--r--libs/glibc/TESTS24
-rw-r--r--libs/glibc/glibc-2.3-20050725.tar.bz2.sigbin65 -> 0 bytes
8 files changed, 34 insertions, 56 deletions
diff --git a/libs/glibc/BUILD b/libs/glibc/BUILD
index 1ec50f6cbc..b73416cd29 100755
--- a/libs/glibc/BUILD
+++ b/libs/glibc/BUILD
@@ -40,15 +40,16 @@ 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 &&
+persistent_add GLIBC_HEADERS_DIR &&
+GLIBC_HEADERS_DIR=/usr/src/linux &&
cd ${GLIBC_HEADERS_DIR} &&
GL_ARCH=${SMGL_COMPAT_ARCHS[1]} &&
- if [[ ${SMGL_COMPAT_ARCHS[0]} == 64 ]];then
- else
+# if [[ ${SMGL_COMPAT_ARCHS[0]} == 64 ]];then
+# else
if [[ ${SMGL_COMPAT_ARCHS[1]} == ia32 ]]; then
GL_ARCH=i386
- fi
- fi &&
+ fi &&
+# fi &&
make ARCH=$GL_ARCH INSTALL_HDR_PATH=usr headers_install
@@ -61,8 +62,8 @@ export CPPFLAGS="$CPPFLAGS -I$GLIBC_HEADERS_DIR/usr/include" &&
# 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 &&
+#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
@@ -73,7 +74,7 @@ cd $SOURCE_DIRECTORY.bld &&
# Configure glibc to use the sanitised headers
# http://bugs.sourcemage.org/show_bug.cgi?id=7560
#
-$SOURCE_DIRECTORY/configure --host=$HOST \
+$SOURCE_DIRECTORY/glibc/configure --host=$HOST \
--build=$BUILD \
--prefix=/usr \
--infodir=/usr/share/info \
diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index de1d1eb5c7..7a10388d64 100755
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -1,18 +1,15 @@
SPELL=glibc
- VERSION=2.13
- SOURCE=$SPELL-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE2=$SOURCE.sig
- SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
- SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
- SOURCE_GPG=glibc.gpg:$SOURCE.sig:UPSTREAM_KEY
- SOURCE2_IGNORE=signature
+ VERSION=2.15-5
+
+SOURCE_HASH=sha512:143855f871d9b10d3b47350002fda3893a6391a6e3ada8219a8b1f6c8cfc41502bd3a161e5275dc14a0cf760463c8ac738725facf23a337073cd09e245dbd307
+ SOURCE=$SPELL-$VERSION.src.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
+ SOURCE_URL[0]=http://archlinux.mirror.kangaroot.net/sources/packages/$SOURCE
+ SOURCE_URL[1]=http://archlinux.c3sl.ufpr.br/sources/packages/$SOURCE
SECURITY_PATCH=1
PATCHLEVEL=1
WEB_SITE=http://www.gnu.org/software/libc
LICENSE[0]=LGPL
- LICENSE[1]=LGPL
- LICENSE[2]=GPL
STAGED_INSTALL=off
ENTERED=20010922
KEYWORDS="libs"
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index d406187dee..6b8141f59f 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -3,6 +3,7 @@
* remove obsolete fixups
* remove sparc/alpha support
* use linux headers from existing source directory
+ * DETAILS: version 2.15-5 (from archlinux)
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 a5792ce124..cc3ddaf88a 100755
--- a/libs/glibc/INSTALL
+++ b/libs/glibc/INSTALL
@@ -56,5 +56,5 @@ if [[ $INIT_INSTALLED ]]; then
"$INSTALL_ROOT/etc/sysconfig/nscd"
fi &&
-install_config_file $SOURCE_DIRECTORY/nscd/nscd.conf \
+install_config_file $SOURCE_DIRECTORY/glibc/nscd/nscd.conf \
$INSTALL_ROOT/etc/nscd.conf
diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD
index 014a34b908..d42255e5dd 100755
--- a/libs/glibc/PRE_BUILD
+++ b/libs/glibc/PRE_BUILD
@@ -1,9 +1,9 @@
default_pre_build &&
- cd $SOURCE_DIRECTORY &&
- patch $SOURCE_DIRECTORY/timezone/Makefile \
- $SCRIPT_DIRECTORY/localtime.patch &&
-
+ cd $SOURCE_DIRECTORY &&
+# expand source tarball
+ tar xJf glibc-*.tar.xz &&
+
#
# Remove kernel DRM headers
@@ -15,14 +15,16 @@ default_pre_build &&
#
# Now fixup the normal glibc
#
-cd $SOURCE_DIRECTORY &&
+cd $SOURCE_DIRECTORY/glibc &&
+patch timezone/Makefile $SCRIPT_DIRECTORY/localtime.patch &&
+
patch -p0 < $SCRIPT_DIRECTORY/Makefile.patch &&
patch -p1 < $SCRIPT_DIRECTORY/as-test-x.patch &&
patch -p1 < $SPELL_DIRECTORY/gcc45.patch &&
# disabled libgd detection/building memusagestat for now until a better
# fix has been found, bug #8277
-sedit 's/LIBGD=yes/LIBGD=no/' $SOURCE_DIRECTORY/configure &&
+#sedit 's/LIBGD=yes/LIBGD=no/' $SOURCE_DIRECTORY/glibc/configure &&
#
# Create the build directory
diff --git a/libs/glibc/PRE_INSTALL b/libs/glibc/PRE_INSTALL
index 8f07459037..64a669c99c 100755
--- a/libs/glibc/PRE_INSTALL
+++ b/libs/glibc/PRE_INSTALL
@@ -1,12 +1,7 @@
lock_resources "libgrimoire" "install" &&
if [ -z $INSTALL_ROOT ]; then
- mkdir $SOURCE_DIRECTORY.bld/old.libs &&
- local each &&
- for each in /lib{,64,32}/*; do
- if test -f "$each"; then
- cp "$each" $SOURCE_DIRECTORY.bld/old.libs
- fi
- done &&
+ mkdir -p $SOURCE_DIRECTORY.bld/old.libs &&
+ (cp -Pp /lib/* $SOURCE_DIRECTORY.bld/old.libs/ || true ) &&
ldconfig $SOURCE_DIRECTORY.bld/old.libs &&
local LD &&
if [[ ${SMGL_COMPAT_ARCHS[1]} == x86_64 ]] && test -f /lib/ld-linux-x86-64.so.2; then
@@ -23,4 +18,10 @@ fi &&
if spell_ok glibc; then
dispel --notriggers --nosustain glibc
+else
+# fix cases where previous install failed, but files exist
+ OLDGLIB=`ls -l /lib/libc.so.6|cut -d\ -f11 |sed 's/^libc-//;s/.so//'` &&
+ rm -f /lib/*${OLDGLIB}.so &&
+ rm -f /lib/lib{c,crypt,dl,m,nsl,nss*,pthread,resolv,util}.so.? &&
+ rm -rf /usr/share/zoneinfo
fi
diff --git a/libs/glibc/TESTS b/libs/glibc/TESTS
deleted file mode 100644
index 1996df3ffb..0000000000
--- a/libs/glibc/TESTS
+++ /dev/null
@@ -1,24 +0,0 @@
-Works fine on:
-ARCH | Flags | kernel | compiler | tester
---------------------------------------------------------------------------------
-athlon | tiny strip | 2.6+nptl | gcc 4.0.1 | alley_cat
-pentium3 | tiny strip | 2.6+nptl | gcc 3.4.4 | sandalle
-athlon-mp(2) | combreloc prelink speedy strip | 2.6.14+nptl | gcc 4.0.2 | CuZnDragon
-pentium4m | combreloc speedy strip | 2.6+nptl | gcc 4.0.2 | treeve
-athlon | tiny | 2.6.14+nptl | gcc 3.4.4 | p3pilot
-pentium4 | tiny | 2.6.13+nptl | gcc 3.4.4 | p3pilot
-athlon-xp | combreloc prelink speedy strip | 2.6.14+nptl | gcc 3.4.4 | public
-pentium4 | combreloc prelink speedy strip | 2.6.13+nptl | gcc 4.0.2 | astsmtl
-
-2.4 Works fine on (2.3.6 on kernel 2.4 unchanged, so doesn't need testing):
-ARCH | Flags | compiler | tester | note
----------------------------------------------------------------------------------------------------------------
-athlon | tiny strip | gcc 4.1.0 | alley_cat |
-PIV | strip | gcc 4.0.3 | p3pilot |
-athlon-xp | combreloc prelink speedy | gcc 4.1.0 | ruskie | withouth -mfpmath=sse and always -g
-athlon-tbird | combreloc speedy strip | gcc 4.1.0 | treeve |
-pentium4m | combreloc speedy strip | gcc 4.1.0 | treeve |
-athlon-xp | combreloc speedy strip | gcc 4.0.3 | lynx |
-athlon-xp | tiny | gcc 4.1.2 | p3pilot | originally had problem with GLIBC_ARCH not being set in PRE_BUILD. First install was broke due to an old symbolic link in /usr/include for asm-generic
-k8_32 | tiny strip | gcc 4.2.1 | arwed |
-athlon-xp | combreloc speedy strip | gcc 4.2.1 | lynx |
diff --git a/libs/glibc/glibc-2.3-20050725.tar.bz2.sig b/libs/glibc/glibc-2.3-20050725.tar.bz2.sig
deleted file mode 100644
index 93072c5ca6..0000000000
--- a/libs/glibc/glibc-2.3-20050725.tar.bz2.sig
+++ /dev/null
Binary files differ