diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2014-01-31 07:59:32 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2014-01-31 07:59:32 +0000 |
| commit | 31ae4ea09cc4e029305b1d873bba62e0eed862a4 (patch) | |
| tree | fd8f00d138cec0e9c1de9621865756a01b067a0e /dev-libs/apr | |
| parent | Use tc-is-static-only rather than open coding the mint target. (diff) | |
| download | gentoo-2-31ae4ea09cc4e029305b1d873bba62e0eed862a4.tar.gz gentoo-2-31ae4ea09cc4e029305b1d873bba62e0eed862a4.tar.bz2 gentoo-2-31ae4ea09cc4e029305b1d873bba62e0eed862a4.zip | |
Convert myconf to an array to make it easier to maintain.
(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-r1.ebuild | 16 |
2 files changed, 12 insertions, 9 deletions
diff --git a/dev-libs/apr/ChangeLog b/dev-libs/apr/ChangeLog index f4e0380cf212..4cb9721bac5b 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.208 2014/01/31 07:56:49 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.209 2014/01/31 07:59:32 vapier Exp $ + + 31 Jan 2014; Mike Frysinger <vapier@gentoo.org> apr-1.5.0-r1.ebuild: + Convert myconf to an array to make it easier to maintain. 31 Jan 2014; Mike Frysinger <vapier@gentoo.org> apr-1.4.8-r1.ebuild, apr-1.5.0-r1.ebuild, apr-1.5.0.ebuild: diff --git a/dev-libs/apr/apr-1.5.0-r1.ebuild b/dev-libs/apr/apr-1.5.0-r1.ebuild index b7259c00ff09..cb7e7946467d 100644 --- a/dev-libs/apr/apr-1.5.0-r1.ebuild +++ b/dev-libs/apr/apr-1.5.0-r1.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-r1.ebuild,v 1.5 2014/01/31 07:56:48 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.5.0-r1.ebuild,v 1.6 2014/01/31 07:59:32 vapier Exp $ EAPI="4" @@ -37,7 +37,7 @@ src_prepare() { } src_configure() { - local myconf + local myconf=() [[ ${CHOST} == *-mint* ]] && export ac_cv_func_poll=no @@ -53,17 +53,17 @@ src_configure() { fi if use urandom; then - myconf+=" --with-devrandom=/dev/urandom" + myconf+=( --with-devrandom=/dev/urandom ) elif (( ${CHOST#*-hpux11.} <= 11 )); then : # no /dev/*random on hpux11.11 and before, $PN detects this. else - myconf+=" --with-devrandom=/dev/random" + myconf+=( --with-devrandom=/dev/random ) fi - tc-is-static-only && myconf+=" --disable-dso" + tc-is-static-only && myconf+=( --disable-dso ) # shl_load does not search runpath, but hpux11 supports dlopen - [[ ${CHOST} == *-hpux11* ]] && myconf="${myconf} --enable-dso=dlfcn" + [[ ${CHOST} == *-hpux11* ]] && myconf+=( --enable-dso=dlfcn ) if [[ ${CHOST} == *-solaris2.10 ]]; then case $(<$([[ ${CHOST} != ${CBUILD} ]] && echo "${EPREFIX}/usr/${CHOST}")/usr/include/atomic.h) in @@ -73,7 +73,7 @@ src_configure() { [[ ${CHOST} == sparc* ]] && echo 118884 || echo 118885 )" (Problem 4954703) installed on your host ($(hostname))," elog "using generic atomic operations instead." - myconf="${myconf} --disable-nonportable-atomics" + myconf+=( --disable-nonportable-atomics ) ;; esac fi @@ -83,7 +83,7 @@ src_configure() { --enable-nonportable-atomics \ --enable-threads \ $(use_enable static-libs static) \ - ${myconf} + "${myconf[@]}" } src_compile() { |