commit: f68e884496f6a534f2234bf154d6797b829e9d15 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Sun Dec 23 17:21:58 2018 +0000 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Sun Dec 23 17:22:23 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f68e8844
sys-devel/remake: Version bump Fixes the Perl 5.26 test failure and the glob-related build failure Bug: https://bugs.gentoo.org/636198 Closes: https://bugs.gentoo.org/649060 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> sys-devel/remake/Manifest | 1 + sys-devel/remake/files/make-4.2.1-glob-v2.patch | 30 +++++++++++++++++++++ sys-devel/remake/remake-4.2.1.1.4.ebuild | 36 +++++++++++++++++++++++++ 3 files changed, 67 insertions(+) diff --git a/sys-devel/remake/Manifest b/sys-devel/remake/Manifest index 79eaab381c1..1ca2f104cee 100644 --- a/sys-devel/remake/Manifest +++ b/sys-devel/remake/Manifest @@ -1,2 +1,3 @@ DIST remake-3.82+dbg0.9.tar.bz2 1152677 BLAKE2B bb4c61b2bad39be1e50c919c2c4b2f069df31a6b6d6e51863257a20ecace2395a16349f8dcafcb4c5bf020d423d91d7d9c9a3098ff2f6d2891a5d3bdbf54b126 SHA512 94682e9d0317088456dac683d67be320fe10bb06a3384969fafefe091558b215105ba3c96a7c1d4e0d970ea2dc5c4f535a704256fe7a4eaa87bec11d78d074cf DIST remake-4.1+dbg1.1.tar.bz2 1254246 BLAKE2B be1b18329b36d6c34aaa3270ae2c69b042d467d19bc99ac13562df387a3f0cd0bf19c7e39aebfa983614355c2d0921620609894850e1eb66f24ed08aea36ead3 SHA512 e0dfb0f7a3f05968c3597e73f2fd486929893546a8f993e99ae73c6400050d1faa5baed1b0588d399bfc6e58e8504f857c8734e39a02efd875b522b26dfaa421 +DIST remake-4.2.1+dbg-1.4.tar.bz2 1508613 BLAKE2B f83bf8b1154d87d3c729b51797011511c6d9a249dffd212a551602a2af1c874d50d631d0f0e3f00d1b4484db758b7d167c416b0be185ad2a16897a077d04e9f4 SHA512 ffb7d641e0bc99794c17f634fe0aa5bf909c1e1c8eb14873dd27f2950d913db393c3532c34f417307eba351e8732c366131a23e661f5fec9529edc5d778da0d1 diff --git a/sys-devel/remake/files/make-4.2.1-glob-v2.patch b/sys-devel/remake/files/make-4.2.1-glob-v2.patch new file mode 100644 index 00000000000..e55a7790a3f --- /dev/null +++ b/sys-devel/remake/files/make-4.2.1-glob-v2.patch @@ -0,0 +1,30 @@ +http://git.savannah.gnu.org/cgit/make.git/commit/?id=48c8a116a914a325a0497721f5d8b58d5bba34d4 + +--- make-4.2.1/configure 2016-06-11 01:03:21.000000000 +0200 ++++ make-4.2.1/configure 2016-06-11 01:03:21.000000000 +0200 +@@ -11481,10 +11481,9 @@ + #include <glob.h> + #include <fnmatch.h> + +-#define GLOB_INTERFACE_VERSION 1 + #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1 + # include <gnu-versions.h> +-# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION ++# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2 + gnu glob + # endif + #endif +--- make-4.2.1/configure.ac 2016-06-06 14:27:31.000000000 +0200 ++++ make-4.2.1/configure.ac 2016-06-06 14:27:31.000000000 +0200 +@@ -399,10 +399,9 @@ + #include <glob.h> + #include <fnmatch.h> + +-#define GLOB_INTERFACE_VERSION 1 + #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1 + # include <gnu-versions.h> +-# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION ++# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2 + gnu glob + # endif + #endif], diff --git a/sys-devel/remake/remake-4.2.1.1.4.ebuild b/sys-devel/remake/remake-4.2.1.1.4.ebuild new file mode 100644 index 00000000000..acc2d411cb8 --- /dev/null +++ b/sys-devel/remake/remake-4.2.1.1.4.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +MY_P="${PN}-${PV:0:5}+dbg-${PV:6}" + +DESCRIPTION="patched version of GNU make with improved error reporting, tracing and debugging" +HOMEPAGE="http://bashdb.sourceforge.net/remake/"; +SRC_URI="mirror://sourceforge/bashdb/${MY_P}.tar.bz2" + +LICENSE="GPL-1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="guile readline" + +RDEPEND="readline? ( sys-libs/readline:0= ) + guile? ( >=dev-scheme/guile-1.8:= )" +DEPEND="${RDEPEND}" + +S=${WORKDIR}/${MY_P} + +PATCHES=( + "${FILESDIR}/make-4.2.1-glob-v2.patch" +) + +src_configure() { + use readline || export vl_cv_lib_readline=no + econf $(use_with guile) +} + +src_install() { + default + # delete files GNU make owns and remake doesn't care about. + rm -r "${ED}"/usr/include || die +}
