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 5485 by niro, Tue Jun 29 23:01:28 2010 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   export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig"   then
66     export LDFLAGS="-L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}"
67     fi
68     # 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}'"
74   echo -e "${COLBLUE}*** ${COLGREEN}  CC${COLDEFAULT}='${CC}'"   echo -e "${COLBLUE}*** ${COLGREEN}  CC${COLDEFAULT}='${CC}'"
75   echo -e "${COLBLUE}*** ${COLGREEN}  CXX${COLDEFAULT}='${CXX}'"   echo -e "${COLBLUE}*** ${COLGREEN}  CXX${COLDEFAULT}='${CXX}'"
76   echo -e "${COLBLUE}*** ${COLGREEN}  ABI_LIBDIR${COLDEFAULT}='${ABI_LIBDIR}'"   echo -e "${COLBLUE}*** ${COLGREEN}  ABI_LIBDIR${COLDEFAULT}='${ABI_LIBDIR}'"
77   echo -e "${COLBLUE}*** ${COLGREEN}  LDFLAGS${COLDEFAULT}='${LDFLAGS}'"   if [[ ${EXPORT_ABI_LDFLAGS} != false ]]
78     then
79     echo -e "${COLBLUE}*** ${COLGREEN}  LDFLAGS${COLDEFAULT}='${LDFLAGS}'"
80     else
81     echo -e "${COLBLUE}*** ${COLGREEN}  LDFLAGS${COLDEFAULT}='${COLYELLOW}not exported${COLDEFAULT}'"
82     fi
83   echo -e "${COLBLUE}*** ${COLGREEN}  PKG_CONFIG_PATH${COLDEFAULT}='${PKG_CONFIG_PATH}'"   echo -e "${COLBLUE}*** ${COLGREEN}  PKG_CONFIG_PATH${COLDEFAULT}='${PKG_CONFIG_PATH}'"
84    
85   # configure a linux32 emulated build   # configure a linux32 emulated build
# Line 84  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 100  abi-m64() Line 112  abi-m64()
112   export CC="gcc -${ABI}"   export CC="gcc -${ABI}"
113   export CXX="g++ -${ABI}"   export CXX="g++ -${ABI}"
114   export ABI_LIBDIR="lib64"   export ABI_LIBDIR="lib64"
115   export LDFLAGS="-L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}"   if [[ ${EXPORT_ABI_LDFLAGS} != false ]]
116   export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig"   then
117     export LDFLAGS="-L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}"
118     fi
119     # 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}'"
125   echo -e "${COLBLUE}*** ${COLGREEN}  CC${COLDEFAULT}='${CC}'"   echo -e "${COLBLUE}*** ${COLGREEN}  CC${COLDEFAULT}='${CC}'"
126   echo -e "${COLBLUE}*** ${COLGREEN}  CXX${COLDEFAULT}='${CXX}'"   echo -e "${COLBLUE}*** ${COLGREEN}  CXX${COLDEFAULT}='${CXX}'"
127   echo -e "${COLBLUE}*** ${COLGREEN}  ABI_LIBDIR${COLDEFAULT}='${ABI_LIBDIR}'"   echo -e "${COLBLUE}*** ${COLGREEN}  ABI_LIBDIR${COLDEFAULT}='${ABI_LIBDIR}'"
128   echo -e "${COLBLUE}*** ${COLGREEN}  LDFLAGS${COLDEFAULT}='${LDFLAGS}'"   if [[ ${EXPORT_ABI_LDFLAGS} != false ]]
129     then
130     echo -e "${COLBLUE}*** ${COLGREEN}  LDFLAGS${COLDEFAULT}='${LDFLAGS}'"
131     else
132     echo -e "${COLBLUE}*** ${COLGREEN}  LDFLAGS${COLDEFAULT}='${COLYELLOW}not exported${COLDEFAULT}'"
133     fi
134   echo -e "${COLBLUE}*** ${COLGREEN}  CHOST${COLDEFAULT}='${CHOST}'"   echo -e "${COLBLUE}*** ${COLGREEN}  CHOST${COLDEFAULT}='${CHOST}'"
135   echo -e "${COLBLUE}*** ${COLGREEN}  PKG_CONFIG_PATH${COLDEFAULT}='${PKG_CONFIG_PATH}'"   echo -e "${COLBLUE}*** ${COLGREEN}  PKG_CONFIG_PATH${COLDEFAULT}='${PKG_CONFIG_PATH}'"
136    
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 174  all-abis() Line 198  all-abis()
198  # multilib compile functions  # multilib compile functions
199  ##  ##
200    
201  # rename the old one  if [[ ! -z $(typeset -f mconfigure) ]]
202  old_mconfigure=old$(typeset -f mconfigure)  then
203  eval ${old_mconfigure}   # rename the old one
204     old_mconfigure=old$(typeset -f mconfigure)
205     eval "${old_mconfigure}"
206    fi
207  mconfigure()  mconfigure()
208  {  {
209   local abi   local abi
# Line 192  mconfigure() Line 219  mconfigure()
219   done   done
220  }  }
221    
222  # rename the old one  if [[ ! -z $(typeset -f cmake_configure) ]]
223  old_munpack=old$(typeset -f munpack)  then
224  eval "${old_munpack}"   # rename the old one
225     old_cmake_configure=old$(typeset -f cmake_configure)
226     eval "${old_cmake_configure}"
227    fi
228    cmake_configure()
229    {
230     local abi
231     local abis_to_run="${MULTILIB_ABIS}"
232    
233     # respect MULTILIB_ONLY_ABI variable
234     [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
235    
236     local saved_SRCDIR="${SRCDIR}"
237     for abi in ${abis_to_run}
238     do
239     SRCDIR="${saved_SRCDIR}-${abi}"
240     cd ${SRCDIR}
241     abi-${abi} oldcmake_configure $@ || die
242     done
243    }
244    
245    if [[ ! -z $(typeset -f munpack) ]]
246    then
247     # rename the old one
248     old_munpack=old$(typeset -f munpack)
249     eval "${old_munpack}"
250    fi
251  munpack()  munpack()
252  {  {
253   local abi   local abi
254   local abis_to_run="${MULTILIB_ABIS}"   local abis_to_run="${MULTILIB_ABIS}"
255     local dest="$2"
256    
257   # respect MULTILIB_ONLY_ABI variable   # respect MULTILIB_ONLY_ABI variable
258   [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"   [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
# Line 206  munpack() Line 260  munpack()
260   for abi in ${abis_to_run}   for abi in ${abis_to_run}
261   do   do
262   echo -e "${COLBLUE}*** ${COLGREEN}unpacking for ABI -${abi}${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}unpacking for ABI -${abi}${COLDEFAULT}"
263   oldmunpack ${SRCFILE} || die   oldmunpack ${SRCFILE} ${dest} || die
264   mv ${SRCDIR} ${SRCDIR}-${abi} || die   mv ${SRCDIR} ${SRCDIR}-${abi} || die
265   done   done
266  }  }
267    
268  # rename the old one  if [[ ! -z $(typeset -f mmake) ]]
269  old_mmake=old$(typeset -f mmake)  then
270  eval "${old_mmake}"   # rename the old one
271     old_mmake=old$(typeset -f mmake)
272     eval "${old_mmake}"
273    fi
274  mmake()  mmake()
275  {  {
276   local abi   local abi
# Line 230  mmake() Line 287  mmake()
287   done   done
288  }  }
289    
290  # rename the old one  if [[ ! -z $(typeset -f minstall) ]]
291  old_minstall=old$(typeset -f minstall)  then
292  eval "${old_minstall}"   # rename the old one
293     old_minstall=old$(typeset -f minstall)
294     eval "${old_minstall}"
295    fi
296  minstall()  minstall()
297  {  {
298   local abi   local abi
# Line 265  minstall_destdir() Line 325  minstall_destdir()
325   done   done
326  }  }
327    
328  # rename the old one  if [[ ! -z $(typeset -f mpatch) ]]
329  old_mpatch=old$(typeset -f mpatch)  then
330  eval "${old_mpatch}"   # rename the old one
331     old_mpatch=old$(typeset -f mpatch)
332     eval "${old_mpatch}"
333    fi
334  mpatch()  mpatch()
335  {  {
336   local abi   local abi
# Line 284  mpatch() Line 347  mpatch()
347   done   done
348  }  }
349    
350  # rename the old one  if [[ ! -z $(typeset -f mlibtoolize) ]]
351  old_mlibtoolize=old$(typeset -f mlibtoolize)  then
352  eval "${old_mlibtoolize}"   # rename the old one
353     old_mlibtoolize=old$(typeset -f mlibtoolize)
354     eval "${old_mlibtoolize}"
355    fi
356  mlibtoolize()  mlibtoolize()
357  {  {
358   local abi   local abi

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