diff options
author | 2023-02-12 02:16:51 +0000 | |
---|---|---|
committer | 2023-02-12 02:16:51 +0000 | |
commit | 0501d5fabc9515568ae1f7a6b1f7a41f019f8300 (patch) | |
tree | 12cfedf061d3ba4f7fd899404660d22211d8ce37 | |
parent | 2023-02-12 01:02:00 UTC (diff) | |
parent | dev-util/shellcheck: drop 0.8.0 (diff) | |
download | gentoo-0501d5fabc9515568ae1f7a6b1f7a41f019f8300.tar.gz gentoo-0501d5fabc9515568ae1f7a6b1f7a41f019f8300.tar.bz2 gentoo-0501d5fabc9515568ae1f7a6b1f7a41f019f8300.zip |
Merge updates from master
-rw-r--r-- | app-misc/delay/delay-1.6-r6.ebuild | 43 | ||||
-rw-r--r-- | app-misc/delay/files/delay-1.6-clang16.patch | 12 | ||||
-rw-r--r-- | dev-util/shellcheck/Manifest | 3 | ||||
-rw-r--r-- | dev-util/shellcheck/shellcheck-0.8.0.ebuild | 33 | ||||
-rw-r--r-- | dev-util/shellcheck/shellcheck-0.9.0.ebuild | 30 | ||||
-rw-r--r-- | media-sound/mt-daapd/files/mt-daapd-0.2.4.2-clang16.patch | 80 | ||||
-rw-r--r-- | media-sound/mt-daapd/files/mt-daapd-0.2.4.2-musl.patch | 32 | ||||
-rw-r--r-- | media-sound/mt-daapd/files/mt-daapd.tmpfiles | 1 | ||||
-rw-r--r-- | media-sound/mt-daapd/mt-daapd-0.2.4.2-r2.ebuild | 95 | ||||
-rw-r--r-- | sys-libs/db/db-4.8.30-r8.ebuild (renamed from sys-libs/db/db-4.8.30-r7.ebuild) | 3 | ||||
-rw-r--r-- | sys-libs/db/db-5.3.28-r9.ebuild (renamed from sys-libs/db/db-5.3.28-r8.ebuild) | 3 | ||||
-rw-r--r-- | sys-libs/db/files/db-4.8.30-clang16.patch | 281 | ||||
-rw-r--r-- | sys-libs/db/files/db-5.3.28-clang16.patch | 325 | ||||
-rw-r--r-- | sys-process/bottom/bottom-0.7.1.ebuild | 2 |
14 files changed, 906 insertions, 37 deletions
diff --git a/app-misc/delay/delay-1.6-r6.ebuild b/app-misc/delay/delay-1.6-r6.ebuild new file mode 100644 index 000000000000..056c0f45b6a2 --- /dev/null +++ b/app-misc/delay/delay-1.6-r6.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Sleeplike program that counts down the number of seconds specified" +HOMEPAGE="https://onegeek.org/~tom/software/delay/" +SRC_URI="https://onegeek.org/~tom/software/delay/dl/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" + +RDEPEND="sys-libs/ncurses:=" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/byacc + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${P}-headers.patch + "${FILESDIR}"/${P}-tinfo.patch + "${FILESDIR}"/${P}-clang16.patch +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + # Our clang16 patch forces regeneration of the yacc files and going from + # an ancient bison to a modern one makes 'delay until now + 5 minutes' + # segfault. It happens even if the patch is empty, as the regeneration + # is the breaking part. So, just force byacc, as it seems to work, and + # this is a package with no active upstream. + export YACC=byacc + + econf +} diff --git a/app-misc/delay/files/delay-1.6-clang16.patch b/app-misc/delay/files/delay-1.6-clang16.patch new file mode 100644 index 000000000000..5deec4ea5194 --- /dev/null +++ b/app-misc/delay/files/delay-1.6-clang16.patch @@ -0,0 +1,12 @@ +--- a/parsetimey.y ++++ b/parsetimey.y +@@ -7,6 +7,9 @@ + + #define YYDEBUG 1 + ++int yyerror(char *s); ++int yylex(void); ++ + time_t currtime; + struct tm exectm; + static int isgmt; diff --git a/dev-util/shellcheck/Manifest b/dev-util/shellcheck/Manifest index 485c6d7f00cf..d0b636caf145 100644 --- a/dev-util/shellcheck/Manifest +++ b/dev-util/shellcheck/Manifest @@ -1 +1,2 @@ -DIST ShellCheck-0.8.0.tar.gz 194817 BLAKE2B a486a6c72af4f54be776e86d1ebd07e04e64cdc52bc81bf1bb3b001066585b313a626f94572008072096ebde250eb8054544184779524a17c96f447e87e60c34 SHA512 62de6241502fd9e1bb45b224ff5eaf27def9938f5e4ed8345f8173b0be8f9bb7511d8ccc1d1779da319a32843bbf005415c3fcd5b902293e037d44495ec5bb54 +DIST shellcheck-0.9.0-rev1.cabal 4094 BLAKE2B 2b81ca0f3953944f9f482763721b0f7d0c364780795470c19ec7dc4f5007d94a83ffdc5486b6a89661ddb041668a72790877e46ff41e852591330106b20cb6a4 SHA512 16d2732eb726cc56875a62bc3974aef20538a0ae1cf29c46ee25aab0d1d43c162c8c2c4280cabacb3304e971e8b8d407a14a1d91c4e81b80db1aa9e5c739ac70 +DIST shellcheck-0.9.0.tar.gz 231011 BLAKE2B bc03a243c33faf433e64c34cf86983c80bcac9eae4c15a5ba00b9dd893cc988a78e0fdda1a72a81134f0d489346b52c2d805ee7ff1550f63e901c61f6b02efe7 SHA512 724da8de58eb9c4512779de0ec5f2f8f9015145c1eab3605574e609355980cd2fb87338d41e8ae95a0fd0742eed463b1c515a68d255308caa77ca06d57e12fcb diff --git a/dev-util/shellcheck/shellcheck-0.8.0.ebuild b/dev-util/shellcheck/shellcheck-0.8.0.ebuild deleted file mode 100644 index 620ad1629930..000000000000 --- a/dev-util/shellcheck/shellcheck-0.8.0.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# ebuild generated by hackport 0.7 - -CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" -inherit haskell-cabal - -MY_PN="ShellCheck" -MY_P="${MY_PN}-${PV}" -S="${WORKDIR}/${MY_P}" - -DESCRIPTION="Shell script analysis tool" -HOMEPAGE="https://www.shellcheck.net/" -SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" - -RDEPEND="dev-haskell/aeson:=[profile?] - >=dev-haskell/diff-0.2.0:=[profile?] - >=dev-haskell/mtl-2.2.1:=[profile?] - >=dev-haskell/parsec-3.0:=[profile?] - >=dev-haskell/quickcheck-2.7.4:2=[template-haskell,profile?] - dev-haskell/regex-tdfa:=[profile?] - >=dev-lang/ghc-8.4.3:= -" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-2.2.0.1 -" diff --git a/dev-util/shellcheck/shellcheck-0.9.0.ebuild b/dev-util/shellcheck/shellcheck-0.9.0.ebuild new file mode 100644 index 000000000000..3dbd4bed3313 --- /dev/null +++ b/dev-util/shellcheck/shellcheck-0.9.0.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# ebuild generated by hackport 0.8.0.0.9999 + +CABAL_HACKAGE_REVISION=1 +CABAL_PN="ShellCheck" + +CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" +inherit haskell-cabal + +DESCRIPTION="Shell script analysis tool" +HOMEPAGE="https://www.shellcheck.net/" + +LICENSE="GPL-3" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" + +RDEPEND=">=dev-haskell/aeson-1.4.0:=[profile?] <dev-haskell/aeson-2.2:=[profile?] + >=dev-haskell/diff-0.4.0:=[profile?] <dev-haskell/diff-0.5:=[profile?] + >=dev-haskell/fgl-5.7.0:=[profile?] <dev-haskell/fgl-5.8.1.0:=[profile?] + >=dev-haskell/quickcheck-2.14.2:2=[profile?] <dev-haskell/quickcheck-2.15:2=[profile?] + >=dev-haskell/regex-tdfa-1.2.0:=[profile?] <dev-haskell/regex-tdfa-1.4:=[profile?] + >=dev-lang/ghc-8.8.1:= +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-3.0.0.0 +" diff --git a/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-clang16.patch b/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-clang16.patch new file mode 100644 index 000000000000..3380cc0da44a --- /dev/null +++ b/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-clang16.patch @@ -0,0 +1,80 @@ +https://bugs.gentoo.org/860879 +https://bugs.gentoo.org/875011 +--- a/configure.in ++++ b/configure.in +@@ -21,6 +21,9 @@ CPPFLAGS="${CPPFLAGS} -g" + + AM_MAINTAINER_MODE + ++# For strcasestr ++AC_USE_SYSTEM_EXTENSIONS ++ + dnl fix freebsd's broken (?) libpthread + AC_CHECK_LIB(c_r,pthread_creat,THREAD_LIBS="-lc_r", [ + AC_CHECK_LIB(pthread,pthread_create,THREAD_LIBS="-lpthread") ]) +--- a/src/configfile.c ++++ b/src/configfile.c +@@ -48,6 +48,7 @@ + #include <sys/wait.h> + + #include "configfile.h" ++#include "db-memory.h" + #include "err.h" + + #ifndef WITHOUT_MDNS +--- a/src/dynamic-art.c ++++ b/src/dynamic-art.c +@@ -32,6 +32,7 @@ + #include <sys/stat.h> + + #include "configfile.h" ++#include "dynamic-art.h" + #include "err.h" + #include "playlist.h" + #include "restart.h" +--- a/src/mp3-scanner.h ++++ b/src/mp3-scanner.h +@@ -74,5 +74,6 @@ extern void make_composite_tags(MP3FILE *song); + + /* this should be refactored out of here... */ + extern off_t aac_drilltoatom(FILE *aac_fp, char *atom_path, unsigned int *atom_length); ++extern long scan_aac_findatom(FILE *fin, long max_offset, char *which_atom, int *atom_size); + + #endif /* _MP3_SCANNER_H_ */ +--- a/src/parser.y ++++ b/src/parser.y +@@ -26,11 +26,14 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> ++#include <time.h> + #include "playlist.h" + ++#define YYPARSE_PARAM + #define YYERROR_VERBOSE 1 + + extern int yyerror(char *msg); ++extern int yylex(void); + + /* Forwards */ + +--- a/src/query.c ++++ b/src/query.c +@@ -2,6 +2,7 @@ + #include "config.h" + #endif + ++#include <ctype.h> + #include <stdlib.h> + #include <string.h> + #include <stdio.h> +--- a/src/webserver.c ++++ b/src/webserver.c +@@ -41,6 +41,7 @@ + #include <sys/types.h> + #include <sys/socket.h> + ++#include "configfile.h" + #include "err.h" + #include "webserver.h" + diff --git a/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-musl.patch b/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-musl.patch new file mode 100644 index 000000000000..707b7ac3b828 --- /dev/null +++ b/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-musl.patch @@ -0,0 +1,32 @@ +https://bugs.gentoo.org/716010 +--- a/src/mp3-scanner.c ++++ b/src/mp3-scanner.c +@@ -378,7 +378,7 @@ int scan_init(char *path) { + */ + int scan_path(char *path) { + DIR *current_dir; +- char de[sizeof(struct dirent) + MAXNAMLEN + 1]; /* overcommit for solaris */ ++ char de[sizeof(struct dirent) + NAME_MAX + 1]; /* overcommit for solaris */ + struct dirent *pde; + int err; + char mp3_path[PATH_MAX]; +--- a/src/webserver.c ++++ b/src/webserver.c +@@ -1029,14 +1029,14 @@ int ws_returnerror(WS_CONNINFO *pwsc,int error, char *description) { + * and serves it up + */ + void ws_defaulthandler(WS_PRIVATE *pwsp, WS_CONNINFO *pwsc) { +- char path[MAXPATHLEN]; +- char resolved_path[MAXPATHLEN]; ++ char path[PATH_MAX]; ++ char resolved_path[PATH_MAX]; + int file_fd; + off_t len; + + DPRINTF(E_SPAM,L_WS,"Entering ws_defaulthandler\n"); + +- snprintf(path,MAXPATHLEN,"%s/%s",pwsp->wsconfig.web_root,pwsc->uri); ++ snprintf(path,PATH_MAX,"%s/%s",pwsp->wsconfig.web_root,pwsc->uri); + if(!realpath(path,resolved_path)) { + pwsc->error=errno; + DPRINTF(E_WARN,L_WS,"Exiting ws_defaulthandler: Cannot resolve %s\n",path); diff --git a/media-sound/mt-daapd/files/mt-daapd.tmpfiles b/media-sound/mt-daapd/files/mt-daapd.tmpfiles new file mode 100644 index 000000000000..e0923ac06d7c --- /dev/null +++ b/media-sound/mt-daapd/files/mt-daapd.tmpfiles @@ -0,0 +1 @@ +d /var/cache/mt-daapd 0755 root root - diff --git a/media-sound/mt-daapd/mt-daapd-0.2.4.2-r2.ebuild b/media-sound/mt-daapd/mt-daapd-0.2.4.2-r2.ebuild new file mode 100644 index 000000000000..1ef6c391d0db --- /dev/null +++ b/media-sound/mt-daapd/mt-daapd-0.2.4.2-r2.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools tmpfiles + +DESCRIPTION="A multi-threaded implementation of Apple's DAAP server" +HOMEPAGE="https://sourceforge.net/projects/mt-daapd/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="vorbis" + +RDEPEND=" + media-libs/libid3tag:= + net-dns/avahi[dbus] + sys-libs/gdbm:= + sys-libs/zlib:= + vorbis? ( + media-libs/libvorbis + media-libs/libogg + )" +DEPEND="${RDEPEND}" +BDEPEND=" + app-alternatives/yacc + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-0.2.3-sparc.patch + "${FILESDIR}"/${PN}-0.2.4.1-libsorder.patch + "${FILESDIR}"/${PN}-0.2.4.1-pidfile.patch + "${FILESDIR}"/${P}-maintainer-mode.patch + "${FILESDIR}"/${P}-oggvorbis.patch + "${FILESDIR}"/${P}-clang16.patch + "${FILESDIR}"/${P}-musl.patch +) + +src_prepare() { + default + + # parser.y is fixed by the clang16 patch, force regeneration + rm src/parser.c || die + + mv configure.{in,ac} || die + eautoreconf +} + +src_configure() { + econf \ + $(use_enable vorbis oggvorbis) \ + --disable-maintainer-mode \ + --enable-avahi \ + --disable-mdns +} + +src_install() { + default + + insinto /etc + newins contrib/mt-daapd.conf mt-daapd.conf.example + doins contrib/mt-daapd.playlist + + newinitd "${FILESDIR}"/${PN}.init.2 ${PN} + + keepdir /etc/mt-daapd.d + + newtmpfiles "${FILESDIR}"/mt-daapd.tmpfiles mt-daapd.conf +} + +pkg_postinst() { + tmpfiles_process mt-daapd.conf + + elog + elog "You have to configure your mt-daapd.conf following" + elog "${EROOT}/etc/mt-daapd.conf.example file." + elog + + if use vorbis; then + elog + elog "You need to edit you extensions list in ${EROOT}/etc/mt-daapd.conf" + elog "if you want your mt-daapd to serve ogg files." + elog + fi + + elog + elog "If you want to start more than one ${PN} service, symlink" + elog "${EROOT}/etc/init.d/${PN} to ${EROOT}/etc/init.d/${PN}.<name>, and it will" + elog "load the data from ${EROOT}/etc/${PN}.d/<name>.conf." + elog "Make sure that you have different cache directories for them." + elog +} diff --git a/sys-libs/db/db-4.8.30-r7.ebuild b/sys-libs/db/db-4.8.30-r8.ebuild index 776ad34df993..e40d00b495fe 100644 --- a/sys-libs/db/db-4.8.30-r7.ebuild +++ b/sys-libs/db/db-4.8.30-r8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -41,6 +41,7 @@ PATCHES=( "${FILESDIR}"/${PN}-4.8-libtool.patch "${FILESDIR}"/${PN}-4.8.30-rename-atomic-compare-exchange.patch "${FILESDIR}"/${PN}-4.8-wformat-security.patch + "${FILESDIR}"/${PN}-4.8.30-clang16.patch ) src_prepare() { diff --git a/sys-libs/db/db-5.3.28-r8.ebuild b/sys-libs/db/db-5.3.28-r9.ebuild index 6b76da14de94..4918af5d46fe 100644 --- a/sys-libs/db/db-5.3.28-r8.ebuild +++ b/sys-libs/db/db-5.3.28-r9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -56,6 +56,7 @@ PATCHES=( # Needed when compiling with clang "${FILESDIR}"/${PN}-5.1.29-rename-atomic-compare-exchange.patch + "${FILESDIR}"/${PN}-5.3.28-clang16.patch ) src_prepare() { diff --git a/sys-libs/db/files/db-4.8.30-clang16.patch b/sys-libs/db/files/db-4.8.30-clang16.patch new file mode 100644 index 000000000000..b28eb145e4a8 --- /dev/null +++ b/sys-libs/db/files/db-4.8.30-clang16.patch @@ -0,0 +1,281 @@ +https://bugs.gentoo.org/883413 +--- a/dist/aclocal/clock.m4 ++++ b/dist/aclocal/clock.m4 +@@ -20,12 +20,14 @@ esac + # existence to mean the clock really exists. + AC_CACHE_CHECK([for clock_gettime monotonic clock], db_cv_clock_monotonic, [ + AC_TRY_RUN([ ++#include <time.h> + #include <sys/time.h> +-main() { ++int main(void) { + struct timespec t; + return (clock_gettime(CLOCK_MONOTONIC, &t) != 0); + }], db_cv_clock_monotonic=yes, db_cv_clock_monotonic=no, + AC_TRY_LINK([ ++#include <time.h> + #include <sys/time.h>], [ + struct timespec t; + clock_gettime(CLOCK_MONOTONIC, &t); +--- a/dist/aclocal/mutex.m4 ++++ b/dist/aclocal/mutex.m4 +@@ -3,8 +3,9 @@ + # POSIX pthreads tests: inter-process safe and intra-process only. + AC_DEFUN(AM_PTHREADS_SHARED, [ + AC_TRY_RUN([ ++#include <stdlib.h> + #include <pthread.h> +-main() { ++int main(void) { + pthread_cond_t cond; + pthread_mutex_t mutex; + pthread_condattr_t condattr; +@@ -24,6 +25,7 @@ main() { + pthread_mutexattr_destroy(&mutexattr)); + }], [db_cv_mutex="$1"],, + AC_TRY_LINK([ ++#include <stdlib.h> + #include <pthread.h>],[ + pthread_cond_t cond; + pthread_mutex_t mutex; +@@ -45,8 +47,9 @@ AC_TRY_LINK([ + ], [db_cv_mutex="$1"]))]) + AC_DEFUN(AM_PTHREADS_PRIVATE, [ + AC_TRY_RUN([ ++#include <stdlib.h> + #include <pthread.h> +-main() { ++int main(void) { + pthread_cond_t cond; + pthread_mutex_t mutex; + pthread_condattr_t condattr; +@@ -64,6 +67,7 @@ main() { + pthread_mutexattr_destroy(&mutexattr)); + }], [db_cv_mutex="$1"],, + AC_TRY_LINK([ ++#include <stdlib.h> + #include <pthread.h>],[ + pthread_cond_t cond; + pthread_mutex_t mutex; +@@ -158,6 +162,7 @@ if test "$db_cv_mutex" = no; then + # LWP threads: _lwp_XXX + if test "$db_cv_mutex" = no; then + AC_TRY_LINK([ ++ #include <stdlib.h> + #include <synch.h>],[ + static lwp_mutex_t mi = SHAREDMUTEX; + static lwp_cond_t ci = SHAREDCV; +@@ -174,6 +179,7 @@ if test "$db_cv_mutex" = no; then + LIBS="$LIBS -lthread" + AC_TRY_LINK([ + #include <thread.h> ++ #include <stdlib.h> + #include <synch.h>],[ + mutex_t mutex; + cond_t cond; +@@ -189,6 +195,7 @@ if test "$db_cv_mutex" = no; then + if test "$db_cv_mutex" = no -o "$db_cv_mutex" = ui_only; then + AC_TRY_LINK([ + #include <thread.h> ++ #include <stdlib.h> + #include <synch.h>],[ + mutex_t mutex; + cond_t cond; +@@ -213,7 +220,7 @@ if test "$db_cv_mutex" = no; then + # x86/gcc: FreeBSD, NetBSD, BSD/OS, Linux + AC_TRY_COMPILE(,[ + #if (defined(i386) || defined(__i386__)) && defined(__GNUC__) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -222,7 +229,7 @@ if test "$db_cv_mutex" = no; then + # x86_64/gcc: FreeBSD, NetBSD, BSD/OS, Linux + AC_TRY_COMPILE(,[ + #if (defined(x86_64) || defined(__x86_64__)) && defined(__GNUC__) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -245,7 +252,7 @@ if test "$db_cv_mutex" = no; then + AC_TRY_COMPILE(,[ + #if defined(__sparc__) && defined(__GNUC__) + asm volatile ("membar #StoreStore|#StoreLoad|#LoadStore"); +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -287,7 +294,7 @@ AC_TRY_LINK([ + msem_init(&x, 0); + msem_lock(&x, 0); + msem_unlock(&x, 0); +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -304,7 +311,7 @@ AC_TRY_LINK([ + msem_init(&x, 0); + msem_lock(&x, 0); + msem_unlock(&x, 0); +- exit(0); ++ return 0; + ], [db_cv_mutex=UNIX/msem_init]) + fi + +@@ -326,7 +333,7 @@ fi + if test "$db_cv_mutex" = no; then + AC_TRY_COMPILE(,[ + #if defined(__USLC__) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -383,7 +390,7 @@ fi + if test "$db_cv_mutex" = no; then + AC_TRY_COMPILE(,[ + #if defined(__alpha) && defined(__DECC) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -394,7 +401,7 @@ fi + if test "$db_cv_mutex" = no; then + AC_TRY_COMPILE(,[ + #if defined(__alpha) && defined(__GNUC__) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -405,7 +412,7 @@ fi + if test "$db_cv_mutex" = no; then + AC_TRY_COMPILE(,[ + #if defined(__arm__) && defined(__GNUC__) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -416,7 +423,7 @@ fi + if test "$db_cv_mutex" = no; then + AC_TRY_COMPILE(,[ + #if (defined(__mips) || defined(__mips__)) && defined(__GNUC__) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -427,7 +434,7 @@ fi + if test "$db_cv_mutex" = no; then + AC_TRY_COMPILE(,[ + #if (defined(__hppa) || defined(__hppa__)) && defined(__GNUC__) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -438,7 +445,7 @@ fi + if test "$db_cv_mutex" = no; then + AC_TRY_COMPILE(,[ + #if (defined(__powerpc__) || defined(__ppc__)) && defined(__GNUC__) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -449,7 +456,7 @@ fi + if test "$db_cv_mutex" = no; then + AC_TRY_COMPILE(,[ + #if (defined(mc68020) || defined(sun3)) && defined(__GNUC__) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -460,7 +467,7 @@ fi + if test "$db_cv_mutex" = no; then + AC_TRY_COMPILE(,[ + #if defined(__MVS__) && defined(__IBMC__) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -471,7 +478,7 @@ fi + if test "$db_cv_mutex" = no; then + AC_TRY_COMPILE(,[ + #if defined(__s390__) && defined(__GNUC__) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -482,7 +489,7 @@ fi + if test "$db_cv_mutex" = no; then + AC_TRY_COMPILE(,[ + #if defined(__ia64) && defined(__GNUC__) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -493,7 +500,7 @@ fi + if test "$db_cv_mutex" = no; then + AC_TRY_COMPILE(,[ + #if defined(_UTS) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -814,9 +821,9 @@ fi + if test "$db_cv_atomic" = no; then + AC_TRY_COMPILE(,[ + #if ((defined(i386) || defined(__i386__)) && defined(__GNUC__)) +- exit(0); ++ return 0; + #elif ((defined(x86_64) || defined(__x86_64__)) && defined(__GNUC__)) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -825,6 +832,7 @@ fi + + if test "$db_cv_atomic" = no; then + AC_TRY_LINK([ ++#include <stdlib.h> + #include <sys/atomic.h>],[ + volatile unsigned val = 1; + exit (atomic_inc_uint_nv(&val) != 2 || +--- a/dist/aclocal/sequence.m4 ++++ b/dist/aclocal/sequence.m4 +@@ -43,7 +43,9 @@ AC_DEFUN(AM_SEQUENCE_CONFIGURE, [ + # test, which won't test for the appropriate printf format strings. + if test "$db_cv_build_sequence" = "yes"; then + AC_TRY_RUN([ +- main() { ++ #include <stdio.h> ++ #include <string.h> ++ int main(void) { + $db_cv_seq_type l; + unsigned $db_cv_seq_type u; + char buf@<:@100@:>@; +@@ -59,7 +61,10 @@ AC_DEFUN(AM_SEQUENCE_CONFIGURE, [ + return (1); + return (0); + }],, [db_cv_build_sequence="no"], +- AC_TRY_LINK(,[ ++ AC_TRY_LINK([ ++ #include <stdio.h> ++ #include <string.h> ++ ],[ + $db_cv_seq_type l; + unsigned $db_cv_seq_type u; + char buf@<:@100@:>@; diff --git a/sys-libs/db/files/db-5.3.28-clang16.patch b/sys-libs/db/files/db-5.3.28-clang16.patch new file mode 100644 index 000000000000..aab73d87a06b --- /dev/null +++ b/sys-libs/db/files/db-5.3.28-clang16.patch @@ -0,0 +1,325 @@ +https://bugs.gentoo.org/883413 +--- a/dist/aclocal/clock.m4 ++++ b/dist/aclocal/clock.m4 +@@ -20,12 +20,14 @@ esac + # existence to mean the clock really exists. + AC_CACHE_CHECK([for clock_gettime monotonic clock], db_cv_clock_monotonic, [ + AC_TRY_RUN([ ++#include <time.h> + #include <sys/time.h> +-main() { ++int main(void) { + struct timespec t; + return (clock_gettime(CLOCK_MONOTONIC, &t) != 0); + }], db_cv_clock_monotonic=yes, db_cv_clock_monotonic=no, + AC_TRY_LINK([ ++#include <time.h> + #include <sys/time.h>], [ + struct timespec t; + clock_gettime(CLOCK_MONOTONIC, &t); +--- a/dist/aclocal/mmap.m4 ++++ b/dist/aclocal/mmap.m4 +@@ -29,6 +29,7 @@ if test "$mmap_ok" = "yes" ; then + * system to system. + */ + #include <stdio.h> ++ #include <stdlib.h> + #include <string.h> + #include <sys/types.h> + #include <sys/stat.h> +@@ -42,13 +43,12 @@ if test "$mmap_ok" = "yes" ; then + #define MAP_FAILED (-1) + #endif + +- int catch_sig(sig) +- int sig; ++ void catch_sig(int sig) + { + exit(1); + } + +- main() { ++ int main(void) { + const char *underlying; + unsigned gapsize; + char *base; +--- a/dist/aclocal/mutex.m4 ++++ b/dist/aclocal/mutex.m4 +@@ -5,7 +5,7 @@ AC_DEFUN(AM_PTHREADS_SHARED, [ + AC_TRY_RUN([ + #include <stdlib.h> + #include <pthread.h> +-main() { ++int main(void) { + pthread_cond_t cond; + pthread_mutex_t mutex; + pthread_condattr_t condattr; +@@ -49,7 +49,7 @@ AC_DEFUN(AM_PTHREADS_PRIVATE, [ + AC_TRY_RUN([ + #include <stdlib.h> + #include <pthread.h> +-main() { ++int main(void) { + pthread_cond_t cond; + pthread_mutex_t mutex; + pthread_condattr_t condattr; +@@ -89,7 +89,7 @@ AC_DEFUN(AM_PTHREADS_CONDVAR_DUPINITCHK, [ + AC_TRY_RUN([ + #include <stdlib.h> + #include <pthread.h> +-main() { ++int main(void) { + pthread_cond_t cond; + pthread_condattr_t condattr; + exit(pthread_condattr_init(&condattr) || +@@ -110,7 +110,7 @@ AC_DEFUN(AM_PTHREADS_RWLOCKVAR_DUPINITCHK, [ + AC_TRY_RUN([ + #include <stdlib.h> + #include <pthread.h> +-main() { ++int main(void) { + pthread_rwlock_t rwlock; + pthread_rwlockattr_t rwlockattr; + exit(pthread_rwlockattr_init(&rwlockattr) || +@@ -227,6 +227,7 @@ if test "$db_cv_mutex" = no; then + # LWP threads: _lwp_XXX + if test "$db_cv_mutex" = no; then + AC_TRY_LINK([ ++ #include <stdlib.h> + #include <synch.h>],[ + static lwp_mutex_t mi = SHAREDMUTEX; + static lwp_cond_t ci = SHAREDCV; +@@ -243,6 +244,7 @@ if test "$db_cv_mutex" = no; then + LIBS="$LIBS -lthread" + AC_TRY_LINK([ + #include <thread.h> ++ #include <stdlib.h> + #include <synch.h>],[ + mutex_t mutex; + cond_t cond; +@@ -258,6 +260,7 @@ if test "$db_cv_mutex" = no; then + if test "$db_cv_mutex" = no -o "$db_cv_mutex" = ui_only; then + AC_TRY_LINK([ + #include <thread.h> ++ #include <stdlib.h> + #include <synch.h>],[ + mutex_t mutex; + cond_t cond; +@@ -282,7 +285,7 @@ if test "$db_cv_mutex" = no; then + # x86/gcc: FreeBSD, NetBSD, BSD/OS, Linux + AC_TRY_COMPILE(,[ + #if (defined(i386) || defined(__i386__)) && defined(__GNUC__) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -291,7 +294,7 @@ if test "$db_cv_mutex" = no; then + # x86_64/gcc: FreeBSD, NetBSD, BSD/OS, Linux + AC_TRY_COMPILE(,[ + #if (defined(x86_64) || defined(__x86_64__)) && defined(__GNUC__) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -314,7 +317,7 @@ if test "$db_cv_mutex" = no; then + AC_TRY_COMPILE(,[ + #if defined(__sparc__) && defined(__GNUC__) + asm volatile ("membar #StoreStore|#StoreLoad|#LoadStore"); +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -356,7 +359,7 @@ AC_TRY_LINK([ + msem_init(&x, 0); + msem_lock(&x, 0); + msem_unlock(&x, 0); +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -373,7 +376,7 @@ AC_TRY_LINK([ + msem_init(&x, 0); + msem_lock(&x, 0); + msem_unlock(&x, 0); +- exit(0); ++ return 0; + ], [db_cv_mutex=UNIX/msem_init]) + fi + +@@ -395,7 +398,7 @@ fi + if test "$db_cv_mutex" = no; then + AC_TRY_COMPILE(,[ + #if defined(__USLC__) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -452,7 +455,7 @@ fi + if test "$db_cv_mutex" = no; then + AC_TRY_COMPILE(,[ + #if defined(__alpha) && defined(__DECC) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -463,7 +466,7 @@ fi + if test "$db_cv_mutex" = no; then + AC_TRY_COMPILE(,[ + #if defined(__alpha) && defined(__GNUC__) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -474,7 +477,7 @@ fi + if test "$db_cv_mutex" = no; then + AC_TRY_COMPILE(,[ + #if defined(__arm__) && defined(__GNUC__) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -485,7 +488,7 @@ fi + if test "$db_cv_mutex" = no; then + AC_TRY_COMPILE(,[ + #if (defined(__mips) || defined(__mips__)) && defined(__GNUC__) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -496,7 +499,7 @@ fi + if test "$db_cv_mutex" = no; then + AC_TRY_COMPILE(,[ + #if (defined(__hppa) || defined(__hppa__)) && defined(__GNUC__) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -507,7 +510,7 @@ fi + if test "$db_cv_mutex" = no; then + AC_TRY_COMPILE(,[ + #if (defined(__powerpc__) || defined(__ppc__)) && defined(__GNUC__) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -518,7 +521,7 @@ fi + if test "$db_cv_mutex" = no; then + AC_TRY_COMPILE(,[ + #if (defined(mc68020) || defined(sun3)) && defined(__GNUC__) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -529,7 +532,7 @@ fi + if test "$db_cv_mutex" = no; then + AC_TRY_COMPILE(,[ + #if defined(__MVS__) && defined(__IBMC__) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -540,7 +543,7 @@ fi + if test "$db_cv_mutex" = no; then + AC_TRY_COMPILE(,[ + #if defined(__s390__) && defined(__GNUC__) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -551,7 +554,7 @@ fi + if test "$db_cv_mutex" = no; then + AC_TRY_COMPILE(,[ + #if defined(__ia64) && defined(__GNUC__) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -562,7 +565,7 @@ fi + if test "$db_cv_mutex" = no; then + AC_TRY_COMPILE(,[ + #if defined(_UTS) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -910,9 +913,9 @@ fi + if test "$db_cv_atomic" = no; then + AC_TRY_COMPILE(,[ + #if ((defined(i386) || defined(__i386__)) && defined(__GNUC__)) +- exit(0); ++ return 0; + #elif ((defined(x86_64) || defined(__x86_64__)) && defined(__GNUC__)) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -921,6 +924,7 @@ fi + + if test "$db_cv_atomic" = no; then + AC_TRY_LINK([ ++#include <stdlib.h> + #include <sys/atomic.h>],[ + volatile unsigned val = 1; + exit (atomic_inc_uint_nv(&val) != 2 || +--- a/dist/aclocal/sequence.m4 ++++ b/dist/aclocal/sequence.m4 +@@ -43,7 +43,9 @@ AC_DEFUN(AM_SEQUENCE_CONFIGURE, [ + # test, which won't test for the appropriate printf format strings. + if test "$db_cv_build_sequence" = "yes"; then + AC_TRY_RUN([ +- main() { ++ #include <stdio.h> ++ #include <string.h> ++ int main(void) { + $db_cv_seq_type l; + unsigned $db_cv_seq_type u; + char buf@<:@100@:>@; +@@ -59,7 +61,10 @@ AC_DEFUN(AM_SEQUENCE_CONFIGURE, [ + return (1); + return (0); + }],, [db_cv_build_sequence="no"], +- AC_TRY_LINK(,[ ++ AC_TRY_LINK([ ++ #include <stdio.h> ++ #include <string.h> ++ ],[ + $db_cv_seq_type l; + unsigned $db_cv_seq_type u; + char buf@<:@100@:>@; +--- a/dist/aclocal/types.m4 ++++ b/dist/aclocal/types.m4 +@@ -69,7 +69,7 @@ AC_SUBST(stdint_h_decl) + AC_MSG_CHECKING(for stdint.h) + AC_COMPILE_IFELSE([AC_LANG_SOURCE([ + #include <stdint.h> +- int main() { ++ int main(void) { + uint_least8_t x=0; + return x; + }])],[AC_MSG_RESULT(yes) +@@ -77,7 +77,7 @@ if test "$db_cv_cxx" = "yes"; then + AC_MSG_CHECKING([if stdint.h can be used by C++]) + AC_LANG_PUSH(C++) + AC_COMPILE_IFELSE([AC_LANG_SOURCE([#include <stdint.h> +- int main() { ++ int main(void) { + uint_least8_t x=0; + return x; + }])],[AC_MSG_RESULT(yes) diff --git a/sys-process/bottom/bottom-0.7.1.ebuild b/sys-process/bottom/bottom-0.7.1.ebuild index d3c617cdda44..ccf77a13ec78 100644 --- a/sys-process/bottom/bottom-0.7.1.ebuild +++ b/sys-process/bottom/bottom-0.7.1.ebuild @@ -219,7 +219,7 @@ SRC_URI="$(cargo_crate_uris)" LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 ISC MIT Unlicense ZLIB" SLOT="0" -KEYWORDS="amd64 ~arm64 ~ppc64" +KEYWORDS="amd64 arm64 ppc64" IUSE="+battery" # Rust packages ignore CFLAGS and LDFLAGS so let's silence the QA warnings |