|
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
|
10
|
10
|
|
11
|
11
|
PKG_NAME:=haproxy
|
12
|
12
|
PKG_VERSION:=1.5.4
|
13
|
|
-PKG_RELEASE:=14
|
|
13
|
+PKG_RELEASE:=15
|
14
|
14
|
PKG_SOURCE:=haproxy-$(PKG_VERSION).tar.gz
|
15
|
15
|
PKG_SOURCE_URL:=http://haproxy.1wt.eu/download/1.5/src/
|
16
|
16
|
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
|
|
@@ -76,17 +76,11 @@ else
|
76
|
76
|
endif
|
77
|
77
|
|
78
|
78
|
ifeq ($(BUILD_VARIANT),ssl)
|
79
|
|
- ADDLIB:=-lcrypt
|
80
|
79
|
USE_OPENSSL=USE_OPENSSL=1
|
81
|
80
|
else
|
82
|
|
- ADDLIB:=
|
83
|
81
|
USE_OPENSSL=
|
84
|
82
|
endif
|
85
|
83
|
|
86
|
|
-
|
87
|
|
-
|
88
|
|
-
|
89
|
|
-
|
90
|
84
|
define Build/Compile
|
91
|
85
|
$(MAKE) TARGET=$(LINUX_TARGET) -C $(PKG_BUILD_DIR) \
|
92
|
86
|
DESTDIR="$(PKG_INSTALL_DIR)" \
|
|
@@ -94,7 +88,6 @@ define Build/Compile
|
94
|
88
|
CFLAGS="$(TARGET_CFLAGS) -fno-align-jumps -fno-align-functions -fno-align-labels -fno-align-loops -pipe -fomit-frame-pointer -fhonour-copts" \
|
95
|
89
|
LD="$(TARGET_CC)" \
|
96
|
90
|
LDFLAGS="$(TARGET_LDFLAGS)" \
|
97
|
|
- ADDLIB="$(ADDLIB)" \
|
98
|
91
|
PCREDIR="$(STAGING_DIR)/usr/include" \
|
99
|
92
|
SMALL_OPTS="-DBUFSIZE=16384 -DMAXREWRITE=1030 -DSYSTEM_MAXCONN=165530 " \
|
100
|
93
|
USE_LINUX_TPROXY=1 USE_LINUX_SPLICE=1 USE_REGPARM=1 $(USE_OPENSSL) \
|
|
@@ -108,7 +101,6 @@ define Build/Compile
|
108
|
101
|
CFLAGS="$(TARGET_CFLAGS) -fno-align-jumps -fno-align-functions -fno-align-labels -fno-align-loops -pipe -fomit-frame-pointer -fhonour-copts" \
|
109
|
102
|
LD="$(TARGET_CC)" \
|
110
|
103
|
LDFLAGS="$(TARGET_LDFLAGS)" \
|
111
|
|
- ADDLIB="$(ADDLIB)" \
|
112
|
104
|
VERSION="$(PKG_VERSION)-patch$(PKG_RELEASE)" \
|
113
|
105
|
halog
|
114
|
106
|
endef
|