diff options
author | David Brown | 2007-09-23 22:59:57 -0700 |
---|---|---|
committer | David Brown | 2007-09-23 22:59:57 -0700 |
commit | c2318740e67cafb35ec324cd90b0bd635ed98dc2 (patch) | |
tree | bd14c2776507766db0e565d826f042f8d6ad4920 | |
parent | c18f53bf3e6c068159006517b34442c8b209fe8f (diff) |
Revert "glibc removed GLIBC_ARCH altogether its only getting set and not used anywhere"
This reverts commit c05a8c99e3dd9b556ccd54d10420a88673d86331.
-rwxr-xr-x | libs/glibc/BUILD | 5 | ||||
-rwxr-xr-x | libs/glibc/DETAILS | 7 | ||||
-rw-r--r-- | libs/glibc/HISTORY | 4 |
3 files changed, 12 insertions, 4 deletions
diff --git a/libs/glibc/BUILD b/libs/glibc/BUILD index 2893a46214..3a07e588f1 100755 --- a/libs/glibc/BUILD +++ b/libs/glibc/BUILD @@ -68,7 +68,10 @@ if [[ ${SMGL_COMPAT_ARCHS[0]} == 64 && ${SMGL_COMPAT_ARCHS[1]} == sparc ]]; then # headers, not sparc64 # if echo "$CFLAGS" | grep -q -- "-m64"; then + GLIBC_ARCH=sparc64 && export CC=gcc64 + else + GLIBC_ARCH=sparc fi && # @@ -88,6 +91,7 @@ if [[ ${SMGL_COMPAT_ARCHS[0]} == 64 && ${SMGL_COMPAT_ARCHS[1]} == sparc ]]; then [ "$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 # @@ -101,6 +105,7 @@ elif [[ ${SMGL_COMPAT_ARCHS[1]} == alpha ]]; then # internal compiler error(s) in intl/ # glibc knows itself what flags to choose export CFLAGS="" && + GLIBC_ARCH=alpha fi && # CPPFLAGS setting is needed so the check for cpp works on boxes that don't diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS index 17dced0bba..5fd1ff40ba 100755 --- a/libs/glibc/DETAILS +++ b/libs/glibc/DETAILS @@ -6,32 +6,39 @@ if [ "$GLIBC_NPTL" = "y" ]; then SOURCE2=$SOURCE.sig case "${SMGL_COMPAT_ARCHS[1]}" in ia32) + GLIBC_ARCH=i386 SOURCE3=linux-headers-${HEADERS_VERSION}-i386.tar.bz2 SOURCE3_HASH=sha512:e328abe55c7d3c239ec3dbede78ce405a662d3159382a2cb3db8dbf5b7783d230a237d44c23280171893c9213b55c4f9bf8963f193fc50158803078e3875ecef ;; x86_64) + GLIBC_ARCH=x86_64 SOURCE3=linux-headers-${HEADERS_VERSION}-x86_64.tar.bz2 SOURCE3_HASH=sha512:1d032b35eee2593896cdffd779ed3f695f5abb552c83f96fcabec46d5977b649db0741690be5dd40d712779b0f3816c6e04e7840991dad4e0a6881adee097852 ;; ppc) + GLIBC_ARCH=ppc SOURCE3=linux-headers-${HEADERS_VERSION}-powerpc.tar.bz2 SOURCE3_HASH=sha512:06c5ff0fdbe39367df6538000358058fb6a804bc3711ad621fd825fa2887b2cb13b6992c32fe64da3381402b681b9ac526ac2b7eb2320966fcb9a6f6b1830737 ;; alpha) + GLIBC_ARCH=alpha SOURCE3=linux-headers-${HEADERS_VERSION}-alpha.tar.bz2 SOURCE3_HASH=sha512:a462e6ee9c446a71181e189d36b430fbdbf7070f2499d06e234b50f91ec3f0172a3428ecd37e7dad85bb153bfc985cea39e33785b7cffa9ac371a579412e6361 ;; sparc) if [[ ${SMGL_COMPAT_ARCHS[0]} == 64 ]] then + GLIBC_ARCH=sparc SOURCE3=linux-headers-${HEADERS_VERSION}-sparc64.tar.bz2 SOURCE3_HASH=sha512:45665ceb4c8622615c3e9bbcbe57e8f9bd96d1cfd7d50aa7269ca8be9f6400c35feddc4b93251e56a7e0d5fbb48cf1b1e0f81bd9ca2853dc154cd38c1bd5ebe8 else + GLIBC_ARCH=sparc64 SOURCE3=linux-headers-${HEADERS_VERSION}-sparc.tar.bz2 SOURCE3_HASH=sha512:264bf8f30dcfd72b8fcdb8e9486c8ffe59ec20bbb5f7379b9e300510d761128f636f2d6945ba97f7672fae878a0976e0dabf500a0c53702d67bf7790562a9484 fi ;; *) + GLIBC_ARCH=UNKNOWN SOURCE3=UNKNOWN message "${PROBLEM_COLOR}You have an unknown architecture, you should file a bug for this${DEFAULT_COLOR}" return 222 diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY index 45e038cae6..045a72d403 100644 --- a/libs/glibc/HISTORY +++ b/libs/glibc/HISTORY @@ -1,7 +1,3 @@ -2007-09-16 David Brown <dmlb2000@gmail.com> - * DETAILS: removed GLIBC_ARCH altogether - * BUILD: removed GLIBC_ARCH gone... - 2007-09-16 Arwed v. Merkatz <v.merkatz@gmx.net> * PREPARE: removed the persistent_add GLIBC_ARCH, there seems to be problem with persistent vars set in DETAILS |