commit: aba688c9974e4ab03b6c3eb23ca69eb5cf15c587 Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> AuthorDate: Sun Sep 6 09:45:26 2020 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Sep 16 01:42:40 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aba688c9
dev-util/cgdb: respect AR, use eautoreconf for building Eautoreconf ensures safe handling of the build scripts, so let's use that while setting AT_M4DIR to search for m4 files in the appropriate directory. Closes: https://bugs.gentoo.org/724256 Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> Closes: https://github.com/gentoo/gentoo/pull/17435 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-util/cgdb/cgdb-0.6.8.ebuild | 11 +++++++-- dev-util/cgdb/cgdb-0.7.0-r2.ebuild | 8 +++++-- dev-util/cgdb/cgdb-0.7.1.ebuild | 8 +++++-- dev-util/cgdb/cgdb-9999.ebuild | 11 +++++++-- dev-util/cgdb/files/cgdb-0.7.1-respect-AR.patch | 32 +++++++++++++++++++++++++ 5 files changed, 62 insertions(+), 8 deletions(-) diff --git a/dev-util/cgdb/cgdb-0.6.8.ebuild b/dev-util/cgdb/cgdb-0.6.8.ebuild index c38d3ca1e86..ca101810c78 100644 --- a/dev-util/cgdb/cgdb-0.6.8.ebuild +++ b/dev-util/cgdb/cgdb-0.6.8.ebuild @@ -12,7 +12,8 @@ else SRC_URI="https://github.com/cgdb/cgdb/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux" fi -inherit multilib-minimal +inherit autotools multilib-minimal +AT_M4DIR=config DESCRIPTION="A curses front-end for GDB, the GNU debugger" HOMEPAGE="https://cgdb.github.io/"; @@ -34,9 +35,15 @@ RDEPEND=" DOCS=( AUTHORS ChangeLog INSTALL NEWS README.md TODO ) +PATCHES=( + # Bug: #724256 + "${FILESDIR}/${PN}-0.7.1-respect-AR.patch" +) + src_prepare() { + cp configure.{init,ac} || die "cp failed" default - ./autogen.sh || die + eautoreconf } multilib_src_configure() { diff --git a/dev-util/cgdb/cgdb-0.7.0-r2.ebuild b/dev-util/cgdb/cgdb-0.7.0-r2.ebuild index b2a19f371e8..d85e7280153 100644 --- a/dev-util/cgdb/cgdb-0.7.0-r2.ebuild +++ b/dev-util/cgdb/cgdb-0.7.0-r2.ebuild @@ -12,7 +12,8 @@ else SRC_URI="https://github.com/cgdb/cgdb/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" fi -inherit multilib-minimal +inherit autotools multilib-minimal +AT_M4DIR=config DESCRIPTION="A curses front-end for GDB, the GNU debugger" HOMEPAGE="https://cgdb.github.io/"; @@ -40,11 +41,14 @@ DOCS=( AUTHORS ChangeLog FAQ INSTALL NEWS README.md ) PATCHES=( # Bugs: #730138, #678006, #630512, #682386 "${FILESDIR}/${PN}-test.patch" + # Bug: #724256 + "${FILESDIR}/${PN}-0.7.1-respect-AR.patch" ) src_prepare() { + cp configure.{init,ac} || die "cp failed" default - ./autogen.sh || die + eautoreconf } multilib_src_test() { diff --git a/dev-util/cgdb/cgdb-0.7.1.ebuild b/dev-util/cgdb/cgdb-0.7.1.ebuild index 9b0c032ba93..91acfa8d772 100644 --- a/dev-util/cgdb/cgdb-0.7.1.ebuild +++ b/dev-util/cgdb/cgdb-0.7.1.ebuild @@ -12,7 +12,8 @@ else SRC_URI="https://github.com/cgdb/cgdb/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" fi -inherit multilib-minimal +inherit autotools multilib-minimal +AT_M4DIR=config DESCRIPTION="A curses front-end for GDB, the GNU debugger" HOMEPAGE="https://cgdb.github.io/"; @@ -40,11 +41,14 @@ DOCS=( AUTHORS ChangeLog FAQ INSTALL NEWS README.md ) PATCHES=( # Bugs: #730138, #678006, #630512 "${FILESDIR}/${PN}-test.patch" + # Bug: #724256 + "${FILESDIR}/${P}-respect-AR.patch" ) src_prepare() { + cp configure.{init,ac} || die "cp failed" default - ./autogen.sh || die + eautoreconf } multilib_src_test() { diff --git a/dev-util/cgdb/cgdb-9999.ebuild b/dev-util/cgdb/cgdb-9999.ebuild index 403e3567898..8750c546e4c 100644 --- a/dev-util/cgdb/cgdb-9999.ebuild +++ b/dev-util/cgdb/cgdb-9999.ebuild @@ -12,7 +12,8 @@ else SRC_URI="https://github.com/cgdb/cgdb/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" fi -inherit multilib-minimal +inherit autotools multilib-minimal +AT_M4DIR=config DESCRIPTION="A curses front-end for GDB, the GNU debugger" HOMEPAGE="https://cgdb.github.io/"; @@ -37,9 +38,15 @@ RDEPEND=" DOCS=( AUTHORS ChangeLog FAQ INSTALL NEWS README.md ) +PATCHES=( + # Bug: #724256 + "${FILESDIR}/${PN}-0.7.1-respect-AR.patch" +) + src_prepare() { + cp configure.{init,ac} || die "cp failed" default - ./autogen.sh || die + eautoreconf } multilib_src_test() { diff --git a/dev-util/cgdb/files/cgdb-0.7.1-respect-AR.patch b/dev-util/cgdb/files/cgdb-0.7.1-respect-AR.patch new file mode 100644 index 00000000000..e9837855ee3 --- /dev/null +++ b/dev-util/cgdb/files/cgdb-0.7.1-respect-AR.patch @@ -0,0 +1,32 @@ +From: Jakov Smolic <[email protected]> +Date: Sun, 6 Sep 2020 11:33:02 +0200 +Subject: [PATCH] configure.init: respect AR +Bug: https://bugs.gentoo.org/724256 +Patch taken from https://github.com/cgdb/cgdb/pull/142 + +Signed-off-by: Jakov Smolic <[email protected]> +--- + configure.init | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/configure.init b/configure.init +index 920b2a3..d2f696d 100644 +--- a/configure.init ++++ b/configure.init +@@ -13,6 +13,13 @@ AC_PROG_INSTALL + AC_PROG_RANLIB + AM_PROG_LEX + AC_PROG_YACC ++m4_ifndef([AC_PROG_AR],[dnl ++ AN_MAKEVAR([AR], [AC_PROG_AR]) ++ AN_PROGRAM([ar], [AC_PROG_AR]) ++ AC_DEFUN([AC_PROG_AR], ++ [AC_CHECK_TOOL(AR, ar, :)]) ++]) ++AC_PROG_AR + + dnl determine if we are running in linux, cygwin, solaris, or freebsd + AC_CANONICAL_HOST +-- +2.26.2 +
