From 6069bb281f0d021726c267276818b1c8763bc040 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= Date: Tue, 5 Nov 2024 01:02:09 +0100 Subject: [PATCH] dev-embedded/arduino-ctags: fix configure phase for modern c MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: https://bugs.gentoo.org/900022 Signed-off-by: Andreas K. Hüttel --- ...build => arduino-ctags-20161123-r2.ebuild} | 11 +++++++++- ...arduino-ctags-20161123-implicit-exit.patch | 21 +++++++++++++++++++ .../arduino-ctags-20161123-implicit-int.patch | 12 +++++++++++ 3 files changed, 43 insertions(+), 1 deletion(-) rename dev-embedded/arduino-ctags/{arduino-ctags-20161123-r1.ebuild => arduino-ctags-20161123-r2.ebuild} (79%) create mode 100644 dev-embedded/arduino-ctags/files/arduino-ctags-20161123-implicit-exit.patch create mode 100644 dev-embedded/arduino-ctags/files/arduino-ctags-20161123-implicit-int.patch diff --git a/dev-embedded/arduino-ctags/arduino-ctags-20161123-r1.ebuild b/dev-embedded/arduino-ctags/arduino-ctags-20161123-r2.ebuild similarity index 79% rename from dev-embedded/arduino-ctags/arduino-ctags-20161123-r1.ebuild rename to dev-embedded/arduino-ctags/arduino-ctags-20161123-r2.ebuild index 116436b6fd42b..77e78545e3847 100644 --- a/dev-embedded/arduino-ctags/arduino-ctags-20161123-r1.ebuild +++ b/dev-embedded/arduino-ctags/arduino-ctags-20161123-r2.ebuild @@ -1,8 +1,10 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 +inherit autotools + MY_COMMIT_HASH="abc8fca7499f44c725122881cd380a88c37abe0e" DESCRIPTION="Arduino private fork of dev-util/ctags" HOMEPAGE="https://github.com/arduino/ctags" @@ -15,8 +17,15 @@ KEYWORDS="amd64 x86" PATCHES=( "${FILESDIR}"/${PN}-20161123-gcc-unused-attribute.patch + "${FILESDIR}"/${PN}-20161123-implicit-exit.patch + "${FILESDIR}"/${PN}-20161123-implicit-int.patch ) +src_prepare() { + default + eautoreconf +} + src_configure() { econf \ --disable-readlib \ diff --git a/dev-embedded/arduino-ctags/files/arduino-ctags-20161123-implicit-exit.patch b/dev-embedded/arduino-ctags/files/arduino-ctags-20161123-implicit-exit.patch new file mode 100644 index 0000000000000..c14555ca503b2 --- /dev/null +++ b/dev-embedded/arduino-ctags/files/arduino-ctags-20161123-implicit-exit.patch @@ -0,0 +1,21 @@ +diff '--color=auto' -ruN ctags-abc8fca7499f44c725122881cd380a88c37abe0e.orig/configure.ac ctags-abc8fca7499f44c725122881cd380a88c37abe0e/configure.ac +--- ctags-abc8fca7499f44c725122881cd380a88c37abe0e.orig/configure.ac 2016-11-23 10:52:52.000000000 +0100 ++++ ctags-abc8fca7499f44c725122881cd380a88c37abe0e/configure.ac 2024-11-05 00:53:01.050413525 +0100 +@@ -369,7 +369,8 @@ + AC_EXEEXT + + AC_MSG_CHECKING(if struct stat contains st_ino) +-AC_TRY_COMPILE([#include ], [ ++AC_TRY_COMPILE([#include ++#include ], [ + struct stat st; + stat(".", &st); + if (st.st_ino > 0) +@@ -449,6 +450,7 @@ + AC_TRY_RUN([ + #include + #include ++#include + main() { + regex_t patbuf; + exit (regcomp (&patbuf, "/hello/", 0) != 0); diff --git a/dev-embedded/arduino-ctags/files/arduino-ctags-20161123-implicit-int.patch b/dev-embedded/arduino-ctags/files/arduino-ctags-20161123-implicit-int.patch new file mode 100644 index 0000000000000..5331df9db0d05 --- /dev/null +++ b/dev-embedded/arduino-ctags/files/arduino-ctags-20161123-implicit-int.patch @@ -0,0 +1,12 @@ +diff '--color=auto' -ruN ctags-abc8fca7499f44c725122881cd380a88c37abe0e.orig/configure.ac ctags-abc8fca7499f44c725122881cd380a88c37abe0e/configure.ac +--- ctags-abc8fca7499f44c725122881cd380a88c37abe0e.orig/configure.ac 2024-11-05 00:55:57.281788938 +0100 ++++ ctags-abc8fca7499f44c725122881cd380a88c37abe0e/configure.ac 2024-11-05 00:59:21.852536947 +0100 +@@ -451,7 +451,7 @@ + #include + #include + #include +-main() { ++int main() { + regex_t patbuf; + exit (regcomp (&patbuf, "/hello/", 0) != 0); + }],regcomp_works=yes,regcomp_works=no,AC_DEFINE(CHECK_REGCOMP))