idl0r 14/10/30 21:37:30
Modified: metadata.xml haproxy-1.5.6.ebuild
haproxy-9999.ebuild ChangeLog
Log:
Fix live ebuild. Add separate USE-flag for JIT and also fix the libpcre depend
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key
B427ABC8)
Revision Changes Path
1.5 net-proxy/haproxy/metadata.xml
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/haproxy/metadata.xml?rev=1.5&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/haproxy/metadata.xml?rev=1.5&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/haproxy/metadata.xml?r1=1.4&r2=1.5
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-proxy/haproxy/metadata.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- metadata.xml 17 Sep 2013 12:30:09 -0000 1.4
+++ metadata.xml 30 Oct 2014 21:37:30 -0000 1.5
@@ -20,6 +20,7 @@
Its event-driven architecture allows it to easily handle thousands of
simultaneous connections on hundreds of instances without risking the system's
stability.
</longdescription>
<use>
- <flag name='tools'>Install additional tools (halog,
iprange).</flag>
+ <flag name="pcre-jit">Use JIT support for PCRE</flag>
+ <flag name="tools">Install additional tools (halog,
iprange)</flag>
</use>
</pkgmetadata>
1.2 net-proxy/haproxy/haproxy-1.5.6.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/haproxy/haproxy-1.5.6.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/haproxy/haproxy-1.5.6.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/haproxy/haproxy-1.5.6.ebuild?r1=1.1&r2=1.2
Index: haproxy-1.5.6.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.5.6.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- haproxy-1.5.6.ebuild 19 Oct 2014 09:11:44 -0000 1.1
+++ haproxy-1.5.6.ebuild 30 Oct 2014 21:37:30 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.5.6.ebuild,v
1.1 2014/10/19 09:11:44 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.5.6.ebuild,v
1.2 2014/10/30 21:37:30 idl0r Exp $
EAPI="5"
@@ -15,9 +15,11 @@
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="+crypt examples +pcre ssl tools vim-syntax +zlib"
+IUSE="+crypt examples +pcre pcre-jit ssl tools vim-syntax +zlib"
-DEPEND="pcre? ( dev-libs/libpcre )
+DEPEND="pcre? ( dev-libs/libpcre
+ pcre-jit? ( dev-libs/libpcre[jit] )
+ )
ssl? ( dev-libs/openssl[zlib?] )
zlib? ( sys-libs/zlib )"
RDEPEND="${DEPEND}"
@@ -31,7 +33,7 @@
src_prepare() {
sed -e 's:@SBINDIR@:'/usr/bin':' contrib/systemd/haproxy.service.in \
- > contrib/systemd/haproxy.service || die
+ > contrib/systemd/haproxy.service || die
sed -ie 's:/usr/sbin/haproxy:/usr/bin/haproxy:'
src/haproxy-systemd-wrapper.c || die
}
@@ -40,7 +42,12 @@
local args="TARGET=linux2628 USE_GETADDRINFO=1"
if use pcre ; then
- args="${args} USE_PCRE=1 USE_PCRE_JIT=1"
+ args="${args} USE_PCRE=1"
+ if use pcre-jit; then
+ args="${args} USE_PCRE_JIT=1"
+ else
+ args="${args} USE_PCRE_JIT="
+ fi
else
args="${args} USE_PCRE= USE_PCRE_JIT="
fi
1.3 net-proxy/haproxy/haproxy-9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/haproxy/haproxy-9999.ebuild?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/haproxy/haproxy-9999.ebuild?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/haproxy/haproxy-9999.ebuild?r1=1.2&r2=1.3
Index: haproxy-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-9999.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- haproxy-9999.ebuild 17 Sep 2013 12:30:09 -0000 1.2
+++ haproxy-9999.ebuild 30 Oct 2014 21:37:30 -0000 1.3
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-9999.ebuild,v 1.2
2013/09/17 12:30:09 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-9999.ebuild,v 1.3
2014/10/30 21:37:30 idl0r Exp $
EAPI="5"
@@ -15,9 +15,11 @@
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
KEYWORDS=""
-IUSE="+crypt examples +pcre ssl tools vim-syntax +zlib"
+IUSE="+crypt examples +pcre pcre-jit ssl tools vim-syntax +zlib"
-DEPEND="pcre? ( dev-libs/libpcre )
+DEPEND="pcre? ( dev-libs/libpcre
+ pcre-jit? ( dev-libs/libpcre[jit] )
+ )
ssl? ( dev-libs/openssl[zlib?] )
zlib? ( sys-libs/zlib )"
RDEPEND="${DEPEND}"
@@ -30,15 +32,22 @@
}
src_prepare() {
- sed -e 's:@SBINDIR@:'/usr/sbin':' contrib/systemd/haproxy.service.in \
- > contrib/systemd/haproxy.service || die
+ sed -e 's:@SBINDIR@:'/usr/bin':' contrib/systemd/haproxy.service.in \
+ > contrib/systemd/haproxy.service || die
+
+ sed -ie 's:/usr/sbin/haproxy:/usr/bin/haproxy:'
src/haproxy-systemd-wrapper.c || die
}
src_compile() {
local args="TARGET=linux2628 USE_GETADDRINFO=1"
if use pcre ; then
- args="${args} USE_PCRE=1 USE_PCRE_JIT=1"
+ args="${args} USE_PCRE=1"
+ if use pcre-jit; then
+ args="${args} USE_PCRE_JIT=1"
+ else
+ args="${args} USE_PCRE_JIT="
+ fi
else
args="${args} USE_PCRE= USE_PCRE_JIT="
fi
@@ -68,14 +77,14 @@
fi
# For now, until the strict-aliasing breakage will be fixed
-# append-cflags -fno-strict-aliasing
+ append-cflags -fno-strict-aliasing
emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args}
if use tools ; then
for contrib in halog iprange ; do
emake -C contrib/${contrib} \
- CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
CC=$(tc-getCC) ${args}
+ CFLAGS="${CFLAGS}" OPTIMIZE="${CFLAGS}"
LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args}
done
fi
}
@@ -88,10 +97,10 @@
# Don't install useless files
# rm examples/build.cfg doc/*gpl.txt
- dodoc CHANGELOG ROADMAP TODO doc/{configuration,haproxy-en}.txt
+ dodoc CHANGELOG ROADMAP doc/{configuration,haproxy-en}.txt
doman doc/haproxy.1
- dosbin haproxy-systemd-wrapper
+ dobin haproxy-systemd-wrapper
systemd_dounit contrib/systemd/haproxy.service
if use tools ; then
1.109 net-proxy/haproxy/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/haproxy/ChangeLog?rev=1.109&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/haproxy/ChangeLog?rev=1.109&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/haproxy/ChangeLog?r1=1.108&r2=1.109
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- ChangeLog 19 Oct 2014 09:11:44 -0000 1.108
+++ ChangeLog 30 Oct 2014 21:37:30 -0000 1.109
@@ -1,6 +1,11 @@
# ChangeLog for net-proxy/haproxy
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.108
2014/10/19 09:11:44 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.109
2014/10/30 21:37:30 idl0r Exp $
+
+ 30 Oct 2014; Christian Ruppert <[email protected]> haproxy-1.5.6.ebuild,
+ haproxy-9999.ebuild, metadata.xml:
+ Fix live ebuild. Add separate USE-flag for JIT and also fix the libpcre
+ depend
*haproxy-1.5.6 (19 Oct 2014)
