Magellan Linux

Diff of /trunk/include/multilib.sminc

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

revision 2 by niro, Fri Oct 10 13:29:42 2008 UTC revision 4782 by niro, Sun Dec 27 23:21:20 2009 UTC
# Line 61  abi-m32() Line 61  abi-m32()
61   export CC="gcc -${ABI}"   export CC="gcc -${ABI}"
62   export CXX="g++ -${ABI}"   export CXX="g++ -${ABI}"
63   export ABI_LIBDIR="lib"   export ABI_LIBDIR="lib"
64   export LDFLAGS="-L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}"   if [[ ${EXPORT_ABI_LDFLAGS} != false ]]
65     then
66     export LDFLAGS="-L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}"
67     fi
68   export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig"   export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig"
69    
70   echo -e "${COLBLUE}*** ${COLGREEN}running with -${ABI} ABI${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}running with -${ABI} ABI${COLDEFAULT}"
# Line 69  abi-m32() Line 72  abi-m32()
72   echo -e "${COLBLUE}*** ${COLGREEN}  CC${COLDEFAULT}='${CC}'"   echo -e "${COLBLUE}*** ${COLGREEN}  CC${COLDEFAULT}='${CC}'"
73   echo -e "${COLBLUE}*** ${COLGREEN}  CXX${COLDEFAULT}='${CXX}'"   echo -e "${COLBLUE}*** ${COLGREEN}  CXX${COLDEFAULT}='${CXX}'"
74   echo -e "${COLBLUE}*** ${COLGREEN}  ABI_LIBDIR${COLDEFAULT}='${ABI_LIBDIR}'"   echo -e "${COLBLUE}*** ${COLGREEN}  ABI_LIBDIR${COLDEFAULT}='${ABI_LIBDIR}'"
75   echo -e "${COLBLUE}*** ${COLGREEN}  LDFLAGS${COLDEFAULT}='${LDFLAGS}'"   if [[ ${EXPORT_ABI_LDFLAGS} != false ]]
76     then
77     echo -e "${COLBLUE}*** ${COLGREEN}  LDFLAGS${COLDEFAULT}='${LDFLAGS}'"
78     else
79     echo -e "${COLBLUE}*** ${COLGREEN}  LDFLAGS${COLDEFAULT}='${COLYELLOW}not exported${COLDEFAULT}'"
80     fi
81   echo -e "${COLBLUE}*** ${COLGREEN}  PKG_CONFIG_PATH${COLDEFAULT}='${PKG_CONFIG_PATH}'"   echo -e "${COLBLUE}*** ${COLGREEN}  PKG_CONFIG_PATH${COLDEFAULT}='${PKG_CONFIG_PATH}'"
82    
83   # configure a linux32 emulated build   # configure a linux32 emulated build
# Line 100  abi-m64() Line 108  abi-m64()
108   export CC="gcc -${ABI}"   export CC="gcc -${ABI}"
109   export CXX="g++ -${ABI}"   export CXX="g++ -${ABI}"
110   export ABI_LIBDIR="lib64"   export ABI_LIBDIR="lib64"
111   export LDFLAGS="-L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}"   if [[ ${EXPORT_ABI_LDFLAGS} != false ]]
112     then
113     export LDFLAGS="-L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}"
114     fi
115   export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig"   export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig"
116    
117   echo -e "${COLBLUE}*** ${COLGREEN}running with -${ABI} ABI${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}running with -${ABI} ABI${COLDEFAULT}"
# Line 108  abi-m64() Line 119  abi-m64()
119   echo -e "${COLBLUE}*** ${COLGREEN}  CC${COLDEFAULT}='${CC}'"   echo -e "${COLBLUE}*** ${COLGREEN}  CC${COLDEFAULT}='${CC}'"
120   echo -e "${COLBLUE}*** ${COLGREEN}  CXX${COLDEFAULT}='${CXX}'"   echo -e "${COLBLUE}*** ${COLGREEN}  CXX${COLDEFAULT}='${CXX}'"
121   echo -e "${COLBLUE}*** ${COLGREEN}  ABI_LIBDIR${COLDEFAULT}='${ABI_LIBDIR}'"   echo -e "${COLBLUE}*** ${COLGREEN}  ABI_LIBDIR${COLDEFAULT}='${ABI_LIBDIR}'"
122   echo -e "${COLBLUE}*** ${COLGREEN}  LDFLAGS${COLDEFAULT}='${LDFLAGS}'"   if [[ ${EXPORT_ABI_LDFLAGS} != false ]]
123     then
124     echo -e "${COLBLUE}*** ${COLGREEN}  LDFLAGS${COLDEFAULT}='${LDFLAGS}'"
125     else
126     echo -e "${COLBLUE}*** ${COLGREEN}  LDFLAGS${COLDEFAULT}='${COLYELLOW}not exported${COLDEFAULT}'"
127     fi
128   echo -e "${COLBLUE}*** ${COLGREEN}  CHOST${COLDEFAULT}='${CHOST}'"   echo -e "${COLBLUE}*** ${COLGREEN}  CHOST${COLDEFAULT}='${CHOST}'"
129   echo -e "${COLBLUE}*** ${COLGREEN}  PKG_CONFIG_PATH${COLDEFAULT}='${PKG_CONFIG_PATH}'"   echo -e "${COLBLUE}*** ${COLGREEN}  PKG_CONFIG_PATH${COLDEFAULT}='${PKG_CONFIG_PATH}'"
130    
# Line 174  all-abis() Line 190  all-abis()
190  # multilib compile functions  # multilib compile functions
191  ##  ##
192    
193  # rename the old one  if [[ ! -z $(typeset -f mconfigure) ]]
194  old_mconfigure=old$(typeset -f mconfigure)  then
195  eval ${old_mconfigure}   # rename the old one
196     old_mconfigure=old$(typeset -f mconfigure)
197     eval ${old_mconfigure}
198    fi
199  mconfigure()  mconfigure()
200  {  {
201   local abi   local abi
# Line 192  mconfigure() Line 211  mconfigure()
211   done   done
212  }  }
213    
214  # rename the old one  if [[ ! -z $(typeset -f cmake_configure) ]]
215  old_munpack=old$(typeset -f munpack)  then
216  eval "${old_munpack}"   # rename the old one
217     old_cmake_configure=old$(typeset -f cmake_configure)
218     eval ${old_cmake_configure}
219    fi
220    cmake_configure()
221    {
222     local abi
223     local abis_to_run="${MULTILIB_ABIS}"
224    
225     # respect MULTILIB_ONLY_ABI variable
226     [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
227    
228     local saved_SRCDIR="${SRCDIR}"
229     for abi in ${abis_to_run}
230     do
231     SRCDIR="${saved_SRCDIR}-${abi}"
232     cd ${SRCDIR}
233     abi-${abi} oldcmake_configure $@ || die
234     done
235    }
236    
237    if [[ ! -z $(typeset -f munpack) ]]
238    then
239     # rename the old one
240     old_munpack=old$(typeset -f munpack)
241     eval "${old_munpack}"
242    fi
243  munpack()  munpack()
244  {  {
245   local abi   local abi
# Line 211  munpack() Line 256  munpack()
256   done   done
257  }  }
258    
259  # rename the old one  if [[ ! -z $(typeset -f mmake) ]]
260  old_mmake=old$(typeset -f mmake)  then
261  eval "${old_mmake}"   # rename the old one
262     old_mmake=old$(typeset -f mmake)
263     eval "${old_mmake}"
264    fi
265  mmake()  mmake()
266  {  {
267   local abi   local abi
# Line 230  mmake() Line 278  mmake()
278   done   done
279  }  }
280    
281  # rename the old one  if [[ ! -z $(typeset -f minstall) ]]
282  old_minstall=old$(typeset -f minstall)  then
283  eval "${old_minstall}"   # rename the old one
284     old_minstall=old$(typeset -f minstall)
285     eval "${old_minstall}"
286    fi
287  minstall()  minstall()
288  {  {
289   local abi   local abi
# Line 265  minstall_destdir() Line 316  minstall_destdir()
316   done   done
317  }  }
318    
319  # rename the old one  if [[ ! -z $(typeset -f mpatch) ]]
320  old_mpatch=old$(typeset -f mpatch)  then
321  eval "${old_mpatch}"   # rename the old one
322     old_mpatch=old$(typeset -f mpatch)
323     eval "${old_mpatch}"
324    fi
325  mpatch()  mpatch()
326  {  {
327   local abi   local abi
# Line 284  mpatch() Line 338  mpatch()
338   done   done
339  }  }
340    
341  # rename the old one  if [[ ! -z $(typeset -f mlibtoolize) ]]
342  old_mlibtoolize=old$(typeset -f mlibtoolize)  then
343  eval "${old_mlibtoolize}"   # rename the old one
344     old_mlibtoolize=old$(typeset -f mlibtoolize)
345     eval "${old_mlibtoolize}"
346    fi
347  mlibtoolize()  mlibtoolize()
348  {  {
349   local abi   local abi

Legend:
Removed from v.2  
changed lines
  Added in v.4782