[arch-commits] Commit in pacman/trunk (PKGBUILD makepkg.conf)

[Allan McRae]

    Date: Tuesday, April 24, 2012 @ 00:46:50
  Author: allan
Revision: 157116

remove --hash-style=gnu from LDFLAGS as this is default in our gcc-4.7 package, move whitespace from PKGBUILD to makepkg.conf

Modified:
  pacman/trunk/PKGBUILD
  pacman/trunk/makepkg.conf

--------------+
 PKGBUILD     |    6 +++---
 makepkg.conf |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-04-24 00:17:32 UTC (rev 157115)
+++ PKGBUILD	2012-04-24 04:46:50 UTC (rev 157116)
@@ -26,7 +26,7 @@
          '1a70392526c8768470da678b31905a6e'
          '4605b3490d4fd1e5c6e20db17da9ded6'
          'a0edf98ad1845a4c7d902a86638d5d2d'
-         'db051afbd12993b7743ccd4d58668499')
+         '589cd34eb9d5b678455e8289394f523e')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -51,13 +51,13 @@
       install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf
       mycarch="i686"
       mychost="i686-pc-linux-gnu"
-      myflags="-march=i686 "
+      myflags="-march=i686"
       ;;
     x86_64)
       install -m644 $srcdir/pacman.conf.x86_64 $pkgdir/etc/pacman.conf
       mycarch="x86_64"
       mychost="x86_64-unknown-linux-gnu"
-      myflags="-march=x86-64 "
+      myflags="-march=x86-64"
       ;;
   esac
   install -m644 $srcdir/makepkg.conf $pkgdir/etc/

Modified: makepkg.conf
===================================================================
--- makepkg.conf	2012-04-24 00:17:32 UTC (rev 157115)
+++ makepkg.conf	2012-04-24 04:46:50 UTC (rev 157116)
@@ -29,9 +29,9 @@
 #-- Compiler and Linker Flags
 # -march (or -mcpu) builds exclusively for an architecture
 # -mtune optimizes for an architecture, but builds for whole processor family
-CFLAGS="@CARCHFLAGS at -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
-CXXFLAGS="@CARCHFLAGS at -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
-LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,--hash-style=gnu"
+CFLAGS="@CARCHFLAGS@ -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
+CXXFLAGS="@CARCHFLAGS@ -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
+LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro"
 #-- Make Flags: change this for DistCC/SMP systems
 #MAKEFLAGS="-j2"