From b76fdfa356a9ea359923a588d3fe0a11b7eab3eb Mon Sep 17 00:00:00 2001 From: thomas Date: Mon, 30 Jul 2018 13:18:56 +0200 Subject: [PATCH 1/4] make: revert to official source --- make.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make.be0 b/make.be0 index 0acd6b460..b7d64429c 100755 --- a/make.be0 +++ b/make.be0 @@ -9,7 +9,7 @@ ## 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]="/src/mariux/beeroot/downloads/make-8a731d1b2cc262d03e0246a4869c704b6c1599ec.tar.gz" +SRCURL[0]="https://ftp.gnu.org/gnu/make/make-${PKGVERSION}.tar.bz2" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array. From a93e36afca698570281d5e640b66dc5bc6503d0d Mon Sep 17 00:00:00 2001 From: thomas Date: Mon, 30 Jul 2018 13:25:51 +0200 Subject: [PATCH 2/4] make: add patches --- make.be0 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/make.be0 b/make.be0 index b7d64429c..2934f9e56 100755 --- a/make.be0 +++ b/make.be0 @@ -15,7 +15,8 @@ SRCURL[0]="https://ftp.gnu.org/gnu/make/make-${PKGVERSION}.tar.bz2" ## Add URLs/pathes to patch files to the PATCHURL array. ## The sources will be patched in the order of the array. -# PATCHURL+=() +PATCHURL+=(/src/mariux/patches/make.guile22.diff.gz) +PATCHURL+=(/src/mariux/patches/make.glibc-2.27.glob.diff.gz) ############################################################################### ## Add filename patterns to the EXCLUDE array of files that should not From 3101b50ad8773feaffacf41c9356d8d07b9a6268 Mon Sep 17 00:00:00 2001 From: thomas Date: Mon, 30 Jul 2018 13:34:25 +0200 Subject: [PATCH 3/4] make: slightly reorganize build process --- make.be0 | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/make.be0 b/make.be0 index 2934f9e56..c179bbd75 100755 --- a/make.be0 +++ b/make.be0 @@ -51,18 +51,14 @@ PATCHURL+=(/src/mariux/patches/make.glibc-2.27.glob.diff.gz) #} mee_patch() { - autoreconf -i bee_patch "${@}" + autoreconf -vif } #mee_configure() { # bee_configure #} -mee_build_pre() { - start_cmd make update -} - #mee_build() { # bee_build #} From 0bfac156e38019108562755079e319703453dd63 Mon Sep 17 00:00:00 2001 From: thomas Date: Mon, 30 Jul 2018 13:34:58 +0200 Subject: [PATCH 4/4] make: bump build-id by one --- make.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make.be0 b/make.be0 index c179bbd75..e09ec517e 100755 --- a/make.be0 +++ b/make.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION make-4.2.1-1 +# BEE_VERSION make-4.2.1-2 ## 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.)