diff options
Diffstat (limited to 'dev-libs/apr')
| -rw-r--r-- | dev-libs/apr/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/apr/apr-1.5.0-r1.ebuild | 118 | ||||
| -rw-r--r-- | dev-libs/apr/apr-1.5.0.ebuild | 119 |
3 files changed, 5 insertions, 238 deletions
diff --git a/dev-libs/apr/ChangeLog b/dev-libs/apr/ChangeLog index a69c2dd5b23e..c0d98b755d7b 100644 --- a/dev-libs/apr/ChangeLog +++ b/dev-libs/apr/ChangeLog @@ -1,6 +1,10 @@ # 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.212 2014/02/04 03:00:45 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.213 2014/03/12 07:41:07 polynomial-c Exp $ + + 12 Mar 2014; Lars Wendler <polynomial-c@gentoo.org> -apr-1.5.0.ebuild, + -apr-1.5.0-r1.ebuild: + Removed old. 04 Feb 2014; Mike Frysinger <vapier@gentoo.org> apr-1.5.0-r2.ebuild: Add more cross-compile related variables to force sane results. diff --git a/dev-libs/apr/apr-1.5.0-r1.ebuild b/dev-libs/apr/apr-1.5.0-r1.ebuild deleted file mode 100644 index cb7e7946467d..000000000000 --- a/dev-libs/apr/apr-1.5.0-r1.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# 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.6 2014/01/31 07:59:32 vapier Exp $ - -EAPI="4" - -inherit autotools eutils libtool multilib toolchain-funcs - -DESCRIPTION="Apache Portable Runtime Library" -HOMEPAGE="http://apr.apache.org/" -SRC_URI="mirror://apache/apr/${P}.tar.bz2" - -LICENSE="Apache-2.0" -SLOT="1" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc elibc_FreeBSD older-kernels-compatibility static-libs +urandom" - -RDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 ) - elibc_mintlib? ( >=sys-apps/util-linux-2.18 )" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen )" - -DOCS=(CHANGES NOTICE README) - -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.5.0-mint.patch - epatch "${FILESDIR}"/${PN}-1.5.0-libtool.patch - epatch "${FILESDIR}"/${PN}-1.5.0-cross-types.patch - - # Apply user patches, bug #449048 - epatch_user - - AT_M4DIR="build" eautoreconf - elibtoolize - - epatch "${FILESDIR}/config.layout.patch" -} - -src_configure() { - local myconf=() - - [[ ${CHOST} == *-mint* ]] && export ac_cv_func_poll=no - - if use older-kernels-compatibility; then - local apr_cv_accept4 apr_cv_dup3 apr_cv_epoll_create1 apr_cv_sock_cloexec - export apr_cv_accept4="no" - export apr_cv_dup3="no" - export apr_cv_epoll_create1="no" - export apr_cv_sock_cloexec="no" - fi - if tc-is-cross-compiler; then - export apr_cv_tcp_nodelay_with_cork="yes" - fi - - if use urandom; then - 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 ) - fi - - tc-is-static-only && myconf+=( --disable-dso ) - - # shl_load does not search runpath, but hpux11 supports dlopen - [[ ${CHOST} == *-hpux11* ]] && myconf+=( --enable-dso=dlfcn ) - - if [[ ${CHOST} == *-solaris2.10 ]]; then - case $(<$([[ ${CHOST} != ${CBUILD} ]] && echo "${EPREFIX}/usr/${CHOST}")/usr/include/atomic.h) in - *atomic_cas_ptr*) ;; - *) - elog "You do not have Solaris Patch ID "$( - [[ ${CHOST} == sparc* ]] && echo 118884 || echo 118885 - )" (Problem 4954703) installed on your host ($(hostname))," - elog "using generic atomic operations instead." - myconf+=( --disable-nonportable-atomics ) - ;; - esac - fi - - econf \ - --enable-layout=gentoo \ - --enable-nonportable-atomics \ - --enable-threads \ - $(use_enable static-libs static) \ - "${myconf[@]}" -} - -src_compile() { - if tc-is-cross-compiler; then - # This header is the same across targets, so use the build compiler. - emake tools/gen_test_char - tc-export_build_env BUILD_CC - ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \ - tools/gen_test_char.c -o tools/gen_test_char || die - fi - - emake - - if use doc; then - emake dox - fi -} - -src_install() { - default - - find "${ED}" -name "*.la" -delete - - if use doc; then - dohtml -r docs/dox/html/* - fi - - # This file is only used on AIX systems, which Gentoo is not, - # and causes collisions between the SLOTs, so remove it. - # Even in Prefix, we don't need this on AIX. - rm -f "${ED}usr/$(get_libdir)/apr.exp" -} diff --git a/dev-libs/apr/apr-1.5.0.ebuild b/dev-libs/apr/apr-1.5.0.ebuild deleted file mode 100644 index c7e50f744469..000000000000 --- a/dev-libs/apr/apr-1.5.0.ebuild +++ /dev/null @@ -1,119 +0,0 @@ -# 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.ebuild,v 1.3 2014/01/31 07:56:48 vapier Exp $ - -EAPI="4" - -inherit autotools eutils libtool multilib toolchain-funcs - -DESCRIPTION="Apache Portable Runtime Library" -HOMEPAGE="http://apr.apache.org/" -SRC_URI="mirror://apache/apr/${P}.tar.bz2" - -LICENSE="Apache-2.0" -SLOT="1" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc elibc_FreeBSD older-kernels-compatibility static-libs +urandom" - -RDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 ) - elibc_mintlib? ( >=sys-apps/util-linux-2.18 )" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen )" - -DOCS=(CHANGES NOTICE README) - -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.5.0-mint.patch - - # Ensure that system libtool is used. - local g= - [[ ${CHOST} == *-darwin* ]] && g=g - sed -e 's:${installbuilddir}/libtool:'"${EPREFIX}/usr/bin/${g}libtool"':' -i apr-config.in || die "sed failed" - sed -e 's:@LIBTOOL@:$(SHELL) '"${EPREFIX}/usr/bin/${g}libtool"':' -i build/apr_rules.mk.in || die "sed failed" - - # Apply user patches, bug #449048 - epatch_user - - AT_M4DIR="build" eautoreconf - elibtoolize - - epatch "${FILESDIR}/config.layout.patch" -} - -src_configure() { - local myconf - - [[ ${CHOST} == *-mint* ]] && export ac_cv_func_poll=no - - if use older-kernels-compatibility; then - local apr_cv_accept4 apr_cv_dup3 apr_cv_epoll_create1 apr_cv_sock_cloexec - export apr_cv_accept4="no" - export apr_cv_dup3="no" - export apr_cv_epoll_create1="no" - export apr_cv_sock_cloexec="no" - fi - if tc-is-cross-compiler; then - export apr_cv_tcp_nodelay_with_cork="yes" - fi - - if use urandom; then - 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" - fi - - tc-is-static-only && myconf+=" --disable-dso" - - # shl_load does not search runpath, but hpux11 supports dlopen - [[ ${CHOST} == *-hpux11* ]] && myconf="${myconf} --enable-dso=dlfcn" - - if [[ ${CHOST} == *-solaris2.10 ]]; then - case $(<$([[ ${CHOST} != ${CBUILD} ]] && echo "${EPREFIX}/usr/${CHOST}")/usr/include/atomic.h) in - *atomic_cas_ptr*) ;; - *) - elog "You do not have Solaris Patch ID "$( - [[ ${CHOST} == sparc* ]] && echo 118884 || echo 118885 - )" (Problem 4954703) installed on your host ($(hostname))," - elog "using generic atomic operations instead." - myconf="${myconf} --disable-nonportable-atomics" - ;; - esac - fi - - CONFIG_SHELL="${EPREFIX}"/bin/bash econf \ - --enable-layout=gentoo \ - --enable-nonportable-atomics \ - --enable-threads \ - ${myconf} - - rm -f libtool -} - -src_compile() { - emake - - if use doc; then - emake dox - fi -} - -src_install() { - default - - find "${ED}" -name "*.la" -exec rm -f {} + - - if use doc; then - dohtml -r docs/dox/html/* - fi - - if ! use static-libs; then - find "${ED}" -name "*.a" -exec rm -f {} + - fi - - # This file is only used on AIX systems, which Gentoo is not, - # and causes collisions between the SLOTs, so remove it. - # Even in Prefix, we don't need this on AIX. - rm -f "${ED}usr/$(get_libdir)/apr.exp" -} |