Skip to Content.
Sympa Menu

sm-commit - Re: [SM-Commit] GIT changes to test grimoire by Jaka Kranjc (aac03a9f66308ac5313f59728c44566b5bf2b505)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arwed von Merkatz <v.merkatz AT gmx.net>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: Re: [SM-Commit] GIT changes to test grimoire by Jaka Kranjc (aac03a9f66308ac5313f59728c44566b5bf2b505)
  • Date: Sun, 4 Jun 2006 14:57:05 +0200

On Sun, Jun 04, 2006 at 07:01:07AM -0500, Jaka Kranjc wrote:
> GIT changes to test grimoire by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:
>
> libs/glibc/BUILD | 10 +++++-----
> libs/glibc/HISTORY | 1 +
> libs/glibc/PRE_INSTALL | 6 +++---
> 3 files changed, 9 insertions(+), 8 deletions(-)
>
> New commits:
> commit aac03a9f66308ac5313f59728c44566b5bf2b505
> Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
> Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
>
> glibc: check SMGL_COMPAT_ARCHS instead of uname -m
>
> diff --git a/libs/glibc/BUILD b/libs/glibc/BUILD
> index 9982804..e9cd92b 100755
> --- a/libs/glibc/BUILD
> +++ b/libs/glibc/BUILD
> @@ -47,18 +47,18 @@ #
> # Setup sanitised glibc-kernel-headers for the glibc compile
> #
> persistent_add GLIBC_ARCH &&
> -if [[ $(uname -m) = *86_64 ]]; then
> +if [[ ${SMGL_COMPAT_ARCHS[1]} == x86_64 ]]; then
> # handle 32-bit mode on 64-bit (*86_64) processors correctly #11904
> if grep -q -- "-m64" <<< "$CFLAGS"; then
> GLIBC_ARCH=x86_64
> else
> GLIBC_ARCH=i386
> fi

You can get rid of that CFLAGS check now, SMGL_COMPAT_ARCH[1]=x86_64
guarantees that it's a 64bit build.

> -elif [[ $(uname -m) = ppc ]]; then
> +elif [[ ${SMGL_COMPAT_ARCHS[1]} == ppc ]]; then
> GLIBC_ARCH=ppc
> -elif [[ $(uname -m) = *86 ]]; then
> +elif [[ ${SMGL_COMPAT_ARCHS[1]} == ia32 ]]; then
> GLIBC_ARCH=i386
> -elif [[ $(uname -m) = *sparc64 ]]; then
> +elif [[ ${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
> @@ -86,7 +86,7 @@ elif [[ $(uname -m) = *sparc64 ]];
> export HOST="sparcv9-unknown-linux-gnu" &&
> [ "$BUILD" = "sparc-unknown-linux-gnu" ] &&
> export BUILD="sparcv9-unknown-linux-gnu"
> -elif [[ $(uname -m) = *sparc ]]; then
> +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
> diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
> index 08f27f2..e0d98ad 100644
> --- a/libs/glibc/HISTORY
> +++ b/libs/glibc/HISTORY
> @@ -1,5 +1,6 @@
> 2006-06-04 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
> * BUILD: handle 32-bit mode on 64-bit processors correctly #11904
> + * BUILD, PRE_INSTALL: check SMGL_COMPAT_ARCHS instead of uname -m
>
> 2006-05-19 David Brown <dmlb2000 AT gmail.com>
> * PRE_INSTALL: removed explicit check of HOST for check against
> diff --git a/libs/glibc/PRE_INSTALL b/libs/glibc/PRE_INSTALL
> index 6ed6bbf..756ede0 100755
> --- a/libs/glibc/PRE_INSTALL
> +++ b/libs/glibc/PRE_INSTALL
> @@ -9,13 +9,13 @@ if [ -z $INSTALL_ROOT ]; then
> done &&
> ldconfig $SOURCE_DIRECTORY.bld/old.libs &&
> local LD &&
> - if [[ $(uname -m) = ppc* ]]; then
> + if [[ ${SMGL_COMPAT_ARCHS[1]} == ppc ]]; then
> LD=$(readlink /lib/ld.so.1) &&
> ln -sf $SOURCE_DIRECTORY.bld/old.libs/$LD /lib/ld.so.1
> - elif [[ $(uname -m) = x86_64 ]] && test -f /lib/ld-linux-x86-64.so.2 &&
> [[ ${SMGL_COMPAT_ARCHS[1]} = "x86_64" ]]; then
> + elif [[ ${SMGL_COMPAT_ARCHS[1]} == x86_64 ]] && test -f
> /lib/ld-linux-x86-64.so.2 && [[ ${SMGL_COMPAT_ARCHS[1]} = "x86_64" ]]; then
> LD=$(readlink /lib/ld-linux-x86-64.so.2) &&
> ln -sf $SOURCE_DIRECTORY.bld/old.libs/$LD /lib/ld-linux-x86-64.so.2
> - elif [[ $(uname -m) = x86_64 ]] && test -f /lib64/ld-linux-x86-64.so.2
> && [[ ${SMGL_COMPAT_ARCHS[1]} = "x86_64" ]]; then
> + elif [[ ${SMGL_COMPAT_ARCHS[1]} == x86_64 ]] && test -f
> /lib64/ld-linux-x86-64.so.2 && [[ ${SMGL_COMPAT_ARCHS[1]} = "x86_64" ]];
> then
> LD=$(readlink /lib64/ld-linux-x86-64.so.2) &&
> ln -sf $SOURCE_DIRECTORY.bld/old.libs/$LD /lib64/ld-linux-x86-64.so.2
> else
> _______________________________________________
> SM-Commit mailing list
> SM-Commit AT lists.ibiblio.org
> http://lists.ibiblio.org/mailman/listinfo/sm-commit
>

--
Arwed v. Merkatz Source Mage GNU/Linux developer
http://www.sourcemage.org




Archive powered by MHonArc 2.6.24.

Top of Page