diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-05-30 11:44:06 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-05-30 11:44:06 +0100 |
| commit | f516638b7fe9592837389826a6152a7e1b251c54 (patch) | |
| tree | 8bfecb640b7b6403d7a3d662d923eed630033da7 /net-proxy/haproxy | |
| parent | 1a61119f9f7b057830e2ce0563f913ec86f282ad (diff) | |
gentoo resync : 30.05.2020
Diffstat (limited to 'net-proxy/haproxy')
| -rw-r--r-- | net-proxy/haproxy/Manifest | 4 | ||||
| -rw-r--r-- | net-proxy/haproxy/haproxy-2.0.14-r1.ebuild | 9 | ||||
| -rw-r--r-- | net-proxy/haproxy/haproxy-2.1.4-r1.ebuild | 9 |
3 files changed, 16 insertions, 6 deletions
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest index 86b224168eb1..b17ffeca3a4b 100644 --- a/net-proxy/haproxy/Manifest +++ b/net-proxy/haproxy/Manifest @@ -12,10 +12,10 @@ EBUILD haproxy-1.8.9.ebuild 4885 BLAKE2B beb86eb5714d77b8dad4ac0abc55b46a0e4727c EBUILD haproxy-1.9.15-r1.ebuild 4997 BLAKE2B 72c880344b1c4b61f7a75fa8552d9bc4aea4c7eaeb5a158ea20a5f99a2d811e2c09dd553e70ef33ae0451079fb456ae8670f7ce25b41d53f7e620731bc3e62d0 SHA512 3ba9487968a62978abe58be3bbb2bcc6ab64a3991abb4aad49494b996715f0c69691a31d59b91e4a1601f990684bc05ca10ee8aace38015ada892abb30491c34 EBUILD haproxy-1.9.15.ebuild 5018 BLAKE2B fa166d23ef442cba45d4362ff480946dda97f3fca49cfc11bdafbc82c2c6ffd158d788af4b8218983a17a604623b0b97d08b670382f807b3143ee51e25a7711b SHA512 7eb2b7e1010ae2e962db93aff0740c875dfacea4b976c5378b5f81e4f5406a5ab6b33a86945301e4520c8d120597fed632d798849a874be485a27faf81005ac7 EBUILD haproxy-1.9.9999.ebuild 4997 BLAKE2B 72c880344b1c4b61f7a75fa8552d9bc4aea4c7eaeb5a158ea20a5f99a2d811e2c09dd553e70ef33ae0451079fb456ae8670f7ce25b41d53f7e620731bc3e62d0 SHA512 3ba9487968a62978abe58be3bbb2bcc6ab64a3991abb4aad49494b996715f0c69691a31d59b91e4a1601f990684bc05ca10ee8aace38015ada892abb30491c34 -EBUILD haproxy-2.0.14-r1.ebuild 5224 BLAKE2B 65616d45e46a318de40c7edd0a12843741784181a62f6991b49137fb2e04e479634851138b2ead576c82d3e8160d0e6706ce78da9bb81addf41ef6e2ecd18f4a SHA512 e6b4a5f154e17f96d124ccb723ab5bdcb389f89995a98e65d2f3199780d502b99da4defdba724c13ec6889bf82ec332e5757383c6b7cdd8b01786689e58e872b +EBUILD haproxy-2.0.14-r1.ebuild 5345 BLAKE2B df4570054d3ed94729d8d1b7414a61798973c716f68631ce4f487902e4d0f04ab0fb93cf45b5104c8c4b9541787f12c1cb00e72809447b9a6484ca15322e00e7 SHA512 6bad2f674656e9ed6277c691962cab5add403d6b4ceb7a65f5b7d4e6da4fdf50888c6b9f9a6aee74b8de0dc8f433e93b7c1c0e337a90f64f9be2a3389190ca85 EBUILD haproxy-2.0.14.ebuild 5242 BLAKE2B 208fe423b99ed61c827ff682764eabc638d60c9821b6a3bed62dca12c7573c9bd674a1aa52edd46d4b68611d89796c631bcb9e0a27ebfa69086abdcf37b77db6 SHA512 c52730946f4abd1414917dba166b867e897bcb7ac52e79a73777ed6b8c923289be54089559c92e1409e580a1b6123855545c09b8c4338d2f6f4fa39766e21235 EBUILD haproxy-2.0.9999.ebuild 5224 BLAKE2B 65616d45e46a318de40c7edd0a12843741784181a62f6991b49137fb2e04e479634851138b2ead576c82d3e8160d0e6706ce78da9bb81addf41ef6e2ecd18f4a SHA512 e6b4a5f154e17f96d124ccb723ab5bdcb389f89995a98e65d2f3199780d502b99da4defdba724c13ec6889bf82ec332e5757383c6b7cdd8b01786689e58e872b -EBUILD haproxy-2.1.4-r1.ebuild 5224 BLAKE2B 65616d45e46a318de40c7edd0a12843741784181a62f6991b49137fb2e04e479634851138b2ead576c82d3e8160d0e6706ce78da9bb81addf41ef6e2ecd18f4a SHA512 e6b4a5f154e17f96d124ccb723ab5bdcb389f89995a98e65d2f3199780d502b99da4defdba724c13ec6889bf82ec332e5757383c6b7cdd8b01786689e58e872b +EBUILD haproxy-2.1.4-r1.ebuild 5345 BLAKE2B df4570054d3ed94729d8d1b7414a61798973c716f68631ce4f487902e4d0f04ab0fb93cf45b5104c8c4b9541787f12c1cb00e72809447b9a6484ca15322e00e7 SHA512 6bad2f674656e9ed6277c691962cab5add403d6b4ceb7a65f5b7d4e6da4fdf50888c6b9f9a6aee74b8de0dc8f433e93b7c1c0e337a90f64f9be2a3389190ca85 EBUILD haproxy-2.1.4.ebuild 5242 BLAKE2B 208fe423b99ed61c827ff682764eabc638d60c9821b6a3bed62dca12c7573c9bd674a1aa52edd46d4b68611d89796c631bcb9e0a27ebfa69086abdcf37b77db6 SHA512 c52730946f4abd1414917dba166b867e897bcb7ac52e79a73777ed6b8c923289be54089559c92e1409e580a1b6123855545c09b8c4338d2f6f4fa39766e21235 EBUILD haproxy-2.1.9999.ebuild 5224 BLAKE2B 65616d45e46a318de40c7edd0a12843741784181a62f6991b49137fb2e04e479634851138b2ead576c82d3e8160d0e6706ce78da9bb81addf41ef6e2ecd18f4a SHA512 e6b4a5f154e17f96d124ccb723ab5bdcb389f89995a98e65d2f3199780d502b99da4defdba724c13ec6889bf82ec332e5757383c6b7cdd8b01786689e58e872b MISC metadata.xml 2148 BLAKE2B 2f273c8d5c4704b482cf5b09e038415e0faa6ecba7297f99d0c55d96ba0b8f0bfa50b21dc857680951c3b4794be98f8781a6d1dcfb622ec5f6827648cfdd247e SHA512 91834d33a145ce6f887f83849ea90da984cf131e657824e63fb44b49761dc9999c00796fb20879cc670b83a2f4aae2263aeacc1dc6bf71b9db34a21ef9a3026d diff --git a/net-proxy/haproxy/haproxy-2.0.14-r1.ebuild b/net-proxy/haproxy/haproxy-2.0.14-r1.ebuild index 7e2cb38725c6..dbcd0d12bd9d 100644 --- a/net-proxy/haproxy/haproxy-2.0.14-r1.ebuild +++ b/net-proxy/haproxy/haproxy-2.0.14-r1.ebuild @@ -12,7 +12,7 @@ DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments" HOMEPAGE="http://www.haproxy.org" if [[ ${PV} != *9999 ]]; then SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz" - KEYWORDS="~amd64 ~arm ~ppc ~x86" + KEYWORDS="~amd64 ~arm ppc ~x86" else EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/" EGIT_BRANCH=master @@ -97,12 +97,17 @@ src_compile() { # For now, until the strict-aliasing breakage will be fixed append-cflags -fno-strict-aliasing + # Bug #668002 + if use ppc || use arm || use hppa; then + TARGET_LDFLAGS=-latomic + fi + if use prometheus-exporter; then EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o" fi # HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing - emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" ${args[@]} + emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" ${args[@]} emake -C contrib/systemd SBINDIR=/usr/sbin if use tools ; then diff --git a/net-proxy/haproxy/haproxy-2.1.4-r1.ebuild b/net-proxy/haproxy/haproxy-2.1.4-r1.ebuild index 7e2cb38725c6..dbcd0d12bd9d 100644 --- a/net-proxy/haproxy/haproxy-2.1.4-r1.ebuild +++ b/net-proxy/haproxy/haproxy-2.1.4-r1.ebuild @@ -12,7 +12,7 @@ DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments" HOMEPAGE="http://www.haproxy.org" if [[ ${PV} != *9999 ]]; then SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz" - KEYWORDS="~amd64 ~arm ~ppc ~x86" + KEYWORDS="~amd64 ~arm ppc ~x86" else EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/" EGIT_BRANCH=master @@ -97,12 +97,17 @@ src_compile() { # For now, until the strict-aliasing breakage will be fixed append-cflags -fno-strict-aliasing + # Bug #668002 + if use ppc || use arm || use hppa; then + TARGET_LDFLAGS=-latomic + fi + if use prometheus-exporter; then EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o" fi # HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing - emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" ${args[@]} + emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" ${args[@]} emake -C contrib/systemd SBINDIR=/usr/sbin if use tools ; then |