Changeset 562

Show
Ignore:
Timestamp:
02/21/06 08:15:50 (3 years ago)
Author:
jim
Message:

r564@server (orig r562): jim | 2005-06-07 20:12:28 -0700
Mirrored from jg555.com on Tue Jun 7 20:12:17 PDT 2005
----------------------------------------------------------------------


Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/scripts/funcs/multiarch-funcs.sh

    r559 r562  
    5151                    sed -e "s@lib[36][124]@lib@g"  -e "s@lib@${libdirname}@g" ` 
    5252 
    53    if [ "${MULTIARCH}" = "Y" ]; then 
    54       export PERL=`which_func perl-${BUILDENV}` 
    55       export PYTHON=`which_func python-${BUILDENV}` 
    56    else 
    57       export PERL=`which_func perl` 
    58       export PYTHON=`which_func python` 
    59    fi 
    60  
    6153} 
    6254 
    …… 
    156148   if [ ! -d ${wrapperdir} ]; then mkdir -p ${wrapperdir} ; fi 
    157149 
    158    cat > ${wrapper} <<EOF 
    159 #!/bin/sh 
    160  
    161 # Set to default if BUILDENV not set 
    162 if [ -z \${BUILDENV} ]; then BUILDENV=${DEFAULTENV} ; fi 
    163 export BUILDENV 
    164 exec \${0}-\${BUILDENV} \${@} 
     150   cat > wrapper.c <<"EOF" 
     151/* 
     152 
     153   wrapper.c - c wrapper for cross-lfs multiarch handling 
     154   ------------------------------------------------------ 
     155   Created By:  Ryan Oliver <ryan.oliver@pha.com.au> 20050606 
     156 
     157   $LastChangedBy$ 
     158   $LastChangedDate$ 
     159   $LastChangedRevision$ 
     160   $HeadURL$ 
     161 
     162 */ 
     163 
     164#include <unistd.h> 
     165#include <stdlib.h> 
     166#include <errno.h> 
     167 
     168/* TODO: should check for __x86_64__ , __powerpc64__ etc and set accordingly */ 
     169#ifndef DEFAULTENV 
     170#define DEFAULTENV "64" 
     171#endif 
     172 
     173int main(int argc, char **argv) { 
     174 
     175        char *filename; 
     176        char *buildenv; 
     177 
     178        if(!(buildenv = getenv("BUILDENV"))) 
     179                buildenv = DEFAULTENV; 
     180 
     181        filename = (char *) malloc(strlen(argv[0]) + strlen(buildenv) + 2); 
     182        strcpy(filename, argv[0]); 
     183        strcat(filename, "-"); 
     184        strcat(filename, buildenv); 
     185 
     186        execvp(filename, argv); 
     187        perror(argv[0]); 
     188        free(filename); 
     189 
     190} 
    165191EOF 
    166192 
     193   OLD_BUILDENV="${BUILDENV}" 
     194   BUILDENV="${DEFAULTENV}" 
     195   setup_multiarch 
     196 
     197   ${CC-gcc} ${ARCH_CFLAGS} -DDEFAULTENV=\"${DEFAULTENV}\" \ 
     198       wrapper.c -o ${wrapper} 
    167199   chmod 755 ${wrapper} 
     200 
     201   BUILDENV="${OLD_BUILDENV}" 
    168202 
    169203} 

  • trunk/scripts/target-scripts/target-gcc.sh

    r559 r562  
    194194   3.4* ) 
    195195      apply_patch gcc-3.4.1-fix_configure_for_target_native 
     196   ;; 
     197 
     198   4.* ) 
     199      # Testing only... set AS_FOR_TARGET and LD_FOR_TARGET so these are used 
     200      # for feature checks... will have to check for unintended side effects 
     201      extra_makeopts="AS_FOR_TARGET=${HST_TOOLS}/bin/${TARGET}-as" 
     202      extra_makeopts="${extra_makeopts} LD_FOR_TARGET=${HST_TOOLS}/bin/${TARGET}-ld" 
    196203   ;; 
    197204esac 
    …… 
    222229min_log_init ${BUILDLOGS} && 
    223230make ${PMFLAGS} BOOT_LDFLAGS="-s" BOOT_CFLAGS="-O2 ${HOST_CFLAGS} -pipe" \ 
    224    STAGE1_CFLAGS="-O2 ${HOST_CFLAGS} -pipe" all \ 
     231   STAGE1_CFLAGS="-O2 ${HOST_CFLAGS} -pipe" ${extra_makeopts} all \ 
    225232   >> ${LOGFILE} 2>&1 && 
    226233echo " o Build OK" || barf 

  • trunk/scripts/untested/blfs-scripts/blfs-shared-mime-info.sh

    r559 r562  
    1111unpack_tarball shared-mime-info-${SHD_MIME_INFO_VER} 
    1212cd ${PKGDIR} 
    13  
    14 if [ "${MULTIARCH}" = "Y" ]; then 
    15    export INTLTOOL_PERL="${PERL}" 
    16 fi 
    1713 
    1814max_log_init shared-mime-info ${SHD_MIME_INFO_VER} "blfs (shared)" ${CONFLOGS} ${LOG} 

  • trunk/scripts/untested/gnome-scripts/gnome-desktop-scripts/gnome-desktop-scrollkeeper.sh

    r559 r562  
    2525####### 
    2626 
    27 # Set perl binary to use if multiarch (else intltool component barfs) 
    28 export INTLTOOL_PERL="${PERL}" 
    29  
    3027max_log_init scrollkeeper ${SCROLLKEEPER_VER} "blfs (shared)" ${CONFLOGS} ${LOG} 
    3128CC="${CC-gcc} ${ARCH_CFLAGS}" \ 

  • trunk/scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-glib.sh

    r559 r562  
    2727fi 
    2828 
    29 # If ${PERL} is set, strip the path from it so PERL_PATH gets set correctly 
    30 if [ ! -z "${PERL}" ]; then 
    31    export PERL=`basename ${PERL}` 
    32 fi 
    33  
    3429max_log_init glib ${GLIB_VER} "blfs (shared)" ${CONFLOGS} ${LOG} 
    3530CC="${CC-gcc} ${ARCH_CFLAGS}" \ 

  • trunk/scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-gnome-mime-data.sh

    r559 r562  
    2020cd ${PKGDIR} 
    2121 
    22 if [ "${MULTIARCH}" = "Y" ]; then 
    23    export INTLTOOL_PERL="${PERL}" 
    24 fi 
    25  
    2622# TODO: does this use g++ 
    2723max_log_init gnome-mime-data ${GNOME_MIME_DATA_VER} "blfs (shared)" ${CONFLOGS} ${LOG} 

  • trunk/scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-intltool.sh

    r559 r562  
    55cd ${SRC} 
    66LOG=intltool-gnome-platform.log 
    7  
    8 set_libdirname 
    9 # Set perl binary to use if multiarch... 
    10 if [ "${MULTIARCH}" = "Y" ]; then 
    11    export PERL="/usr/bin/perl-${BUILDENV}" 
    12 fi 
    137 
    148# override TARBALLS to point at gnome/platform tree