[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (985230a6026f6c350ff2714be9b07975a2631c38)

Treeve Jelbert scm at sourcemage.org
Sun Nov 23 09:21:43 EST 2008


GIT changes to master grimoire by Treeve Jelbert <treeve at sourcemage.org>:

 libs/glibc/BUILD     |   14 ++++++++++----
 libs/glibc/DETAILS   |    8 --------
 libs/glibc/HISTORY   |    4 ++++
 libs/glibc/PRE_BUILD |   14 --------------
 4 files changed, 14 insertions(+), 26 deletions(-)

New commits:
commit f3ac7662a0a089f798c57f80a18fb73540c89f3b
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    glibc - fix idn and 1a32

diff --git a/libs/glibc/BUILD b/libs/glibc/BUILD
index 4f3fd7e..1bed77c 100755
--- a/libs/glibc/BUILD
+++ b/libs/glibc/BUILD
@@ -69,11 +69,17 @@ unset  LD_LIBRARY_PATH  &&
 #
 if [[ ${GLIBC_NPTL} == y ]] && [[ ${GLIBC_SANITIZE_HEADERS} == y ]]; then
   cd ${GLIBC_HEADERS_DIR} &&
-  if [[ ${SMGL_COMPAT_ARCHS[0]} == 64 ]] && [[ ${SMGL_COMPAT_ARCHS[1]} == sparc ]]; then
-    make ARCH=sparc64 INSTALL_HDR_PATH=usr headers_install
+  GL_ARCH=${SMGL_COMPAT_ARCHS[1]}  &&
+  if [[ ${SMGL_COMPAT_ARCHS[0]} == 64 ]];then
+    if [[ ${SMGL_COMPAT_ARCHS[1]} == sparc ]]; then
+      GL_ARCH=sparc64
+    fi
   else
-    make ARCH=${SMGL_COMPAT_ARCHS[1]} INSTALL_HDR_PATH=usr headers_install
-  fi
+    if [[ ${SMGL_COMPAT_ARCHS[1]} == ia32 ]]; then
+     GL_ARCH=i386
+    fi
+  fi &&
+  make ARCH=$GL_ARCH INSTALL_HDR_PATH=usr headers_install
 fi
 
 if [[ ${SMGL_COMPAT_ARCHS[0]} == 64 && ${SMGL_COMPAT_ARCHS[1]} == sparc ]]; then
diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index 439bf69..06fd03e 100755
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -39,14 +39,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
          SOURCE2=$SOURCE.asc
    SOURCE_URL[0]=http://toolchain.freesa.org/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
-  if [ "$GLIBC_USEIDN" = "y" ]; then
-         SOURCE4=$SPELL-libidn-$VERSION.tar.bz2
-         SOURCE5=$SOURCE4.sig
-  SOURCE4_URL[0]=$GNU_URL/$SPELL/$SOURCE4
-  SOURCE5_URL[0]=${SOURCE4_URL[0]}.sig
-     SOURCE4_GPG=gnu.gpg:$SOURCE4.sig:UPSTREAM_KEY
-  SOURCE5_IGNORE=signature
-  fi
       SOURCE_GPG=Neumeier.gpg:$SOURCE.asc:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
       PATCHLEVEL=2
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 5f37bfd..43d8852 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,7 @@
+2008-11-23 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS, PRE_BUILD: remove libidn related stuff. now in normal tarbal
+	* BUILD: fix ia32 usage
+
 2008-11-22 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 2.9
 	  new url
diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD
index 684c617..1c7fa4e 100755
--- a/libs/glibc/PRE_BUILD
+++ b/libs/glibc/PRE_BUILD
@@ -1,24 +1,10 @@
 default_pre_build  &&
 
-#
-# Set GLIBC_LIBIDN_DIR for use later; the variable was needlessly persistent
-#
-persistent_remove  GLIBC_LIBIDN_DIR                                      &&
-local GLIBC_LIBIDN_DIR=$SOURCE_DIRECTORY/glibc-libidn-$VERSION           &&
-
 if  [  "$GLIBC_NPTL"  =  "y"  ];  then
   cd      $SOURCE_DIRECTORY                  &&
   patch $SOURCE_DIRECTORY/timezone/Makefile  \
         $SCRIPT_DIRECTORY/localtime.patch    &&
 
-  if [ "$GLIBC_USEIDN" = "y" ] && [[ "$GLIBC_CVS" != "y" ]]; then
-    #
-    # Unpack glibc-libidn
-    #
-    unpack_file 4                         &&
-    mv $GLIBC_LIBIDN_DIR libidn
-  fi &&
-
   #
   # Unpack glibc-kernel-headers
   #



More information about the SM-Commit mailing list