Patchwork fix two multiarch issues

login
register
mail settings
Submitter Matthias Klose
Date Nov. 24, 2012, 2:23 a.m.
Message ID <50B02F86.3050207@ubuntu.com>
Download mbox | patch
Permalink /patch/201435/
State New
Headers show

Comments

Matthias Klose - Nov. 24, 2012, 2:23 a.m.
Fixing two multiarch issues:

 - the kfreebsd configuration gets the MULTILIB_OSDIRNAMES from the linux
   definition, which now has x32 defined. Just filter out the x32 definition,
   kfreebsd is plain 32/64 biarch.

 - the configure.ac used $withval instead of $enableval. Explicit
   --{en,dis}able-multiarch options didn't have any effect. Pointed
   out by Thorsten Glaser.

Committing these two fixes as obvious.

  Matthias

Patch

2012-11-24  Matthias Klose  <doko@ubuntu.com>

        * configure.ac (multiarch): Use $enableval instead of $withval.
        * configure: Regenerate.
        * config/i386/t-kfreebsd (MULTILIB_OSDIRNAMES): Filter out x32.

Index: configure.ac
===================================================================
--- configure.ac	(Revision 193775)
+++ configure.ac	(Arbeitskopie)
@@ -617,9 +617,9 @@ 
 AC_ARG_ENABLE(multiarch,
 [AS_HELP_STRING([--enable-multiarch],
 		[enable support for multiarch paths])],
-[case "${withval}" in
-yes|no|auto) enable_multiarch=$withval;;
-*) AC_MSG_ERROR(bad value ${withval} given for --enable-multiarch option) ;;
+[case "${enableval}" in
+yes|no|auto) enable_multiarch=$enableval;;
+*) AC_MSG_ERROR(bad value ${enableval} given for --enable-multiarch option) ;;
 esac], [enable_multiarch=auto])
 if test x${enable_multiarch} = xauto; then
   if test x${with_native_system_header_dir} != x; then
Index: config/i386/t-kfreebsd
===================================================================
--- config/i386/t-kfreebsd	(Revision 193775)
+++ config/i386/t-kfreebsd	(Arbeitskopie)
@@ -2,4 +2,4 @@ 
 
 # MULTILIB_OSDIRNAMES are set in t-linux64.
 KFREEBSD_OS = $(filter kfreebsd%, $(word 3, $(subst -, ,$(target))))
-MULTILIB_OSDIRNAMES := $(subst linux,$(KFREEBSD_OS),$(MULTILIB_OSDIRNAMES))
+MULTILIB_OSDIRNAMES := $(filter-out mx32=% $(subst linux,$(KFREEBSD_OS),$(MULTILIB_OSDIRNAMES)))
Index: configure
===================================================================
--- configure	(Revision 193775)
+++ configure	(Arbeitskopie)
@@ -7024,9 +7024,9 @@ 
 # Determine whether or not multiarch is enabled.
 # Check whether --enable-multiarch was given.
 if test "${enable_multiarch+set}" = set; then :
-  enableval=$enable_multiarch; case "${withval}" in
-yes|no|auto) enable_multiarch=$withval;;
-*) as_fn_error "bad value ${withval} given for --enable-multiarch option" "$LINENO" 5 ;;
+  enableval=$enable_multiarch; case "${enableval}" in
+yes|no|auto) enable_multiarch=$enableval;;
+*) as_fn_error "bad value ${enableval} given for --enable-multiarch option" "$LINENO" 5 ;;
 esac
 else
   enable_multiarch=auto