diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/apr/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/apr/Manifest deleted file mode 100644 index 479b4ef93c..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/apr/Manifest +++ /dev/null @@ -1,12 +0,0 @@ -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 config.layout.patch 745 SHA256 29d224f052c378f0130b59625120507d3f7d8d83fb3d7ec9c2b806b7abeec2fa SHA512 3a87e718859c8f95793f828b764d240907d65c21fe2c99143815ab835f8b657154092c4ad496e86d79490bd85ef03d394d3acb57a15186f2f06a518b32d77fdf WHIRLPOOL 5e76166dc535ecf56b601de7c8dffb92410a6677d077b66589a49d69262e41d652a6b17ab931fcd01a1b905f13b9cfe07c414179f37f75bf465effdc5dc3c8b3 -DIST apr-1.5.2.tar.bz2 826885 SHA256 7d03ed29c22a7152be45b8e50431063736df9e1daa1ddf93f6a547ba7a28f67a SHA512 d1156ad16abf07887797777b56c2147c890f16d8445829b3e3b4917950d24c5fd2f8febd439992467a5ea0511da562c0fb4a7cfd8a235ab55882388bfa2b919d WHIRLPOOL 3f6fbb9410f7cd3ace2f80f361a02b190e14d744f38dbd6f87a5c60b4b1c4a99cd902ba9351a235d9f3bab044a981de21fb6c193d3ab3caba2448bf6c4e1bd1b -DIST apr-1.6.2.tar.bz2 853363 SHA256 09109cea377bab0028bba19a92b5b0e89603df9eab05c0f7dbd4dd83d48dcebd SHA512 20f449fde522f186b919b64ce6f90073b267557e17438607d31af917eca7941222dd7a7379d66f1430ff68f7e28fbccd140d24f3ca7aae8a876a550b19de284a WHIRLPOOL 4fd43497ed091f9da2a8c8a57017344dc7492b18793e8a16eae480ddbba8f18ebc66925418d8b5fa8fa6fa023b59a482d62c8ba1ee49a575aa6f7918b703ea30 -EBUILD apr-1.5.2.ebuild 4100 SHA256 f7054cbfd1f8115687c2652489eca6d6b8bd3bdb2b2e6094fe116017c1057bfe SHA512 c57fe4d819a172fa9a528d75eabfbd1ce129d71cec30f79c8870f3e9dbc5a08772de5a91af9497cf8b33492439196b36b5f3b3b9dcd4a347d8a1380b5e5a5192 WHIRLPOOL 3f0127305c6590004910ae7ea01d5cf8a4e8dad506eb1b661043b769045d9efd418162f5ef32a5903e3a1bfa5dd46640d7cde3c2305dc0b7cc4182cbacae5016 -EBUILD apr-1.6.2.ebuild 4118 SHA256 ca102e2a43c1b1a6f1f59b49c21e0ecddb55f5b7037f26c9b16755d70b026001 SHA512 cb616f4e9412be4828c6b649aef2fe7ead5ef739c0bb0d17616d785ac2af0db3d853feeb5e8af800415305531aabf4763a986fcee031df21c2ba726c5fe87203 WHIRLPOOL 977d37d1d643d9263672706ec7d41a1ebf69371d0af88cf1133d49d4fb80d9393b9a1cc64164fec8de48f65a4da0fa05d3c681e61073861892e44cc94d9bc883 -MISC ChangeLog 2475 SHA256 eb94693c6b92297fdd0ba293d6a8bf0ed8889a886170e3eb0416991d54fe4634 SHA512 4367f487f70f6ad6a35b305af3ba446f18616c990bbd06e5aa2efd90a614f97128dc5c5e54cae76346f1e9f20808623a9b95cc70db65540928de419d74cb3e05 WHIRLPOOL cbd1495333efe779974079ba8b65e53bd185419a68fe84d95dde59cf0b02a7bf5c17058e638043e7664136f746205125608add667676c7645f0e063a76947b6f -MISC ChangeLog-2015 28918 SHA256 36d001de47bfb90a8a8a80cdf7ee9a8d86000c94d58df95579c921bf6997c424 SHA512 876d679eaa9627bda13d9e2e350681ff40ec0f7978165823a33196fe7be90a244540659720ad323476ef2a02aca244415063ce94c23251f43f25841d872fc585 WHIRLPOOL df7fc5a927d5fe0b12e977ac9a6684eb779ae5ba95ab6350f3f7fac9493ca28de8786da833315f8d71240b5044cf74483a7a5967caa23cead8367492b1a3d2d8 -MISC metadata.xml 433 SHA256 e65d577b56d477a35f0cd4d2f400f48d1054e3aacd74353c432f91138be8ee01 SHA512 7a1b6a73160b108816332f90e4e540f555e748584925ac3c7bb303ce5b6328abf255fc3f1c2b0e13f3c5d763841e847e400e781764083e3e96bc3809871a0df6 WHIRLPOOL d2e07c994cbb20905b692c729e5ec80b1e2b6085c4939245a5848994e9d250344d21b133d705e2d40cf1b860333e8bc0017bf0944d7e8bf78dcab891b66166d8 diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/apr/apr-1.5.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/apr/apr-1.5.2.ebuild deleted file mode 100644 index 5be730d5fb..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/apr/apr-1.5.2.ebuild +++ /dev/null @@ -1,143 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~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 selinux static-libs +urandom" - -CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 ) - elibc_mintlib? ( >=sys-apps/util-linux-2.18 )" -RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-apache )" -DEPEND="${CDEPEND} - >=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 - - 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/sdk_container/src/third_party/portage-stable/dev-libs/apr/apr-1.6.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/apr/apr-1.6.2.ebuild deleted file mode 100644 index d726588257..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/apr/apr-1.6.2.ebuild +++ /dev/null @@ -1,146 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools 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 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~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 selinux static-libs +urandom" - -CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 ) - elibc_mintlib? ( >=sys-apps/util-linux-2.18 )" -RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-apache )" -DEPEND="${CDEPEND} - >=sys-devel/libtool-2.4.2 - doc? ( app-doc/doxygen )" - -DOCS=( CHANGES NOTICE README ) - -PATCHES=( - "${FILESDIR}"/${PN}-1.5.0-mint.patch - "${FILESDIR}"/${PN}-1.5.0-libtool.patch - "${FILESDIR}"/${PN}-1.5.0-cross-types.patch - "${FILESDIR}"/${PN}-1.5.0-sysroot.patch #385775 -) - -src_prepare() { - default - - AT_M4DIR="build" eautoreconf - elibtoolize - - eapply "${FILESDIR}/config.layout.patch" -} - -src_configure() { - local myconf=( - --enable-layout=gentoo - --enable-nonportable-atomics - --enable-posix-shm - --enable-threads - $(use_enable static-libs static) - ) - - [[ ${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 "${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 - - find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die - - 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 -f "${ED%/}/usr/$(get_libdir)/apr.exp" -} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/apr/files/apr-1.5.0-cross-types.patch b/sdk_container/src/third_party/portage-stable/dev-libs/apr/files/apr-1.5.0-cross-types.patch deleted file mode 100644 index 266e567681..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/apr/files/apr-1.5.0-cross-types.patch +++ /dev/null @@ -1,63 +0,0 @@ -use standard AC_CHECK_SIZEOF as it supports non-builtin types and -supports cross-compiling sanely - -https://issues.apache.org/bugzilla/show_bug.cgi?id=56053 - ---- a/configure.in -+++ b/configure.in -@@ -1684,7 +1684,7 @@ else - socklen_t_value="int" - fi - --APR_CHECK_SIZEOF_EXTENDED([#include ], pid_t, 8) -+AC_CHECK_SIZEOF(pid_t) - - if test "$ac_cv_sizeof_pid_t" = "$ac_cv_sizeof_short"; then - pid_t_fmt='#define APR_PID_T_FMT "hd"' -@@ -1753,7 +1753,7 @@ APR_CHECK_TYPES_COMPATIBLE(ssize_t, long, [ssize_t_fmt="ld"]) - APR_CHECK_TYPES_COMPATIBLE(size_t, unsigned int, [size_t_fmt="u"]) - APR_CHECK_TYPES_COMPATIBLE(size_t, unsigned long, [size_t_fmt="lu"]) - --APR_CHECK_SIZEOF_EXTENDED([#include ], ssize_t, 8) -+AC_CHECK_SIZEOF(ssize_t) - - AC_MSG_CHECKING([which format to use for apr_ssize_t]) - if test -n "$ssize_t_fmt"; then -@@ -1770,7 +1770,7 @@ fi - - ssize_t_fmt="#define APR_SSIZE_T_FMT \"$ssize_t_fmt\"" - --APR_CHECK_SIZEOF_EXTENDED([#include ], size_t, 8) -+AC_CHECK_SIZEOF(size_t) - - AC_MSG_CHECKING([which format to use for apr_size_t]) - if test -n "$size_t_fmt"; then -@@ -1787,7 +1787,7 @@ fi - - size_t_fmt="#define APR_SIZE_T_FMT \"$size_t_fmt\"" - --APR_CHECK_SIZEOF_EXTENDED([#include ], off_t, 8) -+AC_CHECK_SIZEOF(off_t) - - if test "${ac_cv_sizeof_off_t}${apr_cv_use_lfs64}" = "4yes"; then - # Enable LFS -@@ -1866,7 +1866,7 @@ case $host in - ;; - *) - ino_t_value=ino_t -- APR_CHECK_SIZEOF_EXTENDED(AC_INCLUDES_DEFAULT, ino_t, $ac_cv_sizeof_long) -+ AC_CHECK_SIZEOF(ino_t) - if test $ac_cv_sizeof_ino_t = 4; then - if test $ac_cv_sizeof_long = 4; then - ino_t_value="unsigned long" -@@ -1886,8 +1886,8 @@ else - bigendian=0 - fi - --APR_CHECK_SIZEOF_EXTENDED([#include --#include ],struct iovec,0) -+AC_CHECK_SIZEOF(struct iovec,,[AC_INCLUDES_DEFAULT -+#include ]) - if test "$ac_cv_sizeof_struct_iovec" = "0"; then - have_iovec=0 - else diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/apr/files/apr-1.5.0-libtool.patch b/sdk_container/src/third_party/portage-stable/dev-libs/apr/files/apr-1.5.0-libtool.patch deleted file mode 100644 index 5368a2689b..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/apr/files/apr-1.5.0-libtool.patch +++ /dev/null @@ -1,17 +0,0 @@ -generate a local copy of libtool for use in compiling - -https://bugs.gentoo.org/374355 - ---- a/configure.in -+++ b/configure.in -@@ -260,9 +260,7 @@ case $host in - fi - else - dnl libtoolize requires that the following not be indented -- dnl should become LT_INIT(win32-dll) --AC_LIBTOOL_WIN32_DLL --AC_PROG_LIBTOOL -+LT_INIT(win32-dll) - # get libtool's setting of shlibpath_var - eval `grep "^shlibpath_var=[[A-Z_]]*$" $apr_builddir/libtool` - if test "x$shlibpath_var" = "x"; then diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/apr/files/apr-1.5.0-mint.patch b/sdk_container/src/third_party/portage-stable/dev-libs/apr/files/apr-1.5.0-mint.patch deleted file mode 100644 index cfe039e962..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/apr/files/apr-1.5.0-mint.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- apr-1.5.0/build/apr_hints.m4 -+++ apr-1.5.0/build/apr_hints.m4 -@@ -45,6 +45,8 @@ - case "$host" in - *mint) - 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]) ---- apr-1.5.0/build/apr_threads.m4 -+++ apr-1.5.0/build/apr_threads.m4 -@@ -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. diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/apr/files/apr-1.5.0-sysroot.patch b/sdk_container/src/third_party/portage-stable/dev-libs/apr/files/apr-1.5.0-sysroot.patch deleted file mode 100644 index 54c9d649ef..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/apr/files/apr-1.5.0-sysroot.patch +++ /dev/null @@ -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 -@@ -28,7 +28,7 @@ libdir="@libdir@" - datarootdir="@datadir@" - datadir="@datadir@" --installbuilddir="@installbuilddir@" --includedir="@includedir@" -+installbuilddir="${SYSROOT}@installbuilddir@" -+includedir="${SYSROOT}@includedir@" - - CC="@CC@" - CPP="@CPP@" -@@ -183,7 +183,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}" - else - ### this surely can't work since the library is in .libs? - flags="$flags -L$APR_BUILD_DIR -l${APR_LIBNAME}" -@@ -200,7 +200,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}" - else - flags="$flags $LA_FILE" - fi diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/apr/files/config.layout.patch b/sdk_container/src/third_party/portage-stable/dev-libs/apr/files/config.layout.patch deleted file mode 100644 index 9f650a0abe..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/apr/files/config.layout.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/config.layout -+++ b/config.layout -@@ -229,3 +229,22 @@ - infodir: ${exec_prefix}/share/info - libsuffix: -${APR_MAJOR_VERSION} - -+ -+# Gentoo layout -+ -+ prefix: /usr -+ exec_prefix: ${prefix} -+ bindir: ${exec_prefix}/bin -+ sbindir: ${exec_prefix}/bin -+ libdir: ${exec_prefix}/lib -+ libexecdir: ${exec_prefix}/modules -+ mandir: ${prefix}/man -+ sysconfdir: ${prefix}/conf -+ datadir: /usr/share/apr-${APR_MAJOR_VERSION} -+ installbuilddir: ${datadir}/build-${APR_MAJOR_VERSION} -+ includedir: ${prefix}/include/apr-${APR_MAJOR_VERSION} -+ localstatedir: ${prefix} -+ libsuffix: -${APR_MAJOR_VERSION} -+ -+ -+ diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/apr/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-libs/apr/metadata.xml deleted file mode 100644 index c6e4003aa6..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/apr/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - polynomial-c@gentoo.org - Lars Wendler - - - Enable binary compatibility with older kernels - Use /dev/urandom instead of /dev/random - -