Message ID | 55005344.3000500@ubuntu.com |
---|---|
State | New |
Headers | show |
On Wed, Mar 11, 2015 at 7:37 AM, Matthias Klose <doko@ubuntu.com> wrote: > current trunk fails to build on x86*-linux, when configured for x32 multilibs > because libmpx doesn't support these. Disable them. > > ok for the trunk? > > * Disable libmpx x32 multilib builds. > > --- a/config-ml.in > +++ b/config-ml.in > @@ -102,6 +102,7 @@ > Makefile=${ac_file-Makefile} > ml_config_shell=${CONFIG_SHELL-/bin/sh} > ml_realsrcdir=${srcdir} > +ml_srcbase=`basename $ml_realsrcdir` > > # Scan all the arguments and set all the ones we need. > > @@ -220,6 +221,10 @@ > if [ "${dir}" = "." ]; then > true > else > + # libmpx is not supported on x32 > + if [ "${ml_srcbase}-${dir}" = libmpx-x32 ]; then > + continue > + fi > if [ -z "${multidirs}" ]; then > multidirs="${dir}" > else This is incorrect. Ilya and I are working on a proper fix.
--- a/config-ml.in +++ b/config-ml.in @@ -102,6 +102,7 @@ Makefile=${ac_file-Makefile} ml_config_shell=${CONFIG_SHELL-/bin/sh} ml_realsrcdir=${srcdir} +ml_srcbase=`basename $ml_realsrcdir` # Scan all the arguments and set all the ones we need. @@ -220,6 +221,10 @@ if [ "${dir}" = "." ]; then true else + # libmpx is not supported on x32 + if [ "${ml_srcbase}-${dir}" = libmpx-x32 ]; then + continue + fi if [ -z "${multidirs}" ]; then multidirs="${dir}" else