mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-24 18:58:08 -07:00
dev-libs/apr: drop 1.7.4-r2, 1.7.4-r3, 1.7.6
Bug: https://bugs.gentoo.org/938542 Signed-off-by: Brett A C Sheffield <bacs@librecast.net> Part-of: https://codeberg.org/gentoo/gentoo/pulls/284 Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Brett A C Sheffield
committed by
Sam James
Sam James
parent
bcab68ae13
commit
4d98ee64e0
@@ -1,3 +1,2 @@
|
||||
DIST apr-1.7.4.tar.bz2 894526 BLAKE2B a93b9d3f2c46fe0a34ce1d544e7a43ba40720e2fae8b8a7d0957413ac695057902378dbf96f067ced7486da86c8e513b7fbd48fa79839efeeb40a3295fe2d3df SHA512 2342c997765ea2ca96eac158e5fd260232dba68fc41b90a79a7ba9b25c539fc217981867362090e0ebebe632289257c342275e3c5baedb698c474ef8f49a9dcd
|
||||
DIST apr-1.7.5.tar.bz2 898264 BLAKE2B 1feacb24e213843c4d3312806abf698e332c45557b7cfd74c9c654d4f9d835dd3a8bf4f9a3bb8328483dcc244948ca118ed6fab9655e482ac6fb53cc7fd92908 SHA512 d8a7553642da0c81261ac3992536efd9d43ecb9154934ef1a10ae808d6a3ce8198b40433091d3a6d04f61e67c59426fb5276193a37e810ae4bc74a8a10fb651b
|
||||
DIST apr-1.7.6.tar.bz2 899670 BLAKE2B 6762df4f062392a352603ac6a17961a71c77e39682b40eedab721ee07e50793b5d1529abb58654513c750a5d219bd33aaa3dabfbd4a25223f3a13af7fc9726d0 SHA512 629b60680d1244641828019db903a1b199e8a19c8f27a5132b93faacb381ce561f88463345ab019258f1f1e8cfdf8aa986ac815153a8e7e04a22b3932f9fedd2
|
||||
|
||||
@@ -1,162 +0,0 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit autotools flag-o-matic toolchain-funcs
|
||||
|
||||
DESCRIPTION="Apache Portable Runtime Library"
|
||||
HOMEPAGE="https://apr.apache.org/"
|
||||
SRC_URI="mirror://apache/apr/${P}.tar.bz2"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="1/${PV%.*}"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
|
||||
IUSE="doc old-kernel selinux static-libs +urandom valgrind"
|
||||
|
||||
# See bug #815265 for libcrypt dependency
|
||||
DEPEND="
|
||||
virtual/libcrypt:=
|
||||
elibc_glibc? ( >=sys-apps/util-linux-2.16 )
|
||||
"
|
||||
RDEPEND="
|
||||
${DEPEND}
|
||||
selinux? ( sec-policy/selinux-base-policy )
|
||||
"
|
||||
DEPEND+=" valgrind? ( dev-debug/valgrind )"
|
||||
BDEPEND="
|
||||
>=dev-build/libtool-2.4.2
|
||||
doc? ( app-text/doxygen )
|
||||
"
|
||||
|
||||
DOCS=( CHANGES NOTICE README )
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-1.6.3-skip-known-failing-tests.patch
|
||||
"${FILESDIR}"/${PN}-1.7.2-libtool.patch
|
||||
"${FILESDIR}"/${PN}-1.7.2-sysroot.patch # bug #385775
|
||||
"${FILESDIR}"/${PN}-1.7.2-fix-pkgconfig-libs.patch
|
||||
"${FILESDIR}"/${PN}-1.7.2-respect-flags.patch
|
||||
"${FILESDIR}"/${PN}-1.7.2-autoconf-2.72.patch
|
||||
"${FILESDIR}"/config.layout.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
mv configure.in configure.ac || die
|
||||
AT_M4DIR="build" eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
tc-export AS CC CPP
|
||||
|
||||
# the libtool script uses bash code in it and at configure time, tries
|
||||
# to find a bash shell. if /bin/sh is bash, it uses that. this can
|
||||
# cause problems for people who switch /bin/sh on the fly to other
|
||||
# shells, so just force libtool to use /bin/bash all the time.
|
||||
export CONFIG_SHELL="${EPREFIX}"/bin/bash
|
||||
export ac_cv_path_SED="sed"
|
||||
export ac_cv_path_EGREP="grep -E"
|
||||
export ac_cv_path_EGREP_TRADITIONAL="grep -E"
|
||||
export ac_cv_path_FGREP="grep -F"
|
||||
export ac_cv_path_GREP="grep"
|
||||
export ac_cv_path_lt_DD="dd"
|
||||
|
||||
local myconf=(
|
||||
--enable-layout=gentoo
|
||||
--enable-nonportable-atomics
|
||||
--enable-posix-shm
|
||||
--enable-threads
|
||||
$(use_enable static-libs static)
|
||||
$(use_with valgrind)
|
||||
--with-installbuilddir="${EPREFIX}"/usr/share/${PN}/build
|
||||
)
|
||||
|
||||
tc-is-static-only && myconf+=( --disable-dso )
|
||||
|
||||
if use old-kernel; 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_mmap__dev_zero="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 )
|
||||
else
|
||||
myconf+=( --with-devrandom=/dev/random )
|
||||
fi
|
||||
|
||||
# Avoid libapr containing undefined references (underlinked)
|
||||
# undefined reference to `__sync_val_compare_and_swap_8'
|
||||
# (May be possible to fix via libatomic linkage in future?)
|
||||
# bug #740464
|
||||
append-atomic-flags
|
||||
if use x86 || [[ ${LIBS} == *atomic* ]] ; then
|
||||
myconf+=( --disable-nonportable-atomics )
|
||||
fi
|
||||
|
||||
econf "${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 all $(usev doc dox)
|
||||
}
|
||||
|
||||
src_test() {
|
||||
# Building tests in parallel is broken
|
||||
emake -j1 check
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
if ! use static-libs; then
|
||||
find "${ED}" -name '*.la' -delete || die
|
||||
fi
|
||||
|
||||
if use doc; then
|
||||
docinto html
|
||||
dodoc -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 "${ED}/usr/$(get_libdir)/apr.exp" || die
|
||||
}
|
||||
@@ -1,163 +0,0 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit autotools flag-o-matic toolchain-funcs
|
||||
|
||||
DESCRIPTION="Apache Portable Runtime Library"
|
||||
HOMEPAGE="https://apr.apache.org/"
|
||||
SRC_URI="mirror://apache/apr/${P}.tar.bz2"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="1/${PV%.*}"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
|
||||
IUSE="doc old-kernel selinux static-libs +urandom valgrind"
|
||||
|
||||
# See bug #815265 for libcrypt dependency
|
||||
DEPEND="
|
||||
virtual/libcrypt:=
|
||||
elibc_glibc? ( >=sys-apps/util-linux-2.16 )
|
||||
"
|
||||
RDEPEND="
|
||||
${DEPEND}
|
||||
selinux? ( sec-policy/selinux-base-policy )
|
||||
"
|
||||
DEPEND+=" valgrind? ( dev-debug/valgrind )"
|
||||
BDEPEND="
|
||||
>=dev-build/libtool-2.4.2
|
||||
doc? ( app-text/doxygen )
|
||||
"
|
||||
|
||||
DOCS=( CHANGES NOTICE README )
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-1.6.3-skip-known-failing-tests.patch
|
||||
"${FILESDIR}"/${PN}-1.7.2-libtool.patch
|
||||
"${FILESDIR}"/${PN}-1.7.2-fix-pkgconfig-libs.patch
|
||||
"${FILESDIR}"/${PN}-1.7.2-respect-flags.patch
|
||||
"${FILESDIR}"/${PN}-1.7.2-autoconf-2.72.patch
|
||||
"${FILESDIR}"/${PN}-1.7.4-config-cross.patch
|
||||
"${FILESDIR}"/${PN}-1.7.4-config-libdir.patch
|
||||
"${FILESDIR}"/config.layout.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
mv configure.in configure.ac || die
|
||||
AT_M4DIR="build" eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
tc-export AS CC CPP
|
||||
|
||||
# the libtool script uses bash code in it and at configure time, tries
|
||||
# to find a bash shell. if /bin/sh is bash, it uses that. this can
|
||||
# cause problems for people who switch /bin/sh on the fly to other
|
||||
# shells, so just force libtool to use /bin/bash all the time.
|
||||
export CONFIG_SHELL="${EPREFIX}"/bin/bash
|
||||
export ac_cv_path_SED="sed"
|
||||
export ac_cv_path_EGREP="grep -E"
|
||||
export ac_cv_path_EGREP_TRADITIONAL="grep -E"
|
||||
export ac_cv_path_FGREP="grep -F"
|
||||
export ac_cv_path_GREP="grep"
|
||||
export ac_cv_path_lt_DD="dd"
|
||||
|
||||
local myconf=(
|
||||
--enable-layout=gentoo
|
||||
--enable-nonportable-atomics
|
||||
--enable-posix-shm
|
||||
--enable-threads
|
||||
$(use_enable static-libs static)
|
||||
$(use_with valgrind)
|
||||
--with-installbuilddir="${EPREFIX}"/usr/share/${PN}/build
|
||||
)
|
||||
|
||||
tc-is-static-only && myconf+=( --disable-dso )
|
||||
|
||||
if use old-kernel; 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_mmap__dev_zero="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 )
|
||||
else
|
||||
myconf+=( --with-devrandom=/dev/random )
|
||||
fi
|
||||
|
||||
# Avoid libapr containing undefined references (underlinked)
|
||||
# undefined reference to `__sync_val_compare_and_swap_8'
|
||||
# (May be possible to fix via libatomic linkage in future?)
|
||||
# bug #740464
|
||||
append-atomic-flags
|
||||
if use x86 || [[ ${LIBS} == *atomic* ]] ; then
|
||||
myconf+=( --disable-nonportable-atomics )
|
||||
fi
|
||||
|
||||
econf "${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 all $(usev doc dox)
|
||||
}
|
||||
|
||||
src_test() {
|
||||
# Building tests in parallel is broken
|
||||
emake -j1 check
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
if ! use static-libs; then
|
||||
find "${ED}" -name '*.la' -delete || die
|
||||
fi
|
||||
|
||||
if use doc; then
|
||||
docinto html
|
||||
dodoc -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 "${ED}/usr/$(get_libdir)/apr.exp" || die
|
||||
}
|
||||
@@ -1,163 +0,0 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit autotools flag-o-matic toolchain-funcs
|
||||
|
||||
DESCRIPTION="Apache Portable Runtime Library"
|
||||
HOMEPAGE="https://apr.apache.org/"
|
||||
SRC_URI="mirror://apache/apr/${P}.tar.bz2"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="1/${PV%.*}"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
|
||||
IUSE="doc old-kernel selinux static-libs +urandom valgrind"
|
||||
|
||||
# See bug #815265 for libcrypt dependency
|
||||
DEPEND="
|
||||
virtual/libcrypt:=
|
||||
elibc_glibc? ( >=sys-apps/util-linux-2.16 )
|
||||
"
|
||||
RDEPEND="
|
||||
${DEPEND}
|
||||
selinux? ( sec-policy/selinux-base-policy )
|
||||
"
|
||||
DEPEND+=" valgrind? ( dev-debug/valgrind )"
|
||||
BDEPEND="
|
||||
>=dev-build/libtool-2.4.2
|
||||
doc? ( app-text/doxygen )
|
||||
"
|
||||
|
||||
DOCS=( CHANGES NOTICE README )
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-1.6.3-skip-known-failing-tests.patch
|
||||
"${FILESDIR}"/${PN}-1.7.2-libtool.patch
|
||||
"${FILESDIR}"/${PN}-1.7.2-fix-pkgconfig-libs.patch
|
||||
"${FILESDIR}"/${PN}-1.7.2-respect-flags.patch
|
||||
"${FILESDIR}"/${PN}-1.7.2-autoconf-2.72.patch
|
||||
"${FILESDIR}"/${PN}-1.7.4-config-cross.patch
|
||||
"${FILESDIR}"/${PN}-1.7.4-config-libdir.patch
|
||||
"${FILESDIR}"/config.layout.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
mv configure.in configure.ac || die
|
||||
AT_M4DIR="build" eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
tc-export AS CC CPP
|
||||
|
||||
# the libtool script uses bash code in it and at configure time, tries
|
||||
# to find a bash shell. if /bin/sh is bash, it uses that. this can
|
||||
# cause problems for people who switch /bin/sh on the fly to other
|
||||
# shells, so just force libtool to use /bin/bash all the time.
|
||||
export CONFIG_SHELL="${EPREFIX}"/bin/bash
|
||||
export ac_cv_path_SED="sed"
|
||||
export ac_cv_path_EGREP="grep -E"
|
||||
export ac_cv_path_EGREP_TRADITIONAL="grep -E"
|
||||
export ac_cv_path_FGREP="grep -F"
|
||||
export ac_cv_path_GREP="grep"
|
||||
export ac_cv_path_lt_DD="dd"
|
||||
|
||||
local myconf=(
|
||||
--enable-layout=gentoo
|
||||
--enable-nonportable-atomics
|
||||
--enable-posix-shm
|
||||
--enable-threads
|
||||
$(use_enable static-libs static)
|
||||
$(use_with valgrind)
|
||||
--with-installbuilddir="${EPREFIX}"/usr/share/${PN}/build
|
||||
)
|
||||
|
||||
tc-is-static-only && myconf+=( --disable-dso )
|
||||
|
||||
if use old-kernel; 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_mmap__dev_zero="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 )
|
||||
else
|
||||
myconf+=( --with-devrandom=/dev/random )
|
||||
fi
|
||||
|
||||
# Avoid libapr containing undefined references (underlinked)
|
||||
# undefined reference to `__sync_val_compare_and_swap_8'
|
||||
# (May be possible to fix via libatomic linkage in future?)
|
||||
# bug #740464
|
||||
append-atomic-flags
|
||||
if use x86 || [[ ${LIBS} == *atomic* ]] ; then
|
||||
myconf+=( --disable-nonportable-atomics )
|
||||
fi
|
||||
|
||||
econf "${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 all $(usev doc dox)
|
||||
}
|
||||
|
||||
src_test() {
|
||||
# Building tests in parallel is broken
|
||||
emake -j1 check
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
if ! use static-libs; then
|
||||
find "${ED}" -name '*.la' -delete || die
|
||||
fi
|
||||
|
||||
if use doc; then
|
||||
docinto html
|
||||
dodoc -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 "${ED}/usr/$(get_libdir)/apr.exp" || die
|
||||
}
|
||||
@@ -1,37 +0,0 @@
|
||||
https://bugs.gentoo.org/385775
|
||||
|
||||
utilize $SYSROOT to find the right includedir tree
|
||||
|
||||
drop the -L/-R paths since we know our libdir is the standard path which
|
||||
the compiler already knows how to locate
|
||||
--- a/apr-config.in
|
||||
+++ b/apr-config.in
|
||||
@@ -27,8 +27,8 @@ bindir="@bindir@"
|
||||
libdir="@libdir@"
|
||||
datarootdir="@datadir@"
|
||||
datadir="@datadir@"
|
||||
-installbuilddir="@installbuilddir@"
|
||||
-includedir="@includedir@"
|
||||
+installbuilddir="${SYSROOT}@installbuilddir@"
|
||||
+includedir="${SYSROOT}@includedir@"
|
||||
|
||||
CC="@CC@"
|
||||
CPP="@CPP@"
|
||||
@@ -199,7 +199,7 @@ while test $# -gt 0; do
|
||||
--link-ld)
|
||||
if test "$location" = "installed"; then
|
||||
### avoid using -L if libdir is a "standard" location like /usr/lib
|
||||
- flags="$flags -L$libdir -l${APR_LIBNAME}"
|
||||
+ flags="$flags -l${APR_LIBNAME}"
|
||||
elif test "$location" = "crosscompile"; then
|
||||
flags="$flags -L$APR_TARGET_DIR/$libdir -l${APR_LIBNAME}"
|
||||
else
|
||||
@@ -218,7 +218,7 @@ while test $# -gt 0; do
|
||||
### avoid using -L if libdir is a "standard" location like /usr/lib
|
||||
# Since the user is specifying they are linking with libtool, we
|
||||
# *know* that -R will be recognized by libtool.
|
||||
- flags="$flags -L$libdir -R$libdir -l${APR_LIBNAME}"
|
||||
+ flags="$flags -l${APR_LIBNAME}"
|
||||
elif test "$location" = "crosscompile"; then
|
||||
flags="$flags -L${APR_TARGET_DIR}/$libdir -l${APR_LIBNAME}"
|
||||
else
|
||||
Reference in New Issue
Block a user