Magellan Linux

  • Back to homepage
    • /[smage]/branches/R11-unstable/include/multilib.sminc

    Diff of /branches/R11-unstable/include/multilib.sminc

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    branches/magellan-next/include/multilib.sminc revision 8334 by niro, Thu Jul 14 21:43:24 2011 UTC trunk/include/multilib.sminc revision 11300 by niro, Fri Mar 2 15:27:45 2012 UTC
    # Line 4  Line 4 
    4  # be verbose or nor (true|false}  # be verbose or nor (true|false}
    5  : ${MULTILIB_VERBOSE="true"}  : ${MULTILIB_VERBOSE="true"}
    6    
    7    # multilib should call all dependant includes, which gets overridden
    8    sminclude mtools
    9    
    10  # do not define EMUL_LINUX_32 after inherit of multlib !!  # do not define EMUL_LINUX_32 after inherit of multlib !!
    11  # it may break i*86 builds  # it may break i*86 builds
    12    
    # Line 66  abi-m32() Line 69  abi-m32()
    69   export ABI_LIBDIR="lib"   export ABI_LIBDIR="lib"
    70   if [[ ${EXPORT_ABI_LDFLAGS} != false ]]   if [[ ${EXPORT_ABI_LDFLAGS} != false ]]
    71   then   then
    72   export LDFLAGS="-L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}"   local saved_ldflags="${LDFLAGS}"
    73     export LDFLAGS="${LDFLAGS} -L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}"
    74   fi   fi
    75   # keep pkgconfig clean   # keep pkgconfig clean
    76   local orig_pkg_config_path="${PKG_CONFIG_PATH}"   local orig_pkg_config_path="${PKG_CONFIG_PATH}"
    # Line 106  abi-m32() Line 110  abi-m32()
    110   # run any given command   # run any given command
    111   eval $@ || die   eval $@ || die
    112    
    113   unset ABI CC CXX ABI_LIBDIR LDFLAGS   unset ABI CC CXX ABI_LIBDIR
    114   # keep pkgconfig clean   # keep pkgconfig clean
    115   export PKG_CONFIG_PATH="${orig_pkg_config_path}"   export PKG_CONFIG_PATH="${orig_pkg_config_path}"
    116     export LDFLAGS="${saved_ldflags}"
    117    
    118   # restore original settings   # restore original settings
    119   if [[ ${EMUL_LINUX_32} = true ]]   if [[ ${EMUL_LINUX_32} = true ]]
    # Line 126  abi-m64() Line 131  abi-m64()
    131   export ABI_LIBDIR="lib64"   export ABI_LIBDIR="lib64"
    132   if [[ ${EXPORT_ABI_LDFLAGS} != false ]]   if [[ ${EXPORT_ABI_LDFLAGS} != false ]]
    133   then   then
    134     local saved_ldflags="${LDFLAGS}"
    135   export LDFLAGS="-L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}"   export LDFLAGS="-L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}"
    136   fi   fi
    137   # keep pkgconfig clean   # keep pkgconfig clean
    # Line 152  abi-m64() Line 158  abi-m64()
    158   # run any given command   # run any given command
    159   eval $@ || die   eval $@ || die
    160    
    161   unset ABI CC CXX ABI_LIBDIR LDFLAGS   unset ABI CC CXX ABI_LIBDIR
    162   # keep pkgconfig clean   # keep pkgconfig clean
    163   export PKG_CONFIG_PATH="${orig_pkg_config_path}"   export PKG_CONFIG_PATH="${orig_pkg_config_path}"
    164     export LDFLAGS="${saved_ldflags}"
    165  }  }
    166    
    167  only-m32()  only-m32()
    # Line 260  cmake_configure() Line 267  cmake_configure()
    267   cd ${SRCDIR}   cd ${SRCDIR}
    268   abi-${abi} oldcmake_configure $@ || die   abi-${abi} oldcmake_configure $@ || die
    269   done   done
    270     # restore SRCDIR
    271     SRCDIR="${saved_SRCDIR}"
    272  }  }
    273    
    274  if [[ ! -z $(typeset -f munpack) ]]  if [[ ! -z $(typeset -f munpack) ]]
    # Line 388  mlibtoolize() Line 397  mlibtoolize()
    397   done   done
    398  }  }
    399    
    400    if [[ ! -z $(typeset -f mautoreconf) ]]
    401    then
    402     # rename the old one
    403     old_mautoreconf=old$(typeset -f mautoreconf)
    404     eval "${old_mautoreconf}"
    405    fi
    406    mautoreconf()
    407    {
    408     local abi
    409     local abis_to_run="${MULTILIB_ABIS}"
    410    
    411     # respect MULTILIB_ONLY_ABI variable
    412     [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
    413    
    414     for abi in ${abis_to_run}
    415     do
    416     echo -e "${COLBLUE}*** ${COLGREEN}running mautoreconf for ABI -${abi}${COLDEFAULT}"
    417     cd ${SRCDIR}-${abi}
    418     oldmautoreconf $@ || die
    419     done
    420    }
    421    
    422    if [[ ! -z $(typeset -f minstalldocs) ]]
    423    then
    424     # rename the old one
    425     old_minstalldocs=old$(typeset -f minstalldocs)
    426     eval "${old_minstalldocs}"
    427    fi
    428  minstalldocs()  minstalldocs()
    429  {  {
    430   local abi   local abi
    431   local docfiles   local docfiles
      docfiles="$@"  
    432    
    433   local abis_to_run="${MULTILIB_ABIS}"   local abis_to_run="${MULTILIB_ABIS}"
    434    
    # Line 402  minstalldocs() Line 438  minstalldocs()
    438   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    439   do   do
    440   cd ${SRCDIR}-${abi}   cd ${SRCDIR}-${abi}
    441   if [ ! -d ${BINDIR}/usr/share/doc/${PNAME}-${PVER} ]   oldminstalldocs $@ || die
      then  
      install -d ${BINDIR}/usr/share/doc/${PNAME}-${PVER} || die "creating doc dirs."  
      fi  
       
      for i in ${docfiles}  
      do  
      cat ${SRCDIR}-${abi}/${i} | gzip -9c > ${SRCDIR}-${abi}/${i}.gz || die "gzipping docs."  
      install -m 0644 ${SRCDIR}-${abi}/${i}.gz \  
      ${BINDIR}/usr/share/doc/${PNAME}-${PVER} || die "coping docs."  
      done  
    442   done   done
    443  }  }
    444    
    # Line 430  multilib_src_compile() Line 456  multilib_src_compile()
    456   mmake   mmake
    457  }  }
    458    
    459    multilib_src_check()
    460    {
    461     mmake -j1 -k check || die
    462    }
    463    
    464  multilib_src_install()  multilib_src_install()
    465  {  {
    466   minstall_destdir   minstall_destdir
    # Line 449  multilib_src_install() Line 480  multilib_src_install()
    480   done   done
    481  }  }
    482    
    483  export_inherits multilib src_prepare src_compile src_install  export_inherits multilib src_prepare src_compile src_check src_install
    Legend:
    Removed from v.8334  
    changed lines
      Added in v.11300