Date: Monday, February 12, 2007 @ 20:25:26 Author: aaron Path: /home/cvs-pacman/pacman-lib Modified: configure.ac (1.31 -> 1.32) etc/makepkg.conf.in (1.12 -> 1.13) Changed "MARCHFLAG" to "ARCHSWITCH" as the name was confusing (it's not a FLAG and not always MARCH). Also changes makepkg.conf.in to not have commented -mcpu lines (due to the above), but to have a comment about the differences in -march and -mcpu ---------------------+ configure.ac | 26 +++++++++++++------------- etc/makepkg.conf.in | 9 ++++----- 2 files changed, 17 insertions(+), 18 deletions(-) Index: pacman-lib/configure.ac diff -u pacman-lib/configure.ac:1.31 pacman-lib/configure.ac:1.32 --- pacman-lib/configure.ac:1.31 Mon Feb 12 19:57:08 2007 +++ pacman-lib/configure.ac Mon Feb 12 20:25:26 2007 @@ -63,51 +63,51 @@ case "$host" in i686-*) AC_DEFINE_UNQUOTED([CARCH], ["i686"], [Architecture]) AC_DEFINE_UNQUOTED([CARCHFLAGS], ["i686"], [Architecture]) - AC_DEFINE_UNQUOTED([MARCHFLAG], ["march"], [Architecture]) + AC_DEFINE_UNQUOTED([ARCHSWITCH], ["march"], [Architecture]) CARCH="i686" CARCHFLAGS="i686" - MARCHFLAG="march" + ARCHSWITCH="march" CHOST="${host}" ;; x86_64-*) AC_DEFINE_UNQUOTED([CARCH], ["x86_64"], [Architecture]) AC_DEFINE_UNQUOTED([CARCHFLAGS], ["x86-64"], [Architecture]) - AC_DEFINE_UNQUOTED([MARCHFLAG], ["march"], [Architecture]) + AC_DEFINE_UNQUOTED([ARCHSWITCH], ["march"], [Architecture]) CARCH="x86_64" CARCHFLAGS="x86-64" - MARCHFLAG="march" + ARCHSWITCH="march" CHOST="${host}" ;; ia64-*) AC_DEFINE_UNQUOTED([CARCH], ["ia64"], [Architecture]) AC_DEFINE_UNQUOTED([CARCHFLAGS], ["ia64"], [Architecture]) - AC_DEFINE_UNQUOTED([MARCHFLAG], ["march"], [Architecture]) + AC_DEFINE_UNQUOTED([ARCHSWITCH], ["march"], [Architecture]) CARCH="ia64" CARCHFLAGS="ia64" - MARCHFLAG="march" + ARCHSWITCH="march" CHOST="${host}" ;; sparc-*) AC_DEFINE_UNQUOTED([CARCH], ["sparc"], [Architecture]) AC_DEFINE_UNQUOTED([CARCHFLAGS], ["v9"], [Architecture]) - AC_DEFINE_UNQUOTED([MARCHFLAG], ["mcpu"], [Architecture]) + AC_DEFINE_UNQUOTED([ARCHSWITCH], ["mcpu"], [Architecture]) CARCH="sparc" CARCHFLAGS="v9" - MARCHFLAG="mcpu" + ARCHSWITCH="mcpu" CHOST="${host}" ;; ppc-* | powerpc-*) AC_DEFINE_UNQUOTED([CARCH], ["ppc"], [Architecture]) AC_DEFINE_UNQUOTED([CARCHFLAGS], ["750"], [Architecture]) - AC_DEFINE_UNQUOTED([MARCHFLAG], ["mcpu"], [Architecture]) + AC_DEFINE_UNQUOTED([ARCHSWITCH], ["mcpu"], [Architecture]) CARCH="ppc" CARCHFLAGS="750" - MARCHFLAG="mcpu" + ARCHSWITCH="mcpu" CHOST="${host}" ;; i386-*) AC_DEFINE_UNQUOTED([CARCH], ["i386"], [Architecture]) AC_DEFINE_UNQUOTED([CARCHFLAGS], ["i386"], [Architecture]) - AC_DEFINE_UNQUOTED([MARCHFLAG], ["march"], [Architecture]) + AC_DEFINE_UNQUOTED([ARCHSWITCH], ["march"], [Architecture]) CARCH="i386" CARCHFLAGS="i386" - MARCHFLAG="march" + ARCHSWITCH="march" CHOST="${host}" ;; *) @@ -117,7 +117,7 @@ AC_SUBST(CARCH) AC_SUBST(CARCHFLAGS) -AC_SUBST(MARCHFLAG) +AC_SUBST(ARCHSWITCH) AC_SUBST(CHOST) dnl Help line for config file Index: pacman-lib/etc/makepkg.conf.in diff -u pacman-lib/etc/makepkg.conf.in:1.12 pacman-lib/etc/makepkg.conf.in:1.13 --- pacman-lib/etc/makepkg.conf.in:1.12 Tue Feb 6 17:36:13 2007 +++ pacman-lib/etc/makepkg.conf.in Mon Feb 12 20:25:26 2007 @@ -19,11 +19,10 @@ CHOST="@CHOST@" #-- Exclusive: will only run on @CARCHFLAGS@ -CFLAGS="-@MARCHFLAG@=@CARCHFLAGS@ -O2 -pipe" -CXXFLAGS="-@MARCHFLAG@=@CARCHFLAGS@ -O2 -pipe" -#-- Optimized: will run on any x86, but optimized for i686 -#CFLAGS="-mcpu=i686 -O2 -pipe" -#CXXFLAGS="-mcpu=i686 -O2 -pipe" +# -mtune builds exclusively for an architecture +# -mcpu optimizes for an architecture, but builds for the whole processor family +CFLAGS="-@ARCHSWITCH@=@CARCHFLAGS@ -O2 -pipe" +CXXFLAGS="-@ARCHSWITCH@=@CARCHFLAGS@ -O2 -pipe" #-- Make Flags: change this for DistCC/SMP systems #MAKEFLAGS="-j2"