From e74b4738482c88609522e8c7625039cd319a7764 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 28 May 2018 15:50:42 +0200 Subject: [PATCH] make: Use git version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Building Mozilla Thunderbird 52.8.0, GNU Make 4.2.1 terminates with a segmentation faults. > make[5050]: segfault at 65b502 ip 000000000065b502 sp 00007fff06dc9128 error 15 Unfortunately, the backtrace is not helpful, and Valgrind says it’s an illegal instruction. But, it’s probably some form of corruption, and using the version from git fixes the issue, so use that. [1]: https://git.savannah.gnu.org/cgit/make.git/commit/?id=8a731d1b2cc262d03e0246a4869c704b6c1599ec --- make.be0 | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/make.be0 b/make.be0 index 68873e1e0..0acd6b460 100755 --- a/make.be0 +++ b/make.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION make-4.2.1-0 +# BEE_VERSION make-4.2.1-1 ## this file was created by bee init and should be executed to build a ## bee-package. (Additional hints are located at the end of this file.) @@ -9,13 +9,13 @@ ## The source URL(s) define the location of the sources that will be ## downloaded. Version variables may be used to simplify reuse of this bee-file. -SRCURL[0]="https://ftp.gnu.org/gnu/make/make-${PKGVERSION}.tar.bz2" +SRCURL[0]="/src/mariux/beeroot/downloads/make-8a731d1b2cc262d03e0246a4869c704b6c1599ec.tar.gz" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array. ## The sources will be patched in the order of the array. -PATCHURL+=(/src/mariux/patches/make-configure.patch) +# PATCHURL+=() ############################################################################### ## Add filename patterns to the EXCLUDE array of files that should not @@ -49,14 +49,19 @@ PATCHURL+=(/src/mariux/patches/make-configure.patch) # bee_extract "${@}" #} -#mee_patch() { -# bee_patch "${@}" -#} +mee_patch() { + autoreconf -i + bee_patch "${@}" +} #mee_configure() { # bee_configure #} +mee_build_pre() { + start_cmd make update +} + #mee_build() { # bee_build #}