Magellan Linux

Diff of /branches/magellan-next/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 4780 by niro, Sun Dec 27 23:16:16 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  
215  old_munpack=old$(typeset -f munpack)  if [[ ! -z $(typeset -f cmake_configure) ]]
216  eval "${old_munpack}"  then
217     # rename the old one
218     old_cmake_configure=old$(typeset -f cmake_configure)
219     eval ${old_cmake_configure}
220    fi
221    cmake_configure()
222    {
223     local abi
224     local abis_to_run="${MULTILIB_ABIS}"
225    
226     # respect MULTILIB_ONLY_ABI variable
227     [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
228    
229     local saved_SRCDIR="${SRCDIR}"
230     for abi in ${abis_to_run}
231     do
232     SRCDIR="${saved_SRCDIR}-${abi}"
233     cd ${SRCDIR}
234     abi-${abi} oldcmake_configure $@ || die
235     done
236    }
237    
238    if [[ ! -z $(typeset -f munpack) ]]
239    then
240     # rename the old one
241     old_munpack=old$(typeset -f munpack)
242     eval "${old_munpack}"
243    fi
244  munpack()  munpack()
245  {  {
246   local abi   local abi
# Line 211  munpack() Line 257  munpack()
257   done   done
258  }  }
259    
260  # rename the old one  if [[ ! -z $(typeset -f mmake) ]]
261  old_mmake=old$(typeset -f mmake)  then
262  eval "${old_mmake}"   # rename the old one
263     old_mmake=old$(typeset -f mmake)
264     eval "${old_mmake}"
265    fi
266  mmake()  mmake()
267  {  {
268   local abi   local abi
# Line 230  mmake() Line 279  mmake()
279   done   done
280  }  }
281    
282  # rename the old one  if [[ ! -z $(typeset -f minstall) ]]
283  old_minstall=old$(typeset -f minstall)  then
284  eval "${old_minstall}"   # rename the old one
285     old_minstall=old$(typeset -f minstall)
286     eval "${old_minstall}"
287    fi
288  minstall()  minstall()
289  {  {
290   local abi   local abi
# Line 265  minstall_destdir() Line 317  minstall_destdir()
317   done   done
318  }  }
319    
320  # rename the old one  if [[ ! -z $(typeset -f mpatch) ]]
321  old_mpatch=old$(typeset -f mpatch)  then
322  eval "${old_mpatch}"   # rename the old one
323     old_mpatch=old$(typeset -f mpatch)
324     eval "${old_mpatch}"
325    fi
326  mpatch()  mpatch()
327  {  {
328   local abi   local abi
# Line 284  mpatch() Line 339  mpatch()
339   done   done
340  }  }
341    
342  # rename the old one  if [[ ! -z $(typeset -f mlibtoolize) ]]
343  old_mlibtoolize=old$(typeset -f mlibtoolize)  then
344  eval "${old_mlibtoolize}"   # rename the old one
345     old_mlibtoolize=old$(typeset -f mlibtoolize)
346     eval "${old_mlibtoolize}"
347    fi
348  mlibtoolize()  mlibtoolize()
349  {  {
350   local abi   local abi

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