[arch-commits] Commit in devtools/trunk (2 files)

[Bartłomiej Piotrowski]

    Date: Tuesday, July 4, 2017 @ 10:14:08
  Author: bpiotrowski
Revision: 299660

20170320-3: sync makepkg.conf files with pacman-5.0.2-2

Added:
  devtools/trunk/0002-Sync-makepkg.conf-files-with-pacman-5.0.2-2.patch
Modified:
  devtools/trunk/PKGBUILD

--------------------------------------------------------+
 0002-Sync-makepkg.conf-files-with-pacman-5.0.2-2.patch |   47 +++++++++++++++
 PKGBUILD                                               |    9 +-
 2 files changed, 53 insertions(+), 3 deletions(-)

Added: 0002-Sync-makepkg.conf-files-with-pacman-5.0.2-2.patch
===================================================================
--- 0002-Sync-makepkg.conf-files-with-pacman-5.0.2-2.patch	                        (rev 0)
+++ 0002-Sync-makepkg.conf-files-with-pacman-5.0.2-2.patch	2017-07-04 10:14:08 UTC (rev 299660)
@@ -0,0 +1,47 @@
+From c9b1fc08b5f63c9f6bb1a992431c661129ab2db1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= <b at bpiotrowski.pl>
+Date: Tue, 4 Jul 2017 12:04:51 +0200
+Subject: [PATCH] Sync makepkg.conf files with pacman 5.0.2-2
+
+---
+ makepkg-i686.conf   | 6 +++---
+ makepkg-x86_64.conf | 6 +++---
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/makepkg-i686.conf b/makepkg-i686.conf
+index c565795..e57988f 100644
+--- a/makepkg-i686.conf
++++ b/makepkg-i686.conf
+@@ -37,9 +37,9 @@ CHOST="i686-pc-linux-gnu"
+ # -march (or -mcpu) builds exclusively for an architecture
+ # -mtune optimizes for an architecture, but builds for whole processor family
+ CPPFLAGS="-D_FORTIFY_SOURCE=2"
+-CFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector-strong"
+-CXXFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector-strong"
+-LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro"
++CFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt"
++CXXFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt"
++LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
+ #-- Make Flags: change this for DistCC/SMP systems
+ #MAKEFLAGS="-j2"
+ #-- Debugging flags
+diff --git a/makepkg-x86_64.conf b/makepkg-x86_64.conf
+index 058da9b..7aa192e 100644
+--- a/makepkg-x86_64.conf
++++ b/makepkg-x86_64.conf
+@@ -37,9 +37,9 @@ CHOST="x86_64-pc-linux-gnu"
+ # -march (or -mcpu) builds exclusively for an architecture
+ # -mtune optimizes for an architecture, but builds for whole processor family
+ CPPFLAGS="-D_FORTIFY_SOURCE=2"
+-CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong"
+-CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong"
+-LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro"
++CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt"
++CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt"
++LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
+ #-- Make Flags: change this for DistCC/SMP systems
+ #MAKEFLAGS="-j2"
+ #-- Debugging flags
+-- 
+2.13.2
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-07-04 09:35:46 UTC (rev 299659)
+++ PKGBUILD	2017-07-04 10:14:08 UTC (rev 299660)
@@ -3,7 +3,7 @@
 
 pkgname=devtools
 pkgver=20170320
-pkgrel=2
+pkgrel=3
 pkgdesc='Tools for Arch Linux package maintainers'
 arch=('any')
 license=('GPL')
@@ -10,7 +10,8 @@
 url='http://projects.archlinux.org/devtools.git/'
 depends=('namcap' 'openssh' 'subversion' 'rsync' 'arch-install-scripts')
 source=("https://sources.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}
-        '0001-makechrootpkg-Delete-chroot-subvols-recursively-when.patch')
+        '0001-makechrootpkg-Delete-chroot-subvols-recursively-when.patch'
+        '0002-Sync-makepkg.conf-files-with-pacman-5.0.2-2.patch')
 validpgpkeys=('487EACC08557AD082088DABA1EB2638FF56C0C53'
               '4AA4767BBC9C4B1D18AE28B77F2D434B9741E8AC'
               '86CFFCA918CF3AF47147588051E8B148A9999C34'
@@ -18,11 +19,13 @@
               '8218F88849AAC522E94CF470A5E9288C4FA415FA')
 md5sums=('e401f4e3d1074b80060390b9812766f1'
          'SKIP'
-         '678ec14b148dbe88cbac92a1cefa57d5')
+         '678ec14b148dbe88cbac92a1cefa57d5'
+         'a5b4e14d9870cfcf0f841b438ee0d8cc')
 
 prepare() {
 	cd "${pkgname}-${pkgver}"
 	patch -Np1 -i ../0001-makechrootpkg-Delete-chroot-subvols-recursively-when.patch
+	patch -Np1 -i ../0002-Sync-makepkg.conf-files-with-pacman-5.0.2-2.patch
 }
 
 build() {