| 1 |
commit: b85b0dc514e1429589ef18ca6415016f19118dbd |
| 2 |
Author: Bertrand Jacquin <bertrand <AT> jacquin <DOT> bzh> |
| 3 |
AuthorDate: Sat Sep 17 23:46:16 2016 +0000 |
| 4 |
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 28 19:53:50 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b85b0dc5 |
| 7 |
|
| 8 |
net-proxy/haproxy: Define haproxy_use() to condence emake arguments creation |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.28 |
| 11 |
Closes: https://github.com/gentoo/gentoo/pull/2293 |
| 12 |
|
| 13 |
Signed-off-by: Christian Ruppert <idl0r <AT> gentoo.org> |
| 14 |
|
| 15 |
net-proxy/haproxy/haproxy-1.6.9.ebuild | 58 +++++++++------------------------- |
| 16 |
net-proxy/haproxy/haproxy-9999.ebuild | 58 +++++++++------------------------- |
| 17 |
2 files changed, 30 insertions(+), 86 deletions(-) |
| 18 |
|
| 19 |
diff --git a/net-proxy/haproxy/haproxy-1.6.9.ebuild b/net-proxy/haproxy/haproxy-1.6.9.ebuild |
| 20 |
index 3052698..a070371 100644 |
| 21 |
--- a/net-proxy/haproxy/haproxy-1.6.9.ebuild |
| 22 |
+++ b/net-proxy/haproxy/haproxy-1.6.9.ebuild |
| 23 |
@@ -35,6 +35,12 @@ S="${WORKDIR}/${MY_P}" |
| 24 |
|
| 25 |
DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS ) |
| 26 |
|
| 27 |
+haproxy_use() { |
| 28 |
+ (( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>" |
| 29 |
+ |
| 30 |
+ usex "${1}" "USE_${2}=1" "USE_${2}=" |
| 31 |
+} |
| 32 |
+ |
| 33 |
pkg_setup() { |
| 34 |
enewgroup haproxy |
| 35 |
enewuser haproxy -1 -1 -1 haproxy |
| 36 |
@@ -60,54 +66,20 @@ src_compile() { |
| 37 |
USE_GETADDRINFO=1 |
| 38 |
) |
| 39 |
|
| 40 |
- if use crypt ; then |
| 41 |
- args+=( USE_LIBCRYPT=1 ) |
| 42 |
- else |
| 43 |
- args+=( USE_LIBCRYPT= ) |
| 44 |
- fi |
| 45 |
+ args+=( $(haproxy_use crypt LIBCRYPT) ) |
| 46 |
|
| 47 |
# bug 541042 |
| 48 |
-# if use lua; then |
| 49 |
-# args+=( USE_LUA=1 ) |
| 50 |
-# else |
| 51 |
- args+=( USE_LUA= ) |
| 52 |
-# fi |
| 53 |
+# args+=( $(haproxy_use lua LUA) ) |
| 54 |
|
| 55 |
- if use net_ns; then |
| 56 |
- args+=( USE_NS=1 ) |
| 57 |
- else |
| 58 |
- args+=( USE_NS= ) |
| 59 |
- fi |
| 60 |
+ args+=( $(haproxy_use net_ns NS) ) |
| 61 |
+ args+=( $(haproxy_use pcre PCRE) ) |
| 62 |
+ args+=( $(haproxy_use pcre-jit PCRE_JIT) ) |
| 63 |
|
| 64 |
- if use pcre ; then |
| 65 |
- args+=( USE_PCRE=1 ) |
| 66 |
- else |
| 67 |
- args+=( USE_PCRE= ) |
| 68 |
- fi |
| 69 |
+# args+=( $(haproxy_use kernel_linux LINUX_SPLICE) ) |
| 70 |
+# args+=( $(haproxy_use kernel_linux LINUX_TPROXY) ) |
| 71 |
|
| 72 |
- if use pcre-jit; then |
| 73 |
- args+=( USE_PCRE_JIT=1 ) |
| 74 |
- else |
| 75 |
- args+=( USE_PCRE_JIT= ) |
| 76 |
- fi |
| 77 |
- |
| 78 |
-# if use kernel_linux; then |
| 79 |
-# args+=( USE_LINUX_SPLICE=1 USE_LINUX_TPROXY=1 ) |
| 80 |
-# else |
| 81 |
-# args+=( USE_LINUX_SPLICE= USE_LINUX_TPROXY= ) |
| 82 |
-# fi |
| 83 |
- |
| 84 |
- if use ssl ; then |
| 85 |
- args+=( USE_OPENSSL=1 ) |
| 86 |
- else |
| 87 |
- args+=( USE_OPENSSL= ) |
| 88 |
- fi |
| 89 |
- |
| 90 |
- if use zlib ; then |
| 91 |
- args+=( USE_ZLIB=1 ) |
| 92 |
- else |
| 93 |
- args+=( USE_ZLIB= ) |
| 94 |
- fi |
| 95 |
+ args+=( $(haproxy_use ssl OPENSSL) ) |
| 96 |
+ args+=( $(haproxy_use zlib ZLIB) ) |
| 97 |
|
| 98 |
# For now, until the strict-aliasing breakage will be fixed |
| 99 |
append-cflags -fno-strict-aliasing |
| 100 |
|
| 101 |
diff --git a/net-proxy/haproxy/haproxy-9999.ebuild b/net-proxy/haproxy/haproxy-9999.ebuild |
| 102 |
index a140ddb..9499a51 100644 |
| 103 |
--- a/net-proxy/haproxy/haproxy-9999.ebuild |
| 104 |
+++ b/net-proxy/haproxy/haproxy-9999.ebuild |
| 105 |
@@ -35,6 +35,12 @@ S="${WORKDIR}/${MY_P}" |
| 106 |
|
| 107 |
DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS ) |
| 108 |
|
| 109 |
+haproxy_use() { |
| 110 |
+ (( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>" |
| 111 |
+ |
| 112 |
+ usex "${1}" "USE_${2}=1" "USE_${2}=" |
| 113 |
+} |
| 114 |
+ |
| 115 |
pkg_setup() { |
| 116 |
enewgroup haproxy |
| 117 |
enewuser haproxy -1 -1 -1 haproxy |
| 118 |
@@ -60,54 +66,20 @@ src_compile() { |
| 119 |
USE_GETADDRINFO=1 |
| 120 |
) |
| 121 |
|
| 122 |
- if use crypt ; then |
| 123 |
- args+=( USE_LIBCRYPT=1 ) |
| 124 |
- else |
| 125 |
- args+=( USE_LIBCRYPT= ) |
| 126 |
- fi |
| 127 |
+ args+=( $(haproxy_use crypt LIBCRYPT) ) |
| 128 |
|
| 129 |
# bug 541042 |
| 130 |
-# if use lua; then |
| 131 |
-# args+=( USE_LUA=1 ) |
| 132 |
-# else |
| 133 |
- args+=( USE_LUA= ) |
| 134 |
-# fi |
| 135 |
+# args+=( $(haproxy_use lua LUA) ) |
| 136 |
|
| 137 |
- if use net_ns; then |
| 138 |
- args+=( USE_NS=1 ) |
| 139 |
- else |
| 140 |
- args+=( USE_NS= ) |
| 141 |
- fi |
| 142 |
+ args+=( $(haproxy_use net_ns NS) ) |
| 143 |
+ args+=( $(haproxy_use pcre PCRE) ) |
| 144 |
+ args+=( $(haproxy_use pcre-jit PCRE_JIT) ) |
| 145 |
|
| 146 |
- if use pcre ; then |
| 147 |
- args+=( USE_PCRE=1 ) |
| 148 |
- else |
| 149 |
- args+=( USE_PCRE= ) |
| 150 |
- fi |
| 151 |
+# args+=( $(haproxy_use kernel_linux LINUX_SPLICE) ) |
| 152 |
+# args+=( $(haproxy_use kernel_linux LINUX_TPROXY) ) |
| 153 |
|
| 154 |
- if use pcre-jit; then |
| 155 |
- args+=( USE_PCRE_JIT=1 ) |
| 156 |
- else |
| 157 |
- args+=( USE_PCRE_JIT= ) |
| 158 |
- fi |
| 159 |
- |
| 160 |
-# if use kernel_linux; then |
| 161 |
-# args+=( USE_LINUX_SPLICE=1 USE_LINUX_TPROXY=1 ) |
| 162 |
-# else |
| 163 |
-# args+=( USE_LINUX_SPLICE= USE_LINUX_TPROXY= ) |
| 164 |
-# fi |
| 165 |
- |
| 166 |
- if use ssl ; then |
| 167 |
- args+=( USE_OPENSSL=1 ) |
| 168 |
- else |
| 169 |
- args+=( USE_OPENSSL= ) |
| 170 |
- fi |
| 171 |
- |
| 172 |
- if use zlib ; then |
| 173 |
- args+=( USE_ZLIB=1 ) |
| 174 |
- else |
| 175 |
- args+=( USE_ZLIB= ) |
| 176 |
- fi |
| 177 |
+ args+=( $(haproxy_use ssl OPENSSL) ) |
| 178 |
+ args+=( $(haproxy_use zlib ZLIB) ) |
| 179 |
|
| 180 |
# For now, until the strict-aliasing breakage will be fixed |
| 181 |
append-cflags -fno-strict-aliasing |
Archives