Merge pull request #1216 from ryzhovau/halog_linkage

[feed/packages.git] / net / haproxy / Makefile

diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile
index 7ed23696d2e2f8c32b13e10094c560eca2204111..1a71856a9526b8325c05e1fe049a98568f45c0ff 100644 (file)
--- a/net/haproxy/Makefile
+++ b/net/haproxy/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=haproxy
 PKG_VERSION:=1.5.11
-PKG_RELEASE:=09
+PKG_RELEASE:=10
 PKG_SOURCE:=haproxy-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://haproxy.1wt.eu/download/1.5/src/
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
@@ -88,7 +88,7 @@ define Build/Compile
                CFLAGS="$(TARGET_CFLAGS) -fno-align-jumps -fno-align-functions -fno-align-labels -fno-align-loops -pipe -fomit-frame-pointer -fhonour-copts" \
                LD="$(TARGET_CC)" \
                LDFLAGS="$(TARGET_LDFLAGS)" \
-               PCREDIR="$(STAGING_DIR)/usr/include" \
+               PCREDIR="$(STAGING_DIR)/usr" \
                SMALL_OPTS="-DBUFSIZE=16384 -DMAXREWRITE=1030 -DSYSTEM_MAXCONN=165530 " \
                USE_LINUX_TPROXY=1 USE_LINUX_SPLICE=1 USE_REGPARM=1 $(USE_OPENSSL) \
                USE_ZLIB=yes USE_PCRE=1 \
@@ -96,12 +96,8 @@ define Build/Compile
                install
 
        $(MAKE) -C $(PKG_BUILD_DIR)/contrib/halog \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               CC="$(TARGET_CC)" \
-               CFLAGS="$(TARGET_CFLAGS) -fno-align-jumps -fno-align-functions -fno-align-labels -fno-align-loops -pipe -fomit-frame-pointer -fhonour-copts" \
-               LD="$(TARGET_CC)" \
-               LDFLAGS="$(TARGET_LDFLAGS)" \
-               VERSION="$(PKG_VERSION)-patch$(PKG_RELEASE)" \
+               CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS)" \
+               OPTIMIZE="" \
                halog
 endef