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

[Johannes Löthberg]

    Date: Wednesday, January 9, 2019 @ 22:44:20
  Author: demize
Revision: 421321

upgpkg: haproxy 1.9.1-1

Added:
  haproxy/trunk/0001-Use-CFLAGS-and-LDFLAGS-when-building-contrib.patch
Modified:
  haproxy/trunk/PKGBUILD

---------------------------------------------------------+
 0001-Use-CFLAGS-and-LDFLAGS-when-building-contrib.patch |   57 ++++++++++++++
 PKGBUILD                                                |   18 +++-
 2 files changed, 70 insertions(+), 5 deletions(-)

Added: 0001-Use-CFLAGS-and-LDFLAGS-when-building-contrib.patch
===================================================================
--- 0001-Use-CFLAGS-and-LDFLAGS-when-building-contrib.patch	                        (rev 0)
+++ 0001-Use-CFLAGS-and-LDFLAGS-when-building-contrib.patch	2019-01-09 22:44:20 UTC (rev 421321)
@@ -0,0 +1,57 @@
+From 53fd8dbb4ecd3f8bcf4c1f3c0bc7fe39c7be6bd7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Johannes=20L=C3=B6thberg?= <johannes at kyriasis.com>
+Date: Wed, 9 Jan 2019 23:37:02 +0100
+Subject: [PATCH] Use CFLAGS and LDFLAGS when building contrib
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Johannes Löthberg <johannes at kyriasis.com>
+---
+ contrib/halog/Makefile    | 2 +-
+ contrib/ip6range/Makefile | 2 +-
+ contrib/iprange/Makefile  | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/contrib/halog/Makefile b/contrib/halog/Makefile
+index 5e687c09..2474409a 100644
+--- a/contrib/halog/Makefile
++++ b/contrib/halog/Makefile
+@@ -16,7 +16,7 @@ DEFINE   =
+ OBJS     = halog
+ 
+ halog: halog.c fgets2.c
+-	$(CC) $(OPTIMIZE) $(DEFINE) -o $@ $(INCLUDE) $(EBTREE_DIR)/ebtree.c $(EBTREE_DIR)/eb32tree.c $(EBTREE_DIR)/eb64tree.c $(EBTREE_DIR)/ebmbtree.c $(EBTREE_DIR)/ebsttree.c $(EBTREE_DIR)/ebistree.c $(EBTREE_DIR)/ebimtree.c $^
++	$(CC) $(OPTIMIZE) $(CFLAGS) $(LDFLAGS) $(DEFINE) -o $@ $(INCLUDE) $(EBTREE_DIR)/ebtree.c $(EBTREE_DIR)/eb32tree.c $(EBTREE_DIR)/eb64tree.c $(EBTREE_DIR)/ebmbtree.c $(EBTREE_DIR)/ebsttree.c $(EBTREE_DIR)/ebistree.c $(EBTREE_DIR)/ebimtree.c $^
+ 
+ clean:
+ 	rm -f $(OBJS) *.[oas]
+diff --git a/contrib/ip6range/Makefile b/contrib/ip6range/Makefile
+index 55849b6d..1276b97d 100644
+--- a/contrib/ip6range/Makefile
++++ b/contrib/ip6range/Makefile
+@@ -7,7 +7,7 @@ OBJS     = ip6range
+ all: $(OBJS)
+ 
+ %: %.c
+-	$(CC) $(LDFLAGS) $(OPTIMIZE) -o $@ $^
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OPTIMIZE) -o $@ $^
+ 
+ clean:
+ 	rm -f $(OBJS) *.o *.a *~
+diff --git a/contrib/iprange/Makefile b/contrib/iprange/Makefile
+index b3c72eda..e92baf3d 100644
+--- a/contrib/iprange/Makefile
++++ b/contrib/iprange/Makefile
+@@ -7,7 +7,7 @@ OBJS     = iprange
+ all: $(OBJS)
+ 
+ %: %.c
+-	$(CC) $(LDFLAGS) $(OPTIMIZE) -o $@ $^
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OPTIMIZE) -o $@ $^
+ 
+ clean:
+ 	rm -f $(OBJS) *.o *.a *~
+-- 
+2.20.1
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-01-09 22:44:19 UTC (rev 421320)
+++ PKGBUILD	2019-01-09 22:44:20 UTC (rev 421321)
@@ -2,7 +2,7 @@
 # Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
 
 pkgname=haproxy
-pkgver=1.9.0
+pkgver=1.9.1
 pkgrel=1
 
 pkgdesc='Reliable, high performance TCP/HTTP load balancer'
@@ -18,12 +18,20 @@
 
 source=(https://haproxy.org/download/${pkgver%.*}/src/haproxy-$pkgver.tar.gz
         haproxy.cfg
-        haproxy.sysusers)
+        haproxy.sysusers
+        0001-Use-CFLAGS-and-LDFLAGS-when-building-contrib.patch)
 
-md5sums=('be67ae289d9261940a31e5bc9a3bf79a'
+md5sums=('7694f210115e880af4e9e62cd357aebd'
          '27941f31d25d5629f4bdef6bc4b2555a'
-         '2f00e81ee2f3f6e51a0cd9acc6f3ff3e')
+         '2f00e81ee2f3f6e51a0cd9acc6f3ff3e'
+         '5343b0563c2e0e59110a84e2e611d94f')
 
+prepare() {
+  cd haproxy-$pkgver
+
+  patch -p1 <"$srcdir"/0001-Use-CFLAGS-and-LDFLAGS-when-building-contrib.patch
+}
+
 build() {
   cd haproxy-$pkgver
 
@@ -38,7 +46,7 @@
     USE_SYSTEMD=1
 
   for contrib in halog iprange ip6range systemd; do
-    make -C contrib/$contrib SBINDIR=/usr/bin CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
+    make -C contrib/$contrib SBINDIR=/usr/bin OPTIMIZE= CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
   done
 }