summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2009-08-10 03:30:46 +0000
committerArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2009-08-10 03:30:46 +0000
commit1defa6d533275662891132c5aa523f870e535ea4 (patch)
tree866a78832ee39578e94356065ed8be1cd0b0ef52 /dev-libs/apr
parentFix includes (bug #280732). (diff)
downloadgentoo-2-1defa6d533275662891132c5aa523f870e535ea4.tar.gz
gentoo-2-1defa6d533275662891132c5aa523f870e535ea4.tar.bz2
gentoo-2-1defa6d533275662891132c5aa523f870e535ea4.zip
Add "cloexec" USE flag (bug #280648).
(Portage version: 13972-svn/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/apr')
-rw-r--r--dev-libs/apr/ChangeLog6
-rw-r--r--dev-libs/apr/apr-1.3.8.ebuild13
-rw-r--r--dev-libs/apr/metadata.xml1
3 files changed, 17 insertions, 3 deletions
diff --git a/dev-libs/apr/ChangeLog b/dev-libs/apr/ChangeLog
index 3918e872cae4..0aff6396e4d4 100644
--- a/dev-libs/apr/ChangeLog
+++ b/dev-libs/apr/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/apr
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.135 2009/08/07 16:29:29 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.136 2009/08/10 03:30:46 arfrever Exp $
+
+ 10 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+ apr-1.3.8.ebuild, metadata.xml:
+ Add "cloexec" USE flag (bug #280648).
07 Aug 2009; Christian Faulhammer <fauli@gentoo.org> apr-1.3.8.ebuild:
revert stable keyword for x86
diff --git a/dev-libs/apr/apr-1.3.8.ebuild b/dev-libs/apr/apr-1.3.8.ebuild
index cb656b1f07fc..0d11f9b685ee 100644
--- a/dev-libs/apr/apr-1.3.8.ebuild
+++ b/dev-libs/apr/apr-1.3.8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.3.8.ebuild,v 1.4 2009/08/07 16:29:29 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.3.8.ebuild,v 1.5 2009/08/10 03:30:46 arfrever Exp $
EAPI="2"
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="1"
KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="debug doc +urandom"
+IUSE="+cloexec debug doc +urandom"
RESTRICT="test"
DEPEND="doc? ( app-doc/doxygen )"
@@ -29,6 +29,11 @@ src_prepare() {
src_configure() {
local myconf
+ if ! use cloexec; then
+ export apr_cv_sock_cloexec="no"
+ export apr_cv_epoll_create1="no"
+ fi
+
if use debug; then
myconf+=" --enable-maintainer-mode --enable-pool-debug=all"
fi
@@ -48,6 +53,10 @@ src_configure() {
sed -i 's,$(apr_builddir)/libtool,/usr/bin/libtool,' build/apr_rules.mk
sed -i 's,${installbuilddir}/libtool,/usr/bin/libtool,' apr-1-config
rm -f libtool
+
+ if ! use cloexec; then
+ unset apr_cv_sock_cloexec apr_cv_epoll_create1
+ fi
}
src_compile() {
diff --git a/dev-libs/apr/metadata.xml b/dev-libs/apr/metadata.xml
index 74dc6ff67c84..55b5530ed153 100644
--- a/dev-libs/apr/metadata.xml
+++ b/dev-libs/apr/metadata.xml
@@ -6,6 +6,7 @@
<email>apache-bugs@gentoo.org</email>
</maintainer>
<use>
+ <flag name='cloexec'>Support for SOCK_CLOEXEC</flag>
<flag name='urandom'>Use /dev/urandom instead of /dev/random</flag>
</use>
</pkgmetadata>