From 0be25919374ef6c2336b7b0cedbe5162b923af27 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 11 May 2018 11:39:24 +0200 Subject: [PATCH 1/5] make: Convert to versionless bee file --- make-4.1-0.bee => make.be0 | 2 ++ 1 file changed, 2 insertions(+) rename make-4.1-0.bee => make.be0 (99%) diff --git a/make-4.1-0.bee b/make.be0 similarity index 99% rename from make-4.1-0.bee rename to make.be0 index 76e54b51b..68cc0d495 100755 --- a/make-4.1-0.bee +++ b/make.be0 @@ -1,5 +1,7 @@ #!/usr/bin/env beesh +# BEE_VERSION make-4.1-0 + # http://www.linuxfromscratch.org/lfs/view/stable-systemd/chapter06/make.html#contents-make # ## this file was created by bee init and should be executed to build a From d15fda6ebc61979090fd668f4f065e2623970b0f Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 11 May 2018 11:40:28 +0200 Subject: [PATCH 2/5] make: Securely download source archive Use HTTPS to securely download the source archive. --- make.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make.be0 b/make.be0 index 68cc0d495..643cad750 100755 --- a/make.be0 +++ b/make.be0 @@ -11,7 +11,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]="http://ftp.gnu.org/gnu/make/make-${PKGVERSION}.tar.bz2" +SRCURL[0]="https://ftp.gnu.org/gnu/make/make-${PKGVERSION}.tar.bz2" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array. From 62628048075e4ea9d1d9d8e5eb78bce57d079a43 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 11 May 2018 11:40:58 +0200 Subject: [PATCH 3/5] make: Strip trailing space --- make.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make.be0 b/make.be0 index 643cad750..f4b64a263 100755 --- a/make.be0 +++ b/make.be0 @@ -56,7 +56,7 @@ SRCURL[0]="https://ftp.gnu.org/gnu/make/make-${PKGVERSION}.tar.bz2" #} -# +# #mee_configure() { # bee_configure #} From 510caaa4184a0fb496138e402795f56c3730e09e Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 11 May 2018 11:41:56 +0200 Subject: [PATCH 4/5] make: Use current bee file template Copy it from `scripts/TEMPLATE.be0`. --- make.be0 | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/make.be0 b/make.be0 index f4b64a263..252e91929 100755 --- a/make.be0 +++ b/make.be0 @@ -1,9 +1,7 @@ #!/usr/bin/env beesh -# BEE_VERSION make-4.1-0 +# BEE_VERSION make-4.2.1-0 -# http://www.linuxfromscratch.org/lfs/view/stable-systemd/chapter06/make.html#contents-make -# ## 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.) @@ -26,8 +24,8 @@ SRCURL[0]="https://ftp.gnu.org/gnu/make/make-${PKGVERSION}.tar.bz2" # EXCLUDE+=() ############################################################################### -## Uncomment the next statement, if the software may not be able to be build -## outside the source directory and need to be build inside the source +## Uncomment the next statement, if the software may not be able to be built +## outside the source directory and needs to be built inside the source ## directory. # build_in_sourcedir @@ -55,8 +53,6 @@ SRCURL[0]="https://ftp.gnu.org/gnu/make/make-${PKGVERSION}.tar.bz2" # bee_patch "${@}" #} - -# #mee_configure() { # bee_configure #} From 5f4ed5983b70b39ab92194885ed2ff92f449e441 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 11 May 2018 11:49:23 +0200 Subject: [PATCH 5/5] make: Add patch to fix build error ``` gcc -pthread -g -O2 -Wl,--export-dynamic -o make ar.o arscan.o commands.o default.o dir.o expand.o file.o function.o getopt.o getopt1.o guile.o implicit.o job.o load.o loadapi.o main.o misc.o posixos.o output.o read.o remake.o rule.o signame.o strcache.o variable.o version.o vpath.o hash.o remote-stub.o glob/libglob.a -lguile -lgmp -lcrypt -lm -lltdl -ldl glob/libglob.a(glob.o): In function `glob_in_dir': /dev/shm/bee-root/make/make-4.2.1-0/source/glob/glob.c:1367: undefined reference to `__alloca' /dev/shm/bee-root/make/make-4.2.1-0/source/glob/glob.c:1342: undefined reference to `__alloca' /dev/shm/bee-root/make/make-4.2.1-0/source/glob/glob.c:1283: undefined reference to `__alloca' /dev/shm/bee-root/make/make-4.2.1-0/source/glob/glob.c:1256: undefined reference to `__alloca' glob/libglob.a(glob.o): In function `glob': /dev/shm/bee-root/make/make-4.2.1-0/source/glob/glob.c:581: undefined reference to `__alloca' glob/libglob.a(glob.o):/dev/shm/bee-root/make/make-4.2.1-0/source/glob/glob.c:732: more undefined references to `__alloca' follow collect2: error: ld returned 1 exit status ``` [1]: https://git.savannah.gnu.org/cgit/make.git/commit/?id=48c8a116a914a325a0497721f5d8b58d5bba34d4 [2]: https://lists.nongnu.org/archive/html/bug-make/2017-11/msg00027.html --- make.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make.be0 b/make.be0 index 252e91929..68873e1e0 100755 --- a/make.be0 +++ b/make.be0 @@ -15,7 +15,7 @@ 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-configure.patch) ############################################################################### ## Add filename patterns to the EXCLUDE array of files that should not