commit:     e31f9606235bc9de090279da8371849b64d4275a
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  8 00:31:23 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Oct  8 00:42:05 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e31f9606

dev-util/min-cscope: fix build with upcoming clang16

Also sneak in the missing ncurses dep while revbumping.

Closes: https://bugs.gentoo.org/871162
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 .../min-cscope/files/min-cscope-16.1.0-pointer-type.patch     | 11 +++++++++++
 ...in-cscope-16.1.0-r1.ebuild => min-cscope-16.1.0-r2.ebuild} |  7 ++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/dev-util/min-cscope/files/min-cscope-16.1.0-pointer-type.patch 
b/dev-util/min-cscope/files/min-cscope-16.1.0-pointer-type.patch
new file mode 100644
index 000000000000..6d54b253b501
--- /dev/null
+++ b/dev-util/min-cscope/files/min-cscope-16.1.0-pointer-type.patch
@@ -0,0 +1,11 @@
+Fix build with -Werror=incompatible-pointer-types that's due
+to become a default on clang16.
+
+https://bugs.gentoo.org/871162
+--- a/src/exec.c
++++ b/src/exec.c
+@@ -75,3 +75,3 @@
+       int     exitcode = -1;  /* initialize, to avoid warning */
+-      const char      *argv[BUFSIZ];
++      char    *argv[BUFSIZ];
+       pid_t   p;

diff --git a/dev-util/min-cscope/min-cscope-16.1.0-r1.ebuild 
b/dev-util/min-cscope/min-cscope-16.1.0-r2.ebuild
similarity index 78%
rename from dev-util/min-cscope/min-cscope-16.1.0-r1.ebuild
rename to dev-util/min-cscope/min-cscope-16.1.0-r2.ebuild
index 0d3a3575f8b8..1dd28afb54b3 100644
--- a/dev-util/min-cscope/min-cscope-16.1.0-r1.ebuild
+++ b/dev-util/min-cscope/min-cscope-16.1.0-r2.ebuild
@@ -15,10 +15,14 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="debug"
 
+RDEPEND="sys-libs/ncurses:="
+DEPEND="${RDEPEND}"
+
 DOCS=( AUTHORS README{,.cscope} TODO )
 
 PATCHES=(
        "${FILESDIR}/${P}-tinfo.patch" # bug #678886
+       "${FILESDIR}/${P}-pointer-type.patch"
 )
 
 src_prepare() {
@@ -29,7 +33,8 @@ src_prepare() {
 }
 
 src_configure() {
-       append-flags -I"${S}"/sort
+       # -D_GNU_SOURCE for qsort_r, bug #871162
+       append-cppflags -I"${S}"/sort -D_GNU_SOURCE
 
        cmake_src_configure
 }

Reply via email to