Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-libs/apr-util: apr-util-1.5.3-r1.ebuild ChangeLog
Date: Fri, 31 Jan 2014 08:12:08
Message-Id: 20140131081204.1F62B2004C@flycatcher.gentoo.org
1 vapier 14/01/31 08:12:04
2
3 Modified: ChangeLog
4 Added: apr-util-1.5.3-r1.ebuild
5 Log:
6 Utilize SYSROOT to locate build-time paths when cross-compiling, and drop redundent -L/-R libdir flags to simplify linking. Rewrite build/rules.mk to pick up current env settings rather than clobbering at make time. #385775 by Bertrand Jacquin.
7
8 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
9
10 Revision Changes Path
11 1.197 dev-libs/apr-util/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/apr-util/ChangeLog?rev=1.197&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/apr-util/ChangeLog?rev=1.197&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/apr-util/ChangeLog?r1=1.196&r2=1.197
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/dev-libs/apr-util/ChangeLog,v
20 retrieving revision 1.196
21 retrieving revision 1.197
22 diff -u -r1.196 -r1.197
23 --- ChangeLog 31 Jan 2014 08:07:39 -0000 1.196
24 +++ ChangeLog 31 Jan 2014 08:12:03 -0000 1.197
25 @@ -1,6 +1,15 @@
26 # ChangeLog for dev-libs/apr-util
27 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/ChangeLog,v 1.196 2014/01/31 08:07:39 vapier Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/ChangeLog,v 1.197 2014/01/31 08:12:03 vapier Exp $
30 +
31 +*apr-util-1.5.3-r1 (31 Jan 2014)
32 +
33 + 31 Jan 2014; Mike Frysinger <vapier@g.o> +apr-util-1.5.3-r1.ebuild,
34 + +files/apr-util-1.5.3-sysroot.patch:
35 + Utilize SYSROOT to locate build-time paths when cross-compiling, and drop
36 + redundent -L/-R libdir flags to simplify linking. Rewrite build/rules.mk to
37 + pick up current env settings rather than clobbering at make time. #385775 by
38 + Bertrand Jacquin.
39
40 31 Jan 2014; Mike Frysinger <vapier@g.o> apr-util-1.5.3.ebuild:
41 Simplify src_compile/src_install a bit -- no functional changes.
42
43
44
45 1.1 dev-libs/apr-util/apr-util-1.5.3-r1.ebuild
46
47 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/apr-util/apr-util-1.5.3-r1.ebuild?rev=1.1&view=markup
48 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/apr-util/apr-util-1.5.3-r1.ebuild?rev=1.1&content-type=text/plain
49
50 Index: apr-util-1.5.3-r1.ebuild
51 ===================================================================
52 # Copyright 1999-2014 Gentoo Foundation
53 # Distributed under the terms of the GNU General Public License v2
54 # $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/apr-util-1.5.3-r1.ebuild,v 1.1 2014/01/31 08:12:03 vapier Exp $
55
56 EAPI="4"
57
58 # Usually apr-util has the same PV as apr, but in case of security fixes, this may change.
59 # APR_PV="${PV}"
60 APR_PV="1.4.6"
61
62 inherit autotools db-use eutils libtool multilib toolchain-funcs
63
64 DESCRIPTION="Apache Portable Runtime Utility Library"
65 HOMEPAGE="http://apr.apache.org/"
66 SRC_URI="mirror://apache/apr/${P}.tar.bz2"
67
68 LICENSE="Apache-2.0"
69 SLOT="1"
70 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"
71 IUSE="berkdb doc freetds gdbm ldap mysql nss odbc openssl postgres sqlite static-libs"
72 RESTRICT="test"
73
74 RDEPEND="dev-libs/expat
75 >=dev-libs/apr-${APR_PV}:1
76 berkdb? ( >=sys-libs/db-4 )
77 freetds? ( dev-db/freetds )
78 gdbm? ( sys-libs/gdbm )
79 ldap? ( =net-nds/openldap-2* )
80 mysql? ( =virtual/mysql-5* )
81 nss? ( dev-libs/nss )
82 odbc? ( dev-db/unixODBC )
83 openssl? ( dev-libs/openssl )
84 postgres? ( dev-db/postgresql-base )
85 sqlite? ( dev-db/sqlite:3 )"
86 DEPEND="${RDEPEND}
87 doc? ( app-doc/doxygen )"
88
89 DOCS=(CHANGES NOTICE README)
90
91 src_prepare() {
92 epatch "${FILESDIR}"/${P}-berkdb6.patch #476374
93 epatch "${FILESDIR}"/${PN}-1.5.3-sysroot.patch #385775
94 eautoreconf
95 elibtoolize
96 }
97
98 src_configure() {
99 local myconf=()
100
101 tc-is-static-only && myconf+=( --disable-util-dso )
102
103 if use berkdb; then
104 local db_version
105 db_version="$(db_findver sys-libs/db)" || die "Unable to find Berkeley DB version"
106 db_version="$(db_ver_to_slot "${db_version}")"
107 db_version="${db_version/\./}"
108 myconf+=(
109 --with-dbm=db${db_version}
110 # We use $T for the libdir because otherwise it'd simply be the normal
111 # system libdir. That's pointless as the compiler will search it for
112 # us already. This makes cross-compiling and such easier.
113 --with-berkeley-db="${SYSROOT}$(db_includedir 2>/dev/null):${T}"
114 )
115 else
116 myconf+=( --without-berkeley-db )
117 fi
118
119 econf \
120 --datadir="${EPREFIX}"/usr/share/apr-util-1 \
121 --with-apr="${SYSROOT}${EPREFIX}"/usr \
122 --with-expat="${EPREFIX}"/usr \
123 --without-sqlite2 \
124 $(use_with freetds) \
125 $(use_with gdbm) \
126 $(use_with ldap) \
127 $(use_with mysql) \
128 $(use_with nss) \
129 $(use_with odbc) \
130 $(use_with openssl) \
131 $(use_with postgres pgsql) \
132 $(use_with sqlite sqlite3) \
133 "${myconf[@]}"
134 # Use the current env build settings rather than whatever apr was built with.
135 sed -i -r \
136 -e "/^(apr_builddir|apr_builders|top_builddir)=/s:=:=${SYSROOT}:" \
137 -e "/^CC=/s:=.*:=$(tc-getCC):" \
138 -e '/^(C|CPP|CXX|LD)FLAGS=/d' \
139 -e '/^LTFLAGS/s:--silent::' \
140 build/rules.mk || die
141 }
142
143 src_compile() {
144 emake
145 use doc && emake dox
146 }
147
148 src_install() {
149 default
150
151 find "${ED}" -name "*.la" -delete
152 find "${ED}usr/$(get_libdir)/apr-util-${SLOT}" -name "*.a" -delete
153 use static-libs || find "${ED}" -name "*.a" -delete
154
155 use doc && dohtml -r docs/dox/html/*
156
157 # This file is only used on AIX systems, which Gentoo is not,
158 # and causes collisions between the SLOTs, so remove it.
159 rm -f "${ED}usr/$(get_libdir)/aprutil.exp"
160 }