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 11522 by niro, Mon Mar 12 15:02:20 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()
    # Line 172  only-m32() Line 176  only-m32()
    176   # export this for mpatch etc (to repect only-${abi})   # export this for mpatch etc (to repect only-${abi})
    177   export MULTILIB_ONLY_ABI=${abi}   export MULTILIB_ONLY_ABI=${abi}
    178    
    179   cd ${SRCDIR}-${abi}   cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    180   abi-${abi} $@ || die   abi-${abi} $@ || die
    181    
    182   # unset this is very important   # unset this is very important
    # Line 193  only-m64() Line 197  only-m64()
    197   # export this for mpatch etc (to repect only-${abi})   # export this for mpatch etc (to repect only-${abi})
    198   export MULTILIB_ONLY_ABI=${abi}   export MULTILIB_ONLY_ABI=${abi}
    199    
    200   cd ${SRCDIR}-${abi}   cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    201   abi-${abi} $@ || die   abi-${abi} $@ || die
    202    
    203   # unset this is very important   # unset this is very important
    # Line 207  all-abis() Line 211  all-abis()
    211   local abi   local abi
    212   for abi in ${MULTILIB_ABIS}   for abi in ${MULTILIB_ABIS}
    213   do   do
    214   cd ${SRCDIR}-${abi}   cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    215   abi-${abi} $@ || die   abi-${abi} $@ || die
    216   done   done
    217  }  }
    # Line 237  mconfigure() Line 241  mconfigure()
    241    
    242   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    243   do   do
    244   cd ${SRCDIR}-${abi}   cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    245   abi-${abi} oldmconfigure $@ || die   abi-${abi} oldmconfigure $@ || die
    246   done   done
    247  }  }
    # Line 260  cmake_configure() Line 264  cmake_configure()
    264   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    265   do   do
    266   SRCDIR="${saved_SRCDIR}-${abi}"   SRCDIR="${saved_SRCDIR}-${abi}"
    267   cd ${SRCDIR}   cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    268   abi-${abi} oldcmake_configure $@ || die   abi-${abi} oldcmake_configure $@ || die
    269   done   done
    270   # restore SRCDIR   # restore SRCDIR
    # Line 306  mmake() Line 310  mmake()
    310   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    311   do   do
    312   echo -e "${COLBLUE}*** ${COLGREEN}compiling for ABI -${abi}${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}compiling for ABI -${abi}${COLDEFAULT}"
    313   cd ${SRCDIR}-${abi}   cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    314   abi-${abi} oldmmake $@ || die   abi-${abi} oldmmake $@ || die
    315   done   done
    316  }  }
    # Line 328  minstall() Line 332  minstall()
    332   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    333   do   do
    334   echo -e "${COLBLUE}*** ${COLGREEN}installing for ABI -${abi}${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}installing for ABI -${abi}${COLDEFAULT}"
    335   cd ${SRCDIR}-${abi}   cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    336   abi-${abi} oldminstall $@ || die   abi-${abi} oldminstall $@ || die
    337   done   done
    338  }  }
    # Line 344  minstall_destdir() Line 348  minstall_destdir()
    348   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    349   do   do
    350   echo -e "${COLBLUE}*** ${COLGREEN}installing for ABI -${abi}${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}installing for ABI -${abi}${COLDEFAULT}"
    351   cd ${SRCDIR}-${abi}   cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    352   make DESTDIR=${BINDIR} $@ install || die   make DESTDIR=${BINDIR} $@ install || die
    353   done   done
    354  }  }
    # Line 366  mpatch() Line 370  mpatch()
    370   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    371   do   do
    372   echo -e "${COLBLUE}*** ${COLGREEN}appling patch for ABI -${abi}${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}appling patch for ABI -${abi}${COLDEFAULT}"
    373   cd ${SRCDIR}-${abi}   cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    374   oldmpatch $@ || die   oldmpatch $@ || die
    375   done   done
    376  }  }
    # Line 388  mlibtoolize() Line 392  mlibtoolize()
    392   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    393   do   do
    394   echo -e "${COLBLUE}*** ${COLGREEN}running mlibtoolize for ABI -${abi}${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}running mlibtoolize for ABI -${abi}${COLDEFAULT}"
    395   cd ${SRCDIR}-${abi}   cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    396   oldmlibtoolize $@ || die   oldmlibtoolize $@ || die
    397   done   done
    398  }  }
    # Line 410  mautoreconf() Line 414  mautoreconf()
    414   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    415   do   do
    416   echo -e "${COLBLUE}*** ${COLGREEN}running mautoreconf for ABI -${abi}${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}running mautoreconf for ABI -${abi}${COLDEFAULT}"
    417   cd ${SRCDIR}-${abi}   cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    418   oldmautoreconf $@ || die   oldmautoreconf $@ || die
    419   done   done
    420  }  }
    # Line 433  minstalldocs() Line 437  minstalldocs()
    437    
    438   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    439   do   do
    440   cd ${SRCDIR}-${abi}   cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    441   oldminstalldocs $@ || die   oldminstalldocs $@ || die
    442   done   done
    443  }  }
    # Line 464  multilib_src_install() Line 468  multilib_src_install()
    468   local i   local i
    469   for abi in ${MULTILIB_ABIS}   for abi in ${MULTILIB_ABIS}
    470   do   do
    471   cd ${SRCDIR}-${abi}   cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    472   for i in ABOUT-NLS AUTHORS BUGS CHANGES ChangeLog COPYING \   for i in ABOUT-NLS AUTHORS BUGS CHANGES ChangeLog COPYING \
    473   FAQ LICENSE NEWS README TODO   FAQ LICENSE NEWS README TODO
    474   do   do
    Legend:
    Removed from v.11030  
    changed lines
      Added in v.11522