[SCM] mpg123/master: Check if DEB_HOST_ARCH_CPU is i386 instead of i486.

[micove-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit f8b69912465245462064f625add1872710112d5b
Author: Miguel A. Colón Vélez <debian.micove at gmail.com>
Date:   Tue Dec 2 20:48:22 2014 -0500

    Check if DEB_HOST_ARCH_CPU is i386 instead of i486.
    
    This code used to use the variable DEB_HOST_GNU_CPU but it got
    changed to use DEB_HOST_ARCH_CPU without updating the CONF_ for i386.
    Checking the file /usr/share/dpkg/cputable it says that the current
    mapping between the two is:
    ARCH <=> GNU
    i386 <=> i586
    arm <=> arm
    For arm it was equivalent but for i386 it was not.
    .
    Since DEB_HOST_ARCH_CPU is always i386 then CONF_i486 was never used so mpg123
    and the default behaviour of mpg123 happened.
    if DEB_HOST_GNU_CPU=i386 => cpu_type="i386_fpu"
    if DEB_HOST_GNU_CPU=i486 => cpu_type="i486"
    if DEB_HOST_GNU_CPU=i586 => cpu_type="x86"
    if DEB_HOST_GNU_CPU=i686 => cpu_type="x86"
    .
    Following the recommendation from upstream in bug #751800 this commit does
    if DEB_HOST_GNU_CPU=i386 => cpu_type="x86"
    if DEB_HOST_GNU_CPU=i486 => cpu_type="x86"
    if DEB_HOST_GNU_CPU=i586 => cpu_type="x86"
    if DEB_HOST_GNU_CPU=i686 => cpu_type="x86"
    .
    At the time of bug #751800 DEB_HOST_GNU_CPU was i486 therefore the bug.
    Currently DEB_HOST_GNU_CPU=i586 in i386.
    .
    I checked the build logs for 1.20.1-2 ann:
    hurd-i386      uses cpu_type="i486"
    kfreebsd-i386  uses cpu_type="x86"
    i386           uses cpu_type="x86"
    .
    Therefore currently bug #751800 only affects hurd-i386 or other distros that
    still use i386|486.
    .
    Closes: 751800

diff --git a/debian/rules b/debian/rules
index afb0185..b68b3dc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,7 @@ endif
 CONF_COMMON:=--enable-static=no --enable-shared --enable-lfs-alias \
 	--with-module-suffix=.so
 
-CONF_i486:=--with-cpu=x86_dither
+CONF_i386:=--with-cpu=x86_dither
 CONF_arm:=--with-cpu=generic_fpu
 
 SOVERSION:=0

-- 
mpg123 packaging