1 |
commit: 6b3bd257e60be095b45d7479b9081bbcfc543800 |
2 |
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Mar 18 16:27:42 2023 +0000 |
4 |
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Mar 18 16:29:06 2023 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b3bd257 |
7 |
|
8 |
dev-libs/apr: drop 1.7.0-r6 |
9 |
|
10 |
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org> |
11 |
|
12 |
dev-libs/apr/Manifest | 1 - |
13 |
dev-libs/apr/apr-1.7.0-r6.ebuild | 164 --------------------------------------- |
14 |
2 files changed, 165 deletions(-) |
15 |
|
16 |
diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest |
17 |
index 02b7c0352595..b0d3d6e02f01 100644 |
18 |
--- a/dev-libs/apr/Manifest |
19 |
+++ b/dev-libs/apr/Manifest |
20 |
@@ -1,2 +1 @@ |
21 |
-DIST apr-1.7.0.tar.bz2 872238 BLAKE2B a8750c45ca6495073a7120f3ae9b858905aecb24b6af5966c3900b06ac1f6d6b55346b17a39a9604cf1b595882335adedf8c8cf4db10e322501bfff4ad7adfe7 SHA512 3dc42d5caf17aab16f5c154080f020d5aed761e22db4c5f6506917f6bfd2bf8becfb40af919042bd4ce1077d5de74aa666f5edfba7f275efba78e8893c115148 |
22 |
DIST apr-1.7.2.tar.bz2 890218 BLAKE2B a17ee4311a33acee0bdeb9e5225a198f9dec1b2e0267a742080c77d5342e5052392a5a2100a0ba85f5a192b8679838a7002d4c9a12aa5bdd7921eff025b75d15 SHA512 0a3a27ccc97bbe4865c1bc0b803012e3da6d5b1f17d4fb0da6f5f58eec01f6d2ae1f25e52896ea5f9c5ac04c5fddcfd1ac606b301c322cf40d5c4d4ce0a1b76e |
23 |
|
24 |
diff --git a/dev-libs/apr/apr-1.7.0-r6.ebuild b/dev-libs/apr/apr-1.7.0-r6.ebuild |
25 |
deleted file mode 100644 |
26 |
index 855fd6a0da42..000000000000 |
27 |
--- a/dev-libs/apr/apr-1.7.0-r6.ebuild |
28 |
+++ /dev/null |
29 |
@@ -1,164 +0,0 @@ |
30 |
-# Copyright 1999-2022 Gentoo Authors |
31 |
-# Distributed under the terms of the GNU General Public License v2 |
32 |
- |
33 |
-EAPI=7 |
34 |
- |
35 |
-inherit autotools libtool toolchain-funcs |
36 |
- |
37 |
-DESCRIPTION="Apache Portable Runtime Library" |
38 |
-HOMEPAGE="https://apr.apache.org/" |
39 |
-SRC_URI="mirror://apache/apr/${P}.tar.bz2" |
40 |
- |
41 |
-LICENSE="Apache-2.0" |
42 |
-SLOT="1/${PV%.*}" |
43 |
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
44 |
-IUSE="doc older-kernels-compatibility selinux static-libs +urandom" |
45 |
- |
46 |
-# See bug #815265 for libcrypt dependency |
47 |
-CDEPEND="virtual/libcrypt:= |
48 |
- elibc_glibc? ( >=sys-apps/util-linux-2.16 )" |
49 |
-RDEPEND="${CDEPEND} |
50 |
- selinux? ( sec-policy/selinux-base-policy )" |
51 |
-DEPEND="${CDEPEND} |
52 |
- >=sys-devel/libtool-2.4.2 |
53 |
- doc? ( app-doc/doxygen )" |
54 |
- |
55 |
-DOCS=( CHANGES NOTICE README ) |
56 |
- |
57 |
-PATCHES=( |
58 |
- "${FILESDIR}"/${PN}-1.5.0-mint.patch |
59 |
- "${FILESDIR}"/${PN}-1.5.0-libtool.patch |
60 |
- "${FILESDIR}"/${PN}-1.5.0-cross-types.patch |
61 |
- "${FILESDIR}"/${PN}-1.5.0-sysroot.patch #385775 |
62 |
- "${FILESDIR}"/${PN}-1.6.3-skip-known-failing-tests.patch |
63 |
- "${FILESDIR}"/${PN}-1.7.0-autoconf-2.70.patch #750353 |
64 |
- "${FILESDIR}"/${PN}-1.7.0-CVE-2021-35940.patch #828545 |
65 |
- "${FILESDIR}"/${PN}-1.7.0-clang-16.patch #870004 |
66 |
- "${FILESDIR}"/${PN}-1.7.0-dev-zero.patch #830833 |
67 |
-) |
68 |
- |
69 |
-src_prepare() { |
70 |
- default |
71 |
- |
72 |
- mv configure.in configure.ac || die |
73 |
- AT_M4DIR="build" eautoreconf |
74 |
- elibtoolize |
75 |
- |
76 |
- eapply "${FILESDIR}/config.layout.patch" |
77 |
-} |
78 |
- |
79 |
-src_configure() { |
80 |
- local myconf=( |
81 |
- --enable-layout=gentoo |
82 |
- --enable-nonportable-atomics |
83 |
- --enable-posix-shm |
84 |
- --enable-threads |
85 |
- $(use_enable static-libs static) |
86 |
- --with-installbuilddir="${EPREFIX}"/usr/share/${PN}/build |
87 |
- ) |
88 |
- |
89 |
- if use older-kernels-compatibility; then |
90 |
- local apr_cv_accept4 apr_cv_dup3 apr_cv_epoll_create1 apr_cv_sock_cloexec |
91 |
- export apr_cv_accept4="no" |
92 |
- export apr_cv_dup3="no" |
93 |
- export apr_cv_epoll_create1="no" |
94 |
- export apr_cv_sock_cloexec="no" |
95 |
- fi |
96 |
- if tc-is-cross-compiler; then |
97 |
- # The apache project relies heavily on AC_TRY_RUN and doesn't |
98 |
- # have any sane cross-compiling fallback logic. |
99 |
- export \ |
100 |
- ac_cv_file__dev_zero="yes" \ |
101 |
- ac_cv_func_sem_open="yes" \ |
102 |
- ac_cv_negative_eai="yes" \ |
103 |
- ac_cv_o_nonblock_inherited="no" \ |
104 |
- ac_cv_struct_rlimit="yes" \ |
105 |
- ap_cv_atomic_builtins="yes" \ |
106 |
- apr_cv_accept4="yes" \ |
107 |
- apr_cv_dup3="yes" \ |
108 |
- apr_cv_epoll="yes" \ |
109 |
- apr_cv_epoll_create1="yes" \ |
110 |
- apr_cv_gai_addrconfig="yes" \ |
111 |
- apr_cv_mutex_recursive="yes" \ |
112 |
- apr_cv_mutex_robust_shared="yes" \ |
113 |
- apr_cv_process_shared_works="yes" \ |
114 |
- apr_cv_pthreads_lib="-pthread" \ |
115 |
- apr_cv_sock_cloexec="yes" \ |
116 |
- apr_cv_tcp_nodelay_with_cork="yes" |
117 |
- fi |
118 |
- |
119 |
- if use urandom; then |
120 |
- myconf+=( --with-devrandom=/dev/urandom ) |
121 |
- elif (( ${CHOST#*-hpux11.} <= 11 )); then |
122 |
- : # no /dev/*random on hpux11.11 and before, ${PN} detects this. |
123 |
- else |
124 |
- myconf+=( --with-devrandom=/dev/random ) |
125 |
- fi |
126 |
- |
127 |
- tc-is-static-only && myconf+=( --disable-dso ) |
128 |
- |
129 |
- # shl_load does not search runpath, but hpux11 supports dlopen |
130 |
- [[ ${CHOST} == *-hpux11* ]] && myconf+=( --enable-dso=dlfcn ) |
131 |
- |
132 |
- if [[ ${CHOST} == *-solaris2.10 ]]; then |
133 |
- case $(<$([[ ${CHOST} != ${CBUILD} ]] && echo "${EPREFIX}/usr/${CHOST}")/usr/include/atomic.h) in |
134 |
- *atomic_cas_ptr*) ;; |
135 |
- *) |
136 |
- elog "You do not have Solaris Patch ID "$( |
137 |
- [[ ${CHOST} == sparc* ]] && echo 118884 || echo 118885 |
138 |
- )" (Problem 4954703) installed on your host ($(hostname))," |
139 |
- elog "using generic atomic operations instead." |
140 |
- myconf+=( --disable-nonportable-atomics ) |
141 |
- ;; |
142 |
- esac |
143 |
- else |
144 |
- if use ppc || use sparc || use mips; then |
145 |
- # Avoid libapr containing undefined references (underlinked) |
146 |
- # undefined reference to `__sync_val_compare_and_swap_8' |
147 |
- # (May be possible to fix via libatomic linkage in future?) |
148 |
- # bug #740464 |
149 |
- myconf+=( --disable-nonportable-atomics ) |
150 |
- fi |
151 |
- fi |
152 |
- |
153 |
- econf "${myconf[@]}" |
154 |
-} |
155 |
- |
156 |
-src_compile() { |
157 |
- if tc-is-cross-compiler; then |
158 |
- # This header is the same across targets, so use the build compiler. |
159 |
- emake tools/gen_test_char |
160 |
- tc-export_build_env BUILD_CC |
161 |
- ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \ |
162 |
- tools/gen_test_char.c -o tools/gen_test_char || die |
163 |
- fi |
164 |
- |
165 |
- emake |
166 |
- |
167 |
- if use doc; then |
168 |
- emake dox |
169 |
- fi |
170 |
-} |
171 |
- |
172 |
-src_test() { |
173 |
- # Building tests in parallel is broken |
174 |
- emake -j1 check |
175 |
-} |
176 |
- |
177 |
-src_install() { |
178 |
- default |
179 |
- |
180 |
- if ! use static-libs; then |
181 |
- find "${ED}" -name '*.la' -delete || die |
182 |
- fi |
183 |
- |
184 |
- if use doc; then |
185 |
- docinto html |
186 |
- dodoc -r docs/dox/html/* |
187 |
- fi |
188 |
- |
189 |
- # This file is only used on AIX systems, which Gentoo is not, |
190 |
- # and causes collisions between the SLOTs, so remove it. |
191 |
- # Even in Prefix, we don't need this on AIX. |
192 |
- rm "${ED}/usr/$(get_libdir)/apr.exp" || die |
193 |
-} |