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

    revision 11030 by niro, Sat Feb 11 19:34:51 2012 UTC revision 11300 by niro, Fri Mar 2 15:27:45 2012 UTC
    # Line 69  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 109  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 129  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 155  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()
    Legend:
    Removed from v.11030  
    changed lines
      Added in v.11300