Magellan Linux

Diff of /branches/R11-unstable/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 3671 by niro, Thu Oct 29 10:40:29 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 munpack) ]]
215  old_munpack=old$(typeset -f munpack)  then
216  eval "${old_munpack}"   # rename the old one
217     old_munpack=old$(typeset -f munpack)
218     eval "${old_munpack}"
219    fi
220  munpack()  munpack()
221  {  {
222   local abi   local abi
# Line 211  munpack() Line 233  munpack()
233   done   done
234  }  }
235    
236  # rename the old one  if [[ ! -z $(typeset -f mmake) ]]
237  old_mmake=old$(typeset -f mmake)  then
238  eval "${old_mmake}"   # rename the old one
239     old_mmake=old$(typeset -f mmake)
240     eval "${old_mmake}"
241    fi
242  mmake()  mmake()
243  {  {
244   local abi   local abi
# Line 230  mmake() Line 255  mmake()
255   done   done
256  }  }
257    
258  # rename the old one  if [[ ! -z $(typeset -f minstall) ]]
259  old_minstall=old$(typeset -f minstall)  then
260  eval "${old_minstall}"   # rename the old one
261     old_minstall=old$(typeset -f minstall)
262     eval "${old_minstall}"
263    fi
264  minstall()  minstall()
265  {  {
266   local abi   local abi
# Line 265  minstall_destdir() Line 293  minstall_destdir()
293   done   done
294  }  }
295    
296  # rename the old one  if [[ ! -z $(typeset -f mpatch) ]]
297  old_mpatch=old$(typeset -f mpatch)  then
298  eval "${old_mpatch}"   # rename the old one
299     old_mpatch=old$(typeset -f mpatch)
300     eval "${old_mpatch}"
301    fi
302  mpatch()  mpatch()
303  {  {
304   local abi   local abi
# Line 284  mpatch() Line 315  mpatch()
315   done   done
316  }  }
317    
318  # rename the old one  if [[ ! -z $(typeset -f mlibtoolize) ]]
319  old_mlibtoolize=old$(typeset -f mlibtoolize)  then
320  eval "${old_mlibtoolize}"   # rename the old one
321     old_mlibtoolize=old$(typeset -f mlibtoolize)
322     eval "${old_mlibtoolize}"
323    fi
324  mlibtoolize()  mlibtoolize()
325  {  {
326   local abi   local abi

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