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 307 by niro, Mon Dec 22 11:33:39 2008 UTC revision 6406 by niro, Mon Aug 23 11:25:26 2010 UTC
    # Line 1  Line 1 
    1  # $Header: /magellan-cvs/smage/include/multilib.sminc,v 1.33 2007-11-13 15:49:09 niro Exp $  # $Id$
    2  # multilib abis  # multilib abis
    3    
    4  # do not define EMUL_LINUX_32 after inherit of multlib !!  # do not define EMUL_LINUX_32 after inherit of multlib !!
    # Line 14  case ${ARCH} in Line 14  case ${ARCH} in
    14   # add linux32 to the dependencies   # add linux32 to the dependencies
    15   if [[ ${EMUL_LINUX_32} = true ]]   if [[ ${EMUL_LINUX_32} = true ]]
    16   then   then
    17   EMUL_LINUX_32_SDEPENDS_x86_64=">= dev-util/linux32-1"   EMUL_LINUX_32_SDEPEND_x86_64=">= dev-util/linux32-1"
    18   SPECIAL_VARS="${SPECIAL_VARS} EMUL_LINUX_32_SDEPENDS_x86_64"   SPECIAL_VARS="${SPECIAL_VARS} EMUL_LINUX_32_SDEPEND_x86_64"
    19   fi   fi
    20   ;;   ;;
    21   i*86)   i*86)
    # Line 33  then Line 33  then
    33   # the var ist decided with our common eval+echo magic   # the var ist decided with our common eval+echo magic
    34   if [[ -z ${SDEPEND} ]]   if [[ -z ${SDEPEND} ]]
    35   then   then
    36   SDEPEND="\$(eval echo \\\$EMUL_LINUX_32_SDEPENDS_\${ARCH/i*86/x86} | tr ';' '\n')"   SDEPEND="\$(eval echo \\\$EMUL_LINUX_32_SDEPEND_\${ARCH/i*86/x86} | tr ';' '\n')"
    37   else   else
    38   SDEPEND="${SDEPEND}   SDEPEND="${SDEPEND}
    39   \$(eval echo \\\$EMUL_LINUX_32_SDEPENDS_\${ARCH/i*86/x86} | tr ';' '\n')"   \$(eval echo \\\$EMUL_LINUX_32_SDEPEND_\${ARCH/i*86/x86} | tr ';' '\n')"
    40   fi   fi
    41  fi  fi
    42    
    # Line 65  abi-m32() Line 65  abi-m32()
    65   then   then
    66   export LDFLAGS="-L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}"   export LDFLAGS="-L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}"
    67   fi   fi
    68   export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig"   # keep pkgconfig clean
    69     local orig_pkg_config_path="${PKG_CONFIG_PATH}"
    70     export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig:${PKG_CONFIG_PATH}"
    71    
    72   echo -e "${COLBLUE}*** ${COLGREEN}running with -${ABI} ABI${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}running with -${ABI} ABI${COLDEFAULT}"
    73   echo -e "${COLBLUE}*** ${COLGREEN}  ABI${COLDEFAULT}='${ABI}'"   echo -e "${COLBLUE}*** ${COLGREEN}  ABI${COLDEFAULT}='${ABI}'"
    # Line 92  abi-m32() Line 94  abi-m32()
    94   # run any given command   # run any given command
    95   eval $@ || die   eval $@ || die
    96    
    97   unset ABI CC CXX ABI_LIBDIR LDFLAGS PKG_CONFIG_PATH   unset ABI CC CXX ABI_LIBDIR LDFLAGS
    98     # keep pkgconfig clean
    99     export PKG_CONFIG_PATH="${orig_pkg_config_path}"
    100    
    101   # restore original settings   # restore original settings
    102   if [[ ${EMUL_LINUX_32} = true ]]   if [[ ${EMUL_LINUX_32} = true ]]
    # Line 112  abi-m64() Line 116  abi-m64()
    116   then   then
    117   export LDFLAGS="-L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}"   export LDFLAGS="-L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}"
    118   fi   fi
    119   export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig"   # keep pkgconfig clean
    120     local orig_pkg_config_path="${PKG_CONFIG_PATH}"
    121     export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig:${PKG_CONFIG_PATH}"
    122    
    123   echo -e "${COLBLUE}*** ${COLGREEN}running with -${ABI} ABI${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}running with -${ABI} ABI${COLDEFAULT}"
    124   echo -e "${COLBLUE}*** ${COLGREEN}  ABI${COLDEFAULT}='${ABI}'"   echo -e "${COLBLUE}*** ${COLGREEN}  ABI${COLDEFAULT}='${ABI}'"
    # Line 131  abi-m64() Line 137  abi-m64()
    137   # run any given command   # run any given command
    138   eval $@ || die   eval $@ || die
    139    
    140   unset ABI CC CXX ABI_LIBDIR LDFLAGS PKG_CONFIG_PATH   unset ABI CC CXX ABI_LIBDIR LDFLAGS
    141     # keep pkgconfig clean
    142     export PKG_CONFIG_PATH="${orig_pkg_config_path}"
    143  }  }
    144    
    145  only-m32()  only-m32()
    # Line 186  all-abis() Line 194  all-abis()
    194   done   done
    195  }  }
    196    
    197    mabi()
    198    {
    199     echo \${ABI}
    200    }
    201    
    202  ##  ##
    203  # multilib compile functions  # multilib compile functions
    204  ##  ##
    205    
    206  # rename the old one  if [[ ! -z $(typeset -f mconfigure) ]]
    207  old_mconfigure=old$(typeset -f mconfigure)  then
    208  eval ${old_mconfigure}   # rename the old one
    209     old_mconfigure=old$(typeset -f mconfigure)
    210     eval "${old_mconfigure}"
    211    fi
    212  mconfigure()  mconfigure()
    213  {  {
    214   local abi   local abi
    # Line 208  mconfigure() Line 224  mconfigure()
    224   done   done
    225  }  }
    226    
    227  # rename the old one  if [[ ! -z $(typeset -f cmake_configure) ]]
    228  old_munpack=old$(typeset -f munpack)  then
    229  eval "${old_munpack}"   # rename the old one
    230     old_cmake_configure=old$(typeset -f cmake_configure)
    231     eval "${old_cmake_configure}"
    232    fi
    233    cmake_configure()
    234    {
    235     local abi
    236     local abis_to_run="${MULTILIB_ABIS}"
    237    
    238     # respect MULTILIB_ONLY_ABI variable
    239     [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
    240    
    241     local saved_SRCDIR="${SRCDIR}"
    242     for abi in ${abis_to_run}
    243     do
    244     SRCDIR="${saved_SRCDIR}-${abi}"
    245     cd ${SRCDIR}
    246     abi-${abi} oldcmake_configure $@ || die
    247     done
    248    }
    249    
    250    if [[ ! -z $(typeset -f munpack) ]]
    251    then
    252     # rename the old one
    253     old_munpack=old$(typeset -f munpack)
    254     eval "${old_munpack}"
    255    fi
    256  munpack()  munpack()
    257  {  {
    258   local abi   local abi
    # Line 227  munpack() Line 269  munpack()
    269   done   done
    270  }  }
    271    
    272  # rename the old one  if [[ ! -z $(typeset -f mmake) ]]
    273  old_mmake=old$(typeset -f mmake)  then
    274  eval "${old_mmake}"   # rename the old one
    275     old_mmake=old$(typeset -f mmake)
    276     eval "${old_mmake}"
    277    fi
    278  mmake()  mmake()
    279  {  {
    280   local abi   local abi
    # Line 246  mmake() Line 291  mmake()
    291   done   done
    292  }  }
    293    
    294  # rename the old one  if [[ ! -z $(typeset -f minstall) ]]
    295  old_minstall=old$(typeset -f minstall)  then
    296  eval "${old_minstall}"   # rename the old one
    297     old_minstall=old$(typeset -f minstall)
    298     eval "${old_minstall}"
    299    fi
    300  minstall()  minstall()
    301  {  {
    302   local abi   local abi
    # Line 281  minstall_destdir() Line 329  minstall_destdir()
    329   done   done
    330  }  }
    331    
    332  # rename the old one  if [[ ! -z $(typeset -f mpatch) ]]
    333  old_mpatch=old$(typeset -f mpatch)  then
    334  eval "${old_mpatch}"   # rename the old one
    335     old_mpatch=old$(typeset -f mpatch)
    336     eval "${old_mpatch}"
    337    fi
    338  mpatch()  mpatch()
    339  {  {
    340   local abi   local abi
    # Line 300  mpatch() Line 351  mpatch()
    351   done   done
    352  }  }
    353    
    354  # rename the old one  if [[ ! -z $(typeset -f mlibtoolize) ]]
    355  old_mlibtoolize=old$(typeset -f mlibtoolize)  then
    356  eval "${old_mlibtoolize}"   # rename the old one
    357     old_mlibtoolize=old$(typeset -f mlibtoolize)
    358     eval "${old_mlibtoolize}"
    359    fi
    360  mlibtoolize()  mlibtoolize()
    361  {  {
    362   local abi   local abi
    Legend:
    Removed from v.307  
    changed lines
      Added in v.6406