1 |
polynomial-c 14/08/01 04:47:40 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: apr-util-1.5.3-r2.ebuild |
5 |
Removed: apr-util-1.5.3-r1.ebuild |
6 |
Log: |
7 |
Fixed compilation with nss/openssl USE flag (bug #518708). Committed straight to stable |
8 |
|
9 |
(Portage version: 2.2.10/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 0x981CA6FC) |
10 |
|
11 |
Revision Changes Path |
12 |
1.210 dev-libs/apr-util/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/apr-util/ChangeLog?rev=1.210&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/apr-util/ChangeLog?rev=1.210&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/apr-util/ChangeLog?r1=1.209&r2=1.210 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/apr-util/ChangeLog,v |
21 |
retrieving revision 1.209 |
22 |
retrieving revision 1.210 |
23 |
diff -u -r1.209 -r1.210 |
24 |
--- ChangeLog 17 May 2014 13:55:59 -0000 1.209 |
25 |
+++ ChangeLog 1 Aug 2014 04:47:40 -0000 1.210 |
26 |
@@ -1,6 +1,13 @@ |
27 |
# ChangeLog for dev-libs/apr-util |
28 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/ChangeLog,v 1.209 2014/05/17 13:55:59 ago Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/ChangeLog,v 1.210 2014/08/01 04:47:40 polynomial-c Exp $ |
31 |
+ |
32 |
+*apr-util-1.5.3-r2 (01 Aug 2014) |
33 |
+ |
34 |
+ 01 Aug 2014; Lars Wendler <polynomial-c@g.o> |
35 |
+ -apr-util-1.5.3-r1.ebuild, +apr-util-1.5.3-r2.ebuild: |
36 |
+ Fixed compilation with nss/openssl USE flag (bug #518708). Committed straight |
37 |
+ to stable. |
38 |
|
39 |
17 May 2014; Agostino Sarubbo <ago@g.o> apr-util-1.5.3-r1.ebuild: |
40 |
Stable for alpha, wrt bug #504300 |
41 |
|
42 |
|
43 |
|
44 |
1.1 dev-libs/apr-util/apr-util-1.5.3-r2.ebuild |
45 |
|
46 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/apr-util/apr-util-1.5.3-r2.ebuild?rev=1.1&view=markup |
47 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/apr-util/apr-util-1.5.3-r2.ebuild?rev=1.1&content-type=text/plain |
48 |
|
49 |
Index: apr-util-1.5.3-r2.ebuild |
50 |
=================================================================== |
51 |
# Copyright 1999-2014 Gentoo Foundation |
52 |
# Distributed under the terms of the GNU General Public License v2 |
53 |
# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/apr-util-1.5.3-r2.ebuild,v 1.1 2014/08/01 04:47:40 polynomial-c Exp $ |
54 |
|
55 |
EAPI="4" |
56 |
|
57 |
# Usually apr-util has the same PV as apr, but in case of security fixes, this may change. |
58 |
# APR_PV="${PV}" |
59 |
APR_PV="1.4.6" |
60 |
|
61 |
inherit autotools db-use eutils libtool multilib toolchain-funcs |
62 |
|
63 |
DESCRIPTION="Apache Portable Runtime Utility Library" |
64 |
HOMEPAGE="http://apr.apache.org/" |
65 |
SRC_URI="mirror://apache/apr/${P}.tar.bz2" |
66 |
|
67 |
LICENSE="Apache-2.0" |
68 |
SLOT="1" |
69 |
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" |
70 |
IUSE="berkdb doc freetds gdbm ldap mysql nss odbc openssl postgres sqlite static-libs" |
71 |
RESTRICT="test" |
72 |
|
73 |
RDEPEND="dev-libs/expat |
74 |
>=dev-libs/apr-${APR_PV}:1 |
75 |
berkdb? ( >=sys-libs/db-4 ) |
76 |
freetds? ( dev-db/freetds ) |
77 |
gdbm? ( sys-libs/gdbm ) |
78 |
ldap? ( =net-nds/openldap-2* ) |
79 |
mysql? ( =virtual/mysql-5* ) |
80 |
nss? ( dev-libs/nss ) |
81 |
odbc? ( dev-db/unixODBC ) |
82 |
openssl? ( dev-libs/openssl ) |
83 |
postgres? ( dev-db/postgresql-base ) |
84 |
sqlite? ( dev-db/sqlite:3 )" |
85 |
DEPEND="${RDEPEND} |
86 |
>=sys-devel/libtool-2.4.2 |
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 |
if use nss || use openssl ; then |
120 |
myconf+=( --with-crypto ) # 518708 |
121 |
fi |
122 |
|
123 |
econf \ |
124 |
--datadir="${EPREFIX}"/usr/share/apr-util-1 \ |
125 |
--with-apr="${SYSROOT}${EPREFIX}"/usr \ |
126 |
--with-expat="${EPREFIX}"/usr \ |
127 |
--without-sqlite2 \ |
128 |
$(use_with freetds) \ |
129 |
$(use_with gdbm) \ |
130 |
$(use_with ldap) \ |
131 |
$(use_with mysql) \ |
132 |
$(use_with nss) \ |
133 |
$(use_with odbc) \ |
134 |
$(use_with openssl) \ |
135 |
$(use_with postgres pgsql) \ |
136 |
$(use_with sqlite sqlite3) \ |
137 |
"${myconf[@]}" |
138 |
# Use the current env build settings rather than whatever apr was built with. |
139 |
sed -i -r \ |
140 |
-e "/^(apr_builddir|apr_builders|top_builddir)=/s:=:=${SYSROOT}:" \ |
141 |
-e "/^CC=/s:=.*:=$(tc-getCC):" \ |
142 |
-e '/^(C|CPP|CXX|LD)FLAGS=/d' \ |
143 |
-e '/^LTFLAGS/s:--silent::' \ |
144 |
build/rules.mk || die |
145 |
} |
146 |
|
147 |
src_compile() { |
148 |
emake |
149 |
use doc && emake dox |
150 |
} |
151 |
|
152 |
src_install() { |
153 |
default |
154 |
|
155 |
find "${ED}" -name "*.la" -delete |
156 |
find "${ED}usr/$(get_libdir)/apr-util-${SLOT}" -name "*.a" -delete |
157 |
use static-libs || find "${ED}" -name "*.a" -delete |
158 |
|
159 |
use doc && dohtml -r docs/dox/html/* |
160 |
|
161 |
# This file is only used on AIX systems, which Gentoo is not, |
162 |
# and causes collisions between the SLOTs, so remove it. |
163 |
rm -f "${ED}usr/$(get_libdir)/aprutil.exp" |
164 |
} |