From ceee4a7196658275bccb35fee84421e84786efb3 Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Thu, 30 Apr 2015 10:33:22 +0000 Subject: [PATCH] Version bump. Removed old Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0x981CA6FC --- dev-libs/apr/ChangeLog | 10 +- dev-libs/apr/Manifest | 33 +++--- dev-libs/apr/apr-1.4.8-r1.ebuild | 119 ------------------- dev-libs/apr/apr-1.5.2.ebuild | 146 ++++++++++++++++++++++++ dev-libs/apr/files/apr-1.4.6-mint.patch | 27 ----- 5 files changed, 170 insertions(+), 165 deletions(-) delete mode 100644 dev-libs/apr/apr-1.4.8-r1.ebuild create mode 100644 dev-libs/apr/apr-1.5.2.ebuild delete mode 100644 dev-libs/apr/files/apr-1.4.6-mint.patch diff --git a/dev-libs/apr/ChangeLog b/dev-libs/apr/ChangeLog index b7ee0b277d59..474c6a7c82ca 100644 --- a/dev-libs/apr/ChangeLog +++ b/dev-libs/apr/ChangeLog @@ -1,6 +1,12 @@ # 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.226 2014/11/15 20:45:08 polynomial-c Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.227 2015/04/30 10:33:20 polynomial-c Exp $ + +*apr-1.5.2 (30 Apr 2015) + + 30 Apr 2015; Lars Wendler -apr-1.4.8-r1.ebuild, + +apr-1.5.2.ebuild, -files/apr-1.4.6-mint.patch: + Version bump. Removed old. 15 Nov 2014; Lars Wendler apr-1.5.1-r1.ebuild: Added kludge to fix compilation with >=libtool-2.4.3 until autotools.eclass diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest index 65782c4acb54..c2e51545d8f5 100644 --- a/dev-libs/apr/Manifest +++ b/dev-libs/apr/Manifest @@ -1,35 +1,34 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX apr-1.4.6-mint.patch 1200 SHA256 d1d8217efbf87f136ece47d06e224f23a585b1634d70a911c88778b8503b3d71 SHA512 531961bcd79850a4b6af59288a6aeb489632d64fd4a1bed80450d48e48f5ff3ea7c0d1e05d80a591c2d8d1a2c6f0c859ef8500b1f01614d83df74034782fd7bd WHIRLPOOL 52c98387ed240f94099f4587734b048fdc6899309d5b4b2f5b237fc7621ef5aa81f1a8b6602e7589ec55fbf391104db3e4451e62dbabdc55133530830dddecf1 AUX apr-1.5.0-cross-types.patch 1969 SHA256 5f3c17546ea43a1ce33ad3d0459dcc6782d0006ab9414bd1e02e3ca0b40b2565 SHA512 8d91cff44c2926c5da120a3e7a4e54414c1e77cb1815d6683b490499914ca0934c3a1a1edb3dbd7dfd686e3342675ab64b0f498c21fe138befa6b454b5d5c1d8 WHIRLPOOL 9f785576b6a6e8b402481be0adb0eff86640e91e6d5948e9fe80f7e2b76f7f2391ff4609ad07aa4d7cfc77c27788f9969953d1e33f0f46ff1876b906cd27293c AUX apr-1.5.0-libtool.patch 514 SHA256 ec0cdc67b471da2666aeeb8d9b344320392331f79a123bfbc405c440c50ebce6 SHA512 e8c2a7a2b5c8171a0d2c8920e053bd861e4fb2044428cb3f6ffc9ccea05694c20b879411f86b967c4269918b5740b1450ecb0e720d74ea0fe9ac305f58ee88d5 WHIRLPOOL e0b7a06cf78a3eb1930639ea7e7d38c962ff847b990714e042e2d107575b4b26979198fbfec62bba5500b323caf0a01584e00b1bbc907fdc67cbaf8e6f3d2ec4 AUX apr-1.5.0-mint.patch 872 SHA256 6ed43adba05db07f061d98f73c19aac0df3d9c0aafd86cf57c9ab4fdc851659a SHA512 ba71f17ef9f61a8379139f05ca17eb583ad34cbc3ebf5c4f59d011662db6b5c963da5c466c093c3eb98372299d8f202d927a05b52cc7515270ac52fe44ec6daf WHIRLPOOL 60966adf15e5301600f870ece96d34d4dd26d3e7dc99bb447f2afc1a86f7a46ef3bdf24613027636707b2fd5ac2f2bdd956a8eeb3b088b27862d7e86090b5db1 AUX apr-1.5.0-sysroot.patch 1309 SHA256 6ebfe28e672084747cf1ee88acec7394de96302f0b2f0903926ba2403ecba244 SHA512 48609c522225b47df96039174dafa043f77ce5b91f464b14250dd2b30590d6685c9baa03d4ca34937532c26afea8d208fb78158dfc8026a606ff90543b5c8d5d WHIRLPOOL a74e8eb6e482b3215997c147a2cded7c9288618bf4925877775dca7700c14fbb874dba8681d053b4f6485792605b37ecf6da0487d4a9bb74bc79a8e3eb128a1f AUX apr-1.5.1-parallel_make_install.patch 554 SHA256 db2d154531f9c92575230b51d4c0b1ad801b66a913957c3640269a46452c3030 SHA512 712de9b30b86cf3f40cc88ed6a7c144b31ad7d70a8985fc5f74a30e023b48fcff4c0c56d0023b20dfd9037441f8d5dc4aa780a5a792a1b73af58aca66980dff4 WHIRLPOOL bde783d69adf4f5e951cf59d525bbd5065ee5d7e3525a8abf0dc5dde5748e194bdc9a1801dd523985a366d67fb6fbcc9d6ea29e6dbc3740b0428a950d34c6104 AUX config.layout.patch 818 SHA256 eeacaf654f23084e842bff02b97c083a8da5b5c056fd086166ba2d250edf3181 SHA512 4ff9a98c2a799c714d3b4c2cb42dd9c1cd6aa52b465570939710c0ac5800ea8806a9c38500d83b09a2bf61984d57c53ae934886d9f25e3111d721ef282a7d91e WHIRLPOOL a03f7e889a416ada14c62ca99727e2c8cba403972785c7d2282c1c914abe9c38a94b98489ec840b3c1e2cfc2af87ee08ac724d0434e8198596f7d2b44907d3db -DIST apr-1.4.8.tar.bz2 772927 SHA256 61b8d2f8d321c6365ee3d71d0bb41f3a89c44da6124cc5b407a3b8319d660421 SHA512 48483647fd958cae6b27672cfe10d3905fd2d4280b686a64deb5e166c239aa7d9838d61a199b5db836c47e63acebee9fa95804d60543cb581fef87bcc150c15b WHIRLPOOL c0e3e17470970734cd36b1b72837b3ed39e0488ef4291eb3a3f9482dffabb72aab85b4d9a8482d9c4cc3a66ce530bd81e8076b98e1fa10b086089266fa9b2f0a DIST apr-1.5.0.tar.bz2 813976 SHA256 17287d36a5917e27281e60d47e7b147bd5ddcd1ca832702c2318f5e0724f1221 SHA512 d54d995a67fe13a619d4781cbfcfae07679d15defa49634ee472c6a93f9521f7964e6e3e366188f1817c01a8fdb98b4ff042e56d8bd9bc379683d6c4ccff2a3e WHIRLPOOL 083da7589f85fb2212b4ced33004ee30848a40cf4718de36a21dfcba15b794dc9b57a9324cdd400e2df74564f9ad27899119de55075f1e0285415471b47f90e7 DIST apr-1.5.1.tar.bz2 817569 SHA256 e94abe431d4da48425fcccdb27b469bd0f8151488f82e5630a56f26590e198ac SHA512 0d8dea97490cd0b0689eb090d0e32ab9b582e4a0248ea7028e2a44552fc3839013b18cff985547aa9bbb549d93bc4859cca1d8ef95b32d4d4fd610ed19bde435 WHIRLPOOL 553efdefdb58ae44015ef36505c70b52122b750e6c3f63d9ccaa0878efd476dac249a62e2fb644d3e709c372a2805b1d76869c0e9b880b6273f46ef2e9937ace -EBUILD apr-1.4.8-r1.ebuild 3416 SHA256 300ddcbfe1302fb782987c366589b37e0a8cac86c77731cc7443984d3b6d3fb5 SHA512 09a25f0a00a107b56e32343e8664ebce6939010ef43964463dc5e71782609c05914aa9ca69211dc6e0e97529c882a46141c553bf32965e2ccce06b987cd36c81 WHIRLPOOL 1012516fbb40cf2af16908007be1dc42d3efe8c757cd243df803b42e6bda128a896313ab4fb178c5cf518bcb0c675594fcf58d200fd0fb12c061b37b08adf22b +DIST apr-1.5.2.tar.bz2 826885 SHA256 7d03ed29c22a7152be45b8e50431063736df9e1daa1ddf93f6a547ba7a28f67a SHA512 d1156ad16abf07887797777b56c2147c890f16d8445829b3e3b4917950d24c5fd2f8febd439992467a5ea0511da562c0fb4a7cfd8a235ab55882388bfa2b919d WHIRLPOOL 3f6fbb9410f7cd3ace2f80f361a02b190e14d744f38dbd6f87a5c60b4b1c4a99cd902ba9351a235d9f3bab044a981de21fb6c193d3ab3caba2448bf6c4e1bd1b EBUILD apr-1.5.0-r2.ebuild 4076 SHA256 3e14d60efdfb6a21d34bfa63db0128f7a8ab92752b2a6ee179c71c7faf275172 SHA512 31b69716506b663b81be22de49edb7b1d3be6c59e1a55d19f7b895bc12f298685927b2774da7b7f478af415b23596cbb27936ac632607d690425fa9f921c9bf9 WHIRLPOOL bfdd0b781125c8dfbdf5a77eda6833699fa1a414a445077c3745052300592073b83c270f7b654ea86b14d02deae0b0178719af2d0f4b4d6d8d6cb292dbbf7803 EBUILD apr-1.5.1-r1.ebuild 4392 SHA256 c509d89fe6a61b8e665c022fe90754075b7c53b57b09bba4aa0202bdc7d00d6b SHA512 5d4d8a200c6caad0f0e32459adade0a46456ee268d5ac0060538547e6b01ebaf3533f0066423e8a720e706fc65a4a21594eea3653cb79cca988e0db063c25a50 WHIRLPOOL ac6f31d53b3abb04f516b0301a110c4ecacdc87a47cb3a901812dd567cd85c8a7a327f15bf058a553ec313b48bc87622978fde1587ed934ae5800d7a440b881e -MISC ChangeLog 27622 SHA256 eef680e939154e614c4d304050f7814d35c4c2b70c3264d519586a3e8e9650ea SHA512 2245f13687947a988c7b44ad4504fca0f13677d7be8c15ccf5de768bc75169680be43eb1d3be6264f3c7e779955851769137637659abcc0498ddb03d6e2a33ec WHIRLPOOL ce41e2f5ff94c570326a21c82b0d7fd137153e9c8ef11fc0672a4ab0a7c82748b96b520b588f513431f1f0cc4a9847b38627aea0e0d5cce150ec5db5f40ec67e +EBUILD apr-1.5.2.ebuild 4327 SHA256 58afeafca9ba6368d079f8b50613d26afc6fcb6a81cc998d1483d083f5a25e54 SHA512 047af83124fe9aaf93ca2345224bf8a444e524d60b57cd04612f8edbfdd862ceecc7c822f962eb1ac8ee3cca3e927b54d3f37b14f3d65a9ea6c38dd96d8e4387 WHIRLPOOL 7aaca72ff0a6cd1e251273cb2bd59d5bbc9dbeed9a718d4ee1456220206e389d84216edde75236ef7594027a5bad89547793fc6916244f7347fb7b3be34b7490 +MISC ChangeLog 27804 SHA256 b59b45d70753b7e0a7e2c12b64c7e5af532312f85257c0db5c40d469d701f18b SHA512 228251b5af890a2ef1f40a8e1fdd32171adb3addb076aebc1d0b092fb755b95eefd9989f3fdfada728ee2af680c8dc9e39f7bc5026ffa52340bb8b5732f145c0 WHIRLPOOL b9fdda0c79172c5d0e810c2d2caf701a49023335c58440a0832b7f5775a3ed093041b581c7cf0ea43b8e9d6cd94ddc51101d9169666f88d5ce78543e56ad782b MISC metadata.xml 419 SHA256 803186ba5a9a84cf3fdf02db9c8922c4e63d75608268b352da2d68ba0249d5ec SHA512 85d64dc3256516cb3a46e01861d684384a108035744cc34615b7de23aa09847f8eafeec198b6135a6df100be5d6de02f0cea65815c617af1e252e87f95002274 WHIRLPOOL 532f9e3d27dcbc0b521bab043487f13b2bf7daa9a49b11760b1aa0610d30c1d62d39c940f545a8a3754e8f08ec041d428b4b98b6ebea45579073d6c12a43c30b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJUZ7tVAAoJEPiazRVxLXTFR/4P/26DKJzhrIn1zre4ZNi64Xbu -NubpVcWr0fW5TRr6rc/M1bupW7R7ppO8WhSAXorrCrOw6SEtDbZbkmSbf4rPsJ5U -o8EPG5AQm4QBCDVwoA8aWFtzyVFX6MMbPxiXMUNzPbfISBpRmCsJTtKfufHOzaqk -pqInSNMVMH21Am2IOZnTnCCtuENpISy3r6pLQktF8eXbdinXCGJSHIA1yppVM2C4 -cDN9FYbx063XfQPnHc9Tvl83QeXslEukl8htWMEevPfwYe6UoFceYOA4SaHpSNOo -IbG/KAb5d7EaPmPD4LoOPMVS9bVy41WcfX7pxTJi1oIlxzdzOpt6aidwd0eP+Suh -zyVNNRtV6dHiPDDhqkL9v4DNAnfGDw9nl25flkSOd5pEflwS6728p3TR5lP4tOMn -2MtXwC7jcsvspQgQPVPM7Qn3eagT1X0OHcig3YoZZWhr1ew1aDpighqDfW9kB8Oa -l3Gsh+41KjkEdbAsxKPVqDsQCyVLE6Sn67tIj27X1jLf70SRhWAtn6tvrawY/Wr5 -94nmdW7V5yCKleal3hke1pHy+iKcT3akUHxmLYrgMLdmTTxtrpPbwRynpBnlJuHY -S8lwB8AuwGO5KS9FuzGsXPdr+iTkgdZlLm5nLTEzP4fhFKX2QWMos2oYDilg3Cq6 -fV07WulfwfOKXtSJlUo8 -=IfHr +iQIcBAEBCAAGBQJVQgTyAAoJEPiazRVxLXTFKTUP/i2/54jmeCUVhzjqo4eO2pHa +Lam94SbAKySZwWicgFdgy6fqS8Sm/47JOQVs40ssaoQFmOgXzble1l1/QEBiMzMW +E2GEzRNRSekFoe2wjpD8duGig2Z2IaylaHxU/nqRqr2YMj2UIENQ1rObFT4+9PeJ +0S7Bj371hEPyg/jFG7NuGzS+ejsLdfBLdhycdBuJ3QYNnWKwNdHYqcV7ep/vpzhU +qomI8F5kQFiXbehnW+QXwC9KnencOn52iyhvp4haGT2pE6HoFpsja/GtCQj9DmID ++YzZ13zSHBcecXp96PM7UI+rxQ/DB2ioGc/nX3cahDmXMZPzFHoWFQJ/dbB+N0oB +mbvF8f1EYYs3x1z3xS1vK2f/JAjFDAXPwYeF4HdCzKvMLh7P3TfJu67tLAiccW8k +rRpXAqw8d7BU6nEhNVYxsAk3RwxF/JeFOkz7JLZSYbpjMokrfhNh8AnXp8UI+1zb +3JHVAs+IvBUKJencGLaR13D31IQvYRBkj+EYDV2sa8Jrb6ShR/22VtZSFs/r5dVG +33wMCOpDcB4WRqMCROqqN7nf6O2UUyPvFkVBa/4YXvT+19vgVHHBlT0oijRGM3d8 +O5hvwa0e30FcHZdqG04b0SLOfrbQG7qmQkN8XK1gYrHnq8ierTJ4+ZZamlxhYN87 +F9lauI8ITNl5F12+/ZJ8 +=ksg+ -----END PGP SIGNATURE----- diff --git a/dev-libs/apr/apr-1.4.8-r1.ebuild b/dev-libs/apr/apr-1.4.8-r1.ebuild deleted file mode 100644 index 2260a58a37fd..000000000000 --- a/dev-libs/apr/apr-1.4.8-r1.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.4.8-r1.ebuild,v 1.14 2014/01/31 23:11:41 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.4.6-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" -} diff --git a/dev-libs/apr/apr-1.5.2.ebuild b/dev-libs/apr/apr-1.5.2.ebuild new file mode 100644 index 000000000000..875224d16b3f --- /dev/null +++ b/dev-libs/apr/apr-1.5.2.ebuild @@ -0,0 +1,146 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.5.2.ebuild,v 1.1 2015/04/30 10:33:20 polynomial-c Exp $ + +EAPI=5 + +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} + >=sys-devel/libtool-2.4.2 + 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 + epatch "${FILESDIR}"/${PN}-1.5.0-sysroot.patch #385775 + + epatch_user #449048 + + # kludge to fix compilation with >=libtool-2.4.3 until autotools.eclass + # got fixed (bug #527506) + _elibtoolize --install --copy --force + + 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 + # 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 + 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-posix-shm \ + --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 + + # Prallel install breaks since apr-1.5.1 + #make -j1 DESTDIR="${D}" install || die + + prune_libtool_files --all + + 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/files/apr-1.4.6-mint.patch b/dev-libs/apr/files/apr-1.4.6-mint.patch deleted file mode 100644 index 43442da98834..000000000000 --- a/dev-libs/apr/files/apr-1.4.6-mint.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -ur apr-1.2.11/build/apr_hints.m4 apr-1.2.11-mint/build/apr_hints.m4 ---- apr-1.2.11/build/apr_hints.m4 Tue Jun 26 23:47:46 2007 -+++ apr-1.2.11-mint/build/apr_hints.m4 Tue Mar 25 12:00:14 2008 -@@ -44,8 +44,9 @@ - - case "$host" in - *mint) -- APR_ADDTO(CPPFLAGS, [-DMINT]) -- APR_ADDTO(LIBS, [-lportlib]) -+ APR_ADDTO(CPPFLAGS, [-DMINT -D_GNU_SOURCE]) -+ apr_cv_pthreads_cflags="none" -+ apr_cv_pthreads_lib="-lpthread" - ;; - *MPE/iX*) - APR_ADDTO(CPPFLAGS, [-DMPE -D_POSIX_SOURCE -D_SOCKET_SOURCE]) -diff -ur apr-1.2.11/build/apr_threads.m4 apr-1.2.11-mint/build/apr_threads.m4 ---- apr-1.2.11/build/apr_threads.m4 Thu Aug 3 11:05:26 2006 -+++ apr-1.2.11-mint/build/apr_threads.m4 Wed Mar 19 08:38:56 2008 -@@ -198,7 +198,7 @@ - AC_DEFUN(APR_CHECK_SIGWAIT_ONE_ARG,[ - AC_CACHE_CHECK(whether sigwait takes one argument,ac_cv_sigwait_one_arg,[ - AC_TRY_COMPILE([ --#if defined(__NETBSD__) || defined(DARWIN) -+#if defined(__NETBSD__) || defined(DARWIN) || defined(MINT) - /* When using the unproven-pthreads package, we need to pull in this - * header to get a prototype for sigwait(). Else things will fail later - * on. XXX Should probably be fixed in the unproven-pthreads package. -- 2.26.2