diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2014-02-04 03:00:45 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2014-02-04 03:00:45 +0000 |
| commit | d04c1e622b83e2b47942b514ccca787dfcb94170 (patch) | |
| tree | 037709244a5e36f9417b3595dd0f88246de65fcc /dev-libs/apr | |
| parent | Bug #448354: Fix cross-compile with thin. (diff) | |
| download | gentoo-2-d04c1e622b83e2b47942b514ccca787dfcb94170.tar.gz gentoo-2-d04c1e622b83e2b47942b514ccca787dfcb94170.tar.bz2 gentoo-2-d04c1e622b83e2b47942b514ccca787dfcb94170.zip | |
Add more cross-compile related variables to force sane results.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'dev-libs/apr')
| -rw-r--r-- | dev-libs/apr/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-libs/apr/apr-1.5.0-r2.ebuild | 23 |
2 files changed, 25 insertions, 3 deletions
diff --git a/dev-libs/apr/ChangeLog b/dev-libs/apr/ChangeLog index 62e92253239d..a69c2dd5b23e 100644 --- a/dev-libs/apr/ChangeLog +++ b/dev-libs/apr/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-libs/apr # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.211 2014/01/31 23:11:41 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.212 2014/02/04 03:00:45 vapier Exp $ + + 04 Feb 2014; Mike Frysinger <vapier@gentoo.org> apr-1.5.0-r2.ebuild: + Add more cross-compile related variables to force sane results. 31 Jan 2014; Mike Frysinger <vapier@gentoo.org> apr-1.4.8-r1.ebuild, apr-1.5.0-r1.ebuild, apr-1.5.0-r2.ebuild, apr-1.5.0.ebuild: diff --git a/dev-libs/apr/apr-1.5.0-r2.ebuild b/dev-libs/apr/apr-1.5.0-r2.ebuild index 25a2719b3a1f..8f622b19a61e 100644 --- a/dev-libs/apr/apr-1.5.0-r2.ebuild +++ b/dev-libs/apr/apr-1.5.0-r2.ebuild @@ -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/dev-libs/apr/apr-1.5.0-r2.ebuild,v 1.1 2014/01/31 08:01:15 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.5.0-r2.ebuild,v 1.2 2014/02/04 03:00:45 vapier Exp $ EAPI="4" @@ -49,7 +49,26 @@ src_configure() { export apr_cv_sock_cloexec="no" fi if tc-is-cross-compiler; then - export apr_cv_tcp_nodelay_with_cork="yes" + # The apache project relies heavily on AC_TRY_RUN and doesn't + # have any sane cross-compiling fallback logic. + export \ + ac_cv_file__dev_zero="yes" \ + ac_cv_func_sem_open="yes" \ + ac_cv_negative_eai="yes" \ + ac_cv_o_nonblock_inherited="no" \ + ac_cv_struct_rlimit="yes" \ + ap_cv_atomic_builtins="yes" \ + apr_cv_accept4="yes" \ + apr_cv_dup3="yes" \ + apr_cv_epoll="yes" \ + apr_cv_epoll_create1="yes" \ + apr_cv_gai_addrconfig="yes" \ + apr_cv_mutex_recursive="yes" \ + apr_cv_mutex_robust_shared="yes" \ + apr_cv_process_shared_works="yes" \ + apr_cv_pthreads_lib="-pthread" \ + apr_cv_sock_cloexec="yes" \ + apr_cv_tcp_nodelay_with_cork="yes" fi if use urandom; then |