From 86b1baf8de99e804015b47ca3ea957aa0606b4e0 Mon Sep 17 00:00:00 2001 From: Antonio Dell'Elce Date: Sat, 29 Feb 2020 03:29:15 +0000 Subject: [PATCH 01/34] add scalapack module --- hooks/scalapack/configure.sh | 3 +++ modules/build/scalapack.sh | 6 ++++++ 2 files changed, 9 insertions(+) create mode 100644 hooks/scalapack/configure.sh create mode 100644 modules/build/scalapack.sh diff --git a/hooks/scalapack/configure.sh b/hooks/scalapack/configure.sh new file mode 100644 index 0000000..4014105 --- /dev/null +++ b/hooks/scalapack/configure.sh @@ -0,0 +1,3 @@ + + cd ${BUILDDIR}/scalapack + cmake "${srcdir_scalapack}" -DCMAKE_INSTALL_PREFIX=${prefix} diff --git a/modules/build/scalapack.sh b/modules/build/scalapack.sh new file mode 100644 index 0000000..9f04423 --- /dev/null +++ b/modules/build/scalapack.sh @@ -0,0 +1,6 @@ +build_scalapack() +{ + build_raw_lite scalapack + + return $? +} From 616ca0bc3c011c812253dbb602f4ce24a5f6d456 Mon Sep 17 00:00:00 2001 From: Antonio Dell'Elce Date: Sat, 29 Feb 2020 03:29:37 +0000 Subject: [PATCH 02/34] add gpaw profile --- mkit.config.sh | 2 +- mkit.profiles.sh | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/mkit.config.sh b/mkit.config.sh index 438893d..1d38ca7 100755 --- a/mkit.config.sh +++ b/mkit.config.sh @@ -7,7 +7,7 @@ ### ENV ### - export srcget="0.0.11.1" # srcget version + export srcget="0.0.11.2" # srcget version # vt100 family sequences export ESC="" diff --git a/mkit.profiles.sh b/mkit.profiles.sh index e20d2dd..a71e44b 100755 --- a/mkit.profiles.sh +++ b/mkit.profiles.sh @@ -442,4 +442,14 @@ profile_leptonica() add_run_dep leptonica } +profile_gpaw() +{ + profile_pythonbuild + + add_run_dep libxc + add_run_dep scalapack + add_run_dep openblas + add_run_dep gpaw +} + ### EOF ### From 45f21b077c6cd009daa77fe4ec00132f9fb0e488 Mon Sep 17 00:00:00 2001 From: Antonio Dell'Elce Date: Sat, 29 Feb 2020 03:41:56 +0000 Subject: [PATCH 03/34] update paths for libxc and scalapack using new layout --- modules/{build => libxc}/libxc.sh | 0 {hooks/scalapack => modules/scalapack/hooks}/configure.sh | 0 modules/{build => scalapack}/scalapack.sh | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename modules/{build => libxc}/libxc.sh (100%) rename {hooks/scalapack => modules/scalapack/hooks}/configure.sh (100%) rename modules/{build => scalapack}/scalapack.sh (100%) diff --git a/modules/build/libxc.sh b/modules/libxc/libxc.sh similarity index 100% rename from modules/build/libxc.sh rename to modules/libxc/libxc.sh diff --git a/hooks/scalapack/configure.sh b/modules/scalapack/hooks/configure.sh similarity index 100% rename from hooks/scalapack/configure.sh rename to modules/scalapack/hooks/configure.sh diff --git a/modules/build/scalapack.sh b/modules/scalapack/scalapack.sh similarity index 100% rename from modules/build/scalapack.sh rename to modules/scalapack/scalapack.sh From 646e1aa357c9bbb99596930e86472f396d8a5d3e Mon Sep 17 00:00:00 2001 From: Antonio Dell'Elce Date: Sat, 29 Feb 2020 03:42:58 +0000 Subject: [PATCH 04/34] update paths for libxc and scalapack using new layout --- modules/libxc/{libxc.sh => build.sh} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename modules/libxc/{libxc.sh => build.sh} (100%) diff --git a/modules/libxc/libxc.sh b/modules/libxc/build.sh similarity index 100% rename from modules/libxc/libxc.sh rename to modules/libxc/build.sh From 140778c172044c62545a944f6ad30c2ea47951a5 Mon Sep 17 00:00:00 2001 From: Antonio Dell'Elce Date: Sat, 29 Feb 2020 04:04:41 +0000 Subject: [PATCH 05/34] update all old paths to new layout --- modules/{build/leptonica.sh => leptonica/build.sh} | 0 modules/scalapack/{scalapack.sh => build.sh} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename modules/{build/leptonica.sh => leptonica/build.sh} (100%) rename modules/scalapack/{scalapack.sh => build.sh} (100%) diff --git a/modules/build/leptonica.sh b/modules/leptonica/build.sh similarity index 100% rename from modules/build/leptonica.sh rename to modules/leptonica/build.sh diff --git a/modules/scalapack/scalapack.sh b/modules/scalapack/build.sh similarity index 100% rename from modules/scalapack/scalapack.sh rename to modules/scalapack/build.sh From 948d0001d8573f340ca2c01b30278d5a135b57b3 Mon Sep 17 00:00:00 2001 From: Antonio Dell'Elce Date: Sat, 29 Feb 2020 04:28:49 +0000 Subject: [PATCH 06/34] add lapack module build --- modules/lapack/build.sh | 6 ++++++ modules/lapack/hooks/configure.sh | 4 ++++ 2 files changed, 10 insertions(+) create mode 100644 modules/lapack/build.sh create mode 100644 modules/lapack/hooks/configure.sh diff --git a/modules/lapack/build.sh b/modules/lapack/build.sh new file mode 100644 index 0000000..bfe14a9 --- /dev/null +++ b/modules/lapack/build.sh @@ -0,0 +1,6 @@ +build_lapack() +{ + build_raw_lite lapack + + return $? +} diff --git a/modules/lapack/hooks/configure.sh b/modules/lapack/hooks/configure.sh new file mode 100644 index 0000000..eab8ff8 --- /dev/null +++ b/modules/lapack/hooks/configure.sh @@ -0,0 +1,4 @@ +# generate Makefiles with cmake/"bootstrap" + + cd ${BUILDDIR}/lapack + cmake "${srcdir_lapack}" -DCMAKE_INSTALL_PREFIX=${prefix} From fc6d57f0f75dbb7bf56f8a5acd401af796f821d6 Mon Sep 17 00:00:00 2001 From: Antonio Dell'Elce Date: Sat, 29 Feb 2020 23:20:43 +0000 Subject: [PATCH 07/34] add openblas --- modules/openblas/build.sh | 6 ++++++ modules/openblas/hooks/configure.sh | 4 ++++ 2 files changed, 10 insertions(+) create mode 100644 modules/openblas/build.sh create mode 100644 modules/openblas/hooks/configure.sh diff --git a/modules/openblas/build.sh b/modules/openblas/build.sh new file mode 100644 index 0000000..65ad773 --- /dev/null +++ b/modules/openblas/build.sh @@ -0,0 +1,6 @@ +build_openblas() +{ + build_raw_lite openblas + + return $? +} diff --git a/modules/openblas/hooks/configure.sh b/modules/openblas/hooks/configure.sh new file mode 100644 index 0000000..d9b406c --- /dev/null +++ b/modules/openblas/hooks/configure.sh @@ -0,0 +1,4 @@ +# generate Makefiles with cmake/"bootstrap" + + cd ${BUILDDIR}/openblas + cmake "${srcdir_openblas}" -DCMAKE_INSTALL_PREFIX=${prefix} From 1ded2451f154c4628078d021097cc9544bc491eb Mon Sep 17 00:00:00 2001 From: Antonio Dell'Elce Date: Sat, 29 Feb 2020 23:21:36 +0000 Subject: [PATCH 08/34] use lapack instead of scalapack --- mkit.config.sh | 2 +- mkit.profiles.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mkit.config.sh b/mkit.config.sh index 1d38ca7..a4a5050 100755 --- a/mkit.config.sh +++ b/mkit.config.sh @@ -7,7 +7,7 @@ ### ENV ### - export srcget="0.0.11.2" # srcget version + export srcget="0.0.11.3" # srcget version # vt100 family sequences export ESC="" diff --git a/mkit.profiles.sh b/mkit.profiles.sh index 7b22d09..cf6d82d 100755 --- a/mkit.profiles.sh +++ b/mkit.profiles.sh @@ -447,7 +447,7 @@ profile_gpaw() profile_pythonbuild add_run_dep libxc - add_run_dep scalapack + add_run_dep lapack add_run_dep openblas add_run_dep gpaw } From 1f8ca809feac900bc897528185e43a28be1f388f Mon Sep 17 00:00:00 2001 From: Antonio Dell'Elce Date: Wed, 20 May 2020 11:45:22 +0100 Subject: [PATCH 09/34] add build for gpaw module --- modules/gpaw/build.sh | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 modules/gpaw/build.sh diff --git a/modules/gpaw/build.sh b/modules/gpaw/build.sh new file mode 100644 index 0000000..8182db3 --- /dev/null +++ b/modules/gpaw/build.sh @@ -0,0 +1,7 @@ +build_gpaw() +{ + [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"; + + pip3 install + return $? +} From a63a3678770e5a951ea9b878fa324548be8fa644 Mon Sep 17 00:00:00 2001 From: Antonio Dell'Elce Date: Wed, 20 May 2020 11:49:03 +0100 Subject: [PATCH 10/34] add "need_to_download" hook --- mkit.build.sh | 5 +++-- mkit.lib.sh | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/mkit.build.sh b/mkit.build.sh index 225ad6a..dfe018e 100755 --- a/mkit.build.sh +++ b/mkit.build.sh @@ -235,6 +235,7 @@ run_build() { typeset pkg="" typeset rc=0 + typeset uncompress_rc=0 typeset buildprefix="" [ ! -z "$CFLAGS" ] && { export BASE_CFLAGS="$CFLAGS"; unset CFLAGS; } @@ -299,7 +300,6 @@ run_build() [ $func_rc -ne 0 ] && { - # module was not found built-in: try as module module_func="$MKIT/modules/${pkg}/build.sh" [ -f "$module_func" ] && @@ -318,7 +318,8 @@ run_build() # This is to be used when re-running a failed build and want to skip some components have_hook global need_to_build && hook global need_to_build ${pkg} || continue - do_uncompress ${pkg} || return $? + # this must be skipped if no downloaded + [ -z "$(hook ${pkg} need_to_download) ] && do_uncompress ${pkg} || return $? [ "$build" -eq 1 ] && { diff --git a/mkit.lib.sh b/mkit.lib.sh index 7a39f26..0b464ca 100755 --- a/mkit.lib.sh +++ b/mkit.lib.sh @@ -79,6 +79,10 @@ download() for pkg in $RUNTIME_LIST do + typeset dont_download=$(hook $pkg dont_download) + + [ ! -z "$dont_download" ] && continue + typeset custom_download=$(hook $pkg custom_download) [ -f "$custom_download" ] && @@ -132,7 +136,6 @@ download() } DOWNLOAD_MAP="${DOWNLOAD_MAP} ${pkg}:${fn}" # this will fail if ${fn} has spaces! - set +x # save directory to a variable named after the package eval "fn_${pkg}=$fn" From bb93345ba2dc39f1511c6ffa09ef9f3ed2cd86ba Mon Sep 17 00:00:00 2001 From: Antonio Dell'Elce Date: Wed, 22 Jul 2020 03:55:15 +0100 Subject: [PATCH 11/34] hook: "need_to_download": better isolation(?) --- mkit.build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkit.build.sh b/mkit.build.sh index dfe018e..ad87ece 100755 --- a/mkit.build.sh +++ b/mkit.build.sh @@ -319,7 +319,7 @@ run_build() have_hook global need_to_build && hook global need_to_build ${pkg} || continue # this must be skipped if no downloaded - [ -z "$(hook ${pkg} need_to_download) ] && do_uncompress ${pkg} || return $? + [ -z "$(hook ${pkg} need_to_download)" ] && do_uncompress ${pkg} || return $? [ "$build" -eq 1 ] && { From bc5d656b2542401b2fcadcf277b5dbe406bcdcf5 Mon Sep 17 00:00:00 2001 From: Antonio Dell'Elce Date: Wed, 22 Jul 2020 03:55:44 +0100 Subject: [PATCH 12/34] add "ase" module for gpaw --- modules/ase/build.sh | 1 + modules/ase/hooks/dont_download.sh | 1 + 2 files changed, 2 insertions(+) create mode 100644 modules/ase/build.sh create mode 100644 modules/ase/hooks/dont_download.sh diff --git a/modules/ase/build.sh b/modules/ase/build.sh new file mode 100644 index 0000000..543df0a --- /dev/null +++ b/modules/ase/build.sh @@ -0,0 +1 @@ +pip3 --no-cache install ase diff --git a/modules/ase/hooks/dont_download.sh b/modules/ase/hooks/dont_download.sh new file mode 100644 index 0000000..f997cf1 --- /dev/null +++ b/modules/ase/hooks/dont_download.sh @@ -0,0 +1 @@ +echo 1 # 1 = True = Do Not download From 0bbe2716efdcbe53383344499de50d25454e94b3 Mon Sep 17 00:00:00 2001 From: Antonio Dell'Elce Date: Wed, 27 Dec 2023 19:16:04 +0000 Subject: [PATCH 13/34] pip3: no install without package name --- modules/gpaw/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/gpaw/build.sh b/modules/gpaw/build.sh index 8182db3..ec729cb 100644 --- a/modules/gpaw/build.sh +++ b/modules/gpaw/build.sh @@ -2,6 +2,6 @@ build_gpaw() { [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"; - pip3 install + pip3 install gpaw return $? } From 511f8b109c44090b8897022e208f0eb324212a84 Mon Sep 17 00:00:00 2001 From: Antonio Dell'Elce Date: Wed, 27 Dec 2023 20:04:31 +0000 Subject: [PATCH 14/34] update pythonbuild profile --- mkit.profiles.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkit.profiles.sh b/mkit.profiles.sh index bca55a2..9dd336d 100755 --- a/mkit.profiles.sh +++ b/mkit.profiles.sh @@ -72,7 +72,7 @@ profile_pythonbuild() { add_build_dep xz add_build_dep libffi ncurses zlib bzip2 readline - add_build_dep openssl sqlite3 + add_build_dep openssl1_1 sqlite3 add_build_dep python3 } From 81ecfbb9638e87420974feb86479f15952220079 Mon Sep 17 00:00:00 2001 From: Antonio Dell'Elce Date: Wed, 27 Dec 2023 20:20:21 +0000 Subject: [PATCH 15/34] update pythonbuild profile: add expat --- mkit.profiles.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkit.profiles.sh b/mkit.profiles.sh index 9dd336d..d52b69c 100755 --- a/mkit.profiles.sh +++ b/mkit.profiles.sh @@ -72,7 +72,7 @@ profile_pythonbuild() { add_build_dep xz add_build_dep libffi ncurses zlib bzip2 readline - add_build_dep openssl1_1 sqlite3 + add_build_dep openssl1_1 sqlite3 expat add_build_dep python3 } From bf9733b385133839551c214dd28d0b9130c12c4d Mon Sep 17 00:00:00 2001 From: Antonio Dell'Elce Date: Wed, 27 Dec 2023 21:02:22 +0000 Subject: [PATCH 16/34] pip: use "." to install local source --- modules/gpaw/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/gpaw/build.sh b/modules/gpaw/build.sh index ec729cb..5b5630f 100644 --- a/modules/gpaw/build.sh +++ b/modules/gpaw/build.sh @@ -2,6 +2,6 @@ build_gpaw() { [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"; - pip3 install gpaw + pip3 install . return $? } From a5849ce396b3ac65aebc562feda56cd5e6c271ce Mon Sep 17 00:00:00 2001 From: Antonio Dell'Elce Date: Tue, 20 Feb 2024 22:54:53 +0000 Subject: [PATCH 17/34] update workflow --- .github/workflows/build.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5667c0a..7f68249 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,14 +9,12 @@ jobs: runs-on: ubuntu-latest steps: - name: Login to ghcr.io - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - name: Checkout - uses: actions/checkout@v3 -# - name: Run mkit wrapper -# run: ls -lt && PROFILE="uwsgi" DOCKER_IMAGE="dellelce/uwsgi" PREFIX="/app/uwsgi" ./mkit-wrapper.sh yes + uses: actions/checkout@v4 - name: Mkit base image run: make build-base BASE=$BASE_IMAGE && docker push $BASE_IMAGE From 5cbc2f2afa59620f48e5276d7b999c853c3d5552 Mon Sep 17 00:00:00 2001 From: Antonio Dell'Elce Date: Thu, 22 Feb 2024 15:56:03 +0000 Subject: [PATCH 18/34] update srcget version --- mkit.config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkit.config.sh b/mkit.config.sh index 77d0e23..b06c676 100755 --- a/mkit.config.sh +++ b/mkit.config.sh @@ -7,7 +7,7 @@ ### ENV ### - export srcget="0.0.14.2" # srcget version + export srcget="0.0.14.3" # srcget version # vt100 family sequences export ESC="" From 621b27edb916d5e50532dd2653b75a9b10da7f53 Mon Sep 17 00:00:00 2001 From: Antonio Dell'Elce Date: Fri, 8 Mar 2024 17:35:34 +0000 Subject: [PATCH 19/34] python module: ensure PKG_CONFIG_PATH is set --- modules/python3/build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/python3/build.sh b/modules/python3/build.sh index 7fbecf7..74f1d30 100755 --- a/modules/python3/build.sh +++ b/modules/python3/build.sh @@ -5,6 +5,8 @@ build_python3() typeset rc=0 typeset fn + [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pk config" + LDFLAGS="-L${prefix}/lib -Wl,-rpath=${prefix}/lib" \ CFLAGS="-I${prefix}/include" \ build_gnuconf python3 $srcdir_python3 \ From fa121913b20c5fcb704b5c99ef702752e10f44c1 Mon Sep 17 00:00:00 2001 From: Antonio Dell'Elce Date: Mon, 25 Mar 2024 05:01:30 +0000 Subject: [PATCH 20/34] ensure latest version of srcget is used --- mkit.config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkit.config.sh b/mkit.config.sh index 77d0e23..eea7c77 100755 --- a/mkit.config.sh +++ b/mkit.config.sh @@ -7,7 +7,7 @@ ### ENV ### - export srcget="0.0.14.2" # srcget version + export srcget="0.0.14.4" # srcget version # vt100 family sequences export ESC="" From 2d569ebe39c9de81d30e3111d925103bb712090d Mon Sep 17 00:00:00 2001 From: Antonio Dell'Elce Date: Mon, 25 Mar 2024 05:12:03 +0000 Subject: [PATCH 21/34] update srcget version --- mkit.config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkit.config.sh b/mkit.config.sh index eea7c77..f9f80a2 100755 --- a/mkit.config.sh +++ b/mkit.config.sh @@ -7,7 +7,7 @@ ### ENV ### - export srcget="0.0.14.4" # srcget version + export srcget="0.0.14.5" # srcget version # vt100 family sequences export ESC="" From 49f1e8ca8d32c8ec3b8d73bce523c4ce13b904d5 Mon Sep 17 00:00:00 2001 From: Antonio Dell'Elce Date: Tue, 23 Apr 2024 10:58:11 +0100 Subject: [PATCH 22/34] Dockerfile: update Alpine from 3.8 to 3.19 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index e84f3d0..2c5ba8b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE=alpine:3.8 +ARG BASE=alpine:3.19 FROM $BASE as build LABEL maintainer="Antonio Dell'Elce" @@ -24,7 +24,7 @@ RUN mkdir -p ${INSTALLDIR}/lib && ln -s ${INSTALLDIR}/lib64 ${INSTALLDIR}/lib & rm -f ${INSTALLDIR}/lib/*.a # Second Stage -ARG BASE=alpine:3.8 +ARG BASE=alpine:3.19 FROM $BASE AS final ARG PREFIX=/app/httpd From 951433d1a6a3e935d3c079caf28be5d8c1d0ee0c Mon Sep 17 00:00:00 2001 From: Antonio Dell'Elce Date: Tue, 23 Apr 2024 15:19:23 +0100 Subject: [PATCH 23/34] dockerfile.base: update alpine version --- Dockerfile.base | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.base b/Dockerfile.base index 57dc054..fd6f0a2 100644 --- a/Dockerfile.base +++ b/Dockerfile.base @@ -1,4 +1,4 @@ -FROM alpine:3.8 +FROM alpine:3.19 WORKDIR /mkit From 146cf4caec9903c2e32fa616937b7f100773539a Mon Sep 17 00:00:00 2001 From: Antonio Dell'Elce Date: Tue, 23 Apr 2024 19:53:31 +0100 Subject: [PATCH 24/34] gpaw: make python a run time dependency not build-time only --- mkit.profiles.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkit.profiles.sh b/mkit.profiles.sh index d52b69c..c2e8790 100755 --- a/mkit.profiles.sh +++ b/mkit.profiles.sh @@ -470,7 +470,7 @@ profile_leptonica() profile_gpaw() { - profile_pythonbuild + profile_python add_run_dep libxc add_run_dep lapack From 4ddce4d64494cda1b68a8ebdeb7f00e565885034 Mon Sep 17 00:00:00 2001 From: Antonio Dell'Elce Date: Tue, 23 Apr 2024 19:56:44 +0100 Subject: [PATCH 25/34] gpaw: ensure build directory has expected files --- modules/gpaw/build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/gpaw/build.sh b/modules/gpaw/build.sh index 5b5630f..839e2a2 100644 --- a/modules/gpaw/build.sh +++ b/modules/gpaw/build.sh @@ -2,6 +2,8 @@ build_gpaw() { [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"; + prepare_build + pip3 install . return $? } From 3f3941d0df9ed400c43825c10443d67a321076da Mon Sep 17 00:00:00 2001 From: Antonio Dell'Elce Date: Tue, 23 Apr 2024 20:22:10 +0100 Subject: [PATCH 26/34] libxc: enabled shared library --- modules/libxc/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/libxc/build.sh b/modules/libxc/build.sh index 9bcc11d..ea20e41 100644 --- a/modules/libxc/build.sh +++ b/modules/libxc/build.sh @@ -3,6 +3,6 @@ # build_libxc() { - build_gnuconf libxc $srcdir_libxc + build_gnuconf libxc $srcdir_libxc --enable-shared return $? } From d674d000a7e7adc680e0554e4634aecdff9f4ec7 Mon Sep 17 00:00:00 2001 From: Antonio Dell'Elce Date: Fri, 26 Apr 2024 19:52:07 +0100 Subject: [PATCH 27/34] split mkit_setup function --- mkit.sh | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/mkit.sh b/mkit.sh index 01effda..482f2a7 100755 --- a/mkit.sh +++ b/mkit.sh @@ -1,8 +1,6 @@ #!/bin/bash # -# This file has the "main" code of mkit. # mkit builds software from source (dowloaded by srcget). -# Each "software"/package is defined by a function in mkit.profiles.sh in format: # # profile_NAME # @@ -57,7 +55,7 @@ mkit_setup_prefix() export PATH="$prefix/bin:$PATH" } -mkit_setup() +mkit_setup_paths() { export TIMESTAMP="$(date +%H%M_%d%m%y)" export WORKDIR="$PWD/mkit_workdir" @@ -84,6 +82,14 @@ mkit_setup() export LOGSDIR="${WORKDIR}/logs" + mkdir -p "$BUILDDIR" + mkdir -p "$LOGSDIR" + mkdir -p "$SRCDIR" + mkdir -p "$DOWNLOADS" +} + +mkit_args() +{ while [ "$1" != "" ] do arg="$1" @@ -101,10 +107,6 @@ mkit_setup() done [ -z "$prefix" ] && mkit_setup_prefix # make sure prefix is set with defaults if the previous block failed - mkdir -p "$BUILDDIR" - mkdir -p "$LOGSDIR" - mkdir -p "$SRCDIR" - mkdir -p "$DOWNLOADS" } ### MAIN ### @@ -112,13 +114,14 @@ mkit_setup() [ -z "$*" ] && { usage; exit; } # do not accept zero arguments export MKIT=$(getdirfullpath $(dirname $0)) + export srcgetUrl="https://github.com/dellelce/srcget/archive" . $MKIT/mkit.config.sh || exit $? . $MKIT/mkit.profiles.sh || exit $? - export srcgetUrl="https://github.com/dellelce/srcget/archive" + mkit_setup_paths + mkit_args $* - mkit_setup $* . $MKIT/mkit.lib.sh || exit $? . $MKIT/mkit.build.sh || exit $? . $MKIT/mkit.components.sh || exit $? From 6a717a7e9e39fc06b8bb611a6ac832846ff41c14 Mon Sep 17 00:00:00 2001 From: Antonio Dell'Elce Date: Fri, 26 Apr 2024 20:19:47 +0100 Subject: [PATCH 28/34] add profiles directory with each profile per file --- profiles/bind/main.sh | 9 ++++++++ profiles/blender/main.sh | 6 +++++ profiles/bzip2/main.sh | 4 ++++ profiles/cairo/main.sh | 14 +++++++++++ profiles/cmake/main.sh | 6 +++++ profiles/curl/main.sh | 7 ++++++ profiles/default/main.sh | 24 +++++++++++++++++++ profiles/fluentbit/main.sh | 5 ++++ profiles/gcc/main.sh | 11 +++++++++ profiles/gcc11/main.sh | 11 +++++++++ profiles/gcc6/main.sh | 11 +++++++++ profiles/gcc7/main.sh | 11 +++++++++ profiles/gccgo7/main.sh | 12 ++++++++++ profiles/git/main.sh | 8 +++++++ profiles/gnubuild/main.sh | 10 ++++++++ profiles/gnudev/main.sh | 10 ++++++++ profiles/gpaw/main.sh | 9 ++++++++ profiles/haproxy/main.sh | 14 +++++++++++ profiles/iftop/main.sh | 9 ++++++++ profiles/imagemagick/main.sh | 6 +++++ profiles/leptonica/main.sh | 10 ++++++++ profiles/libgit2/main.sh | 8 +++++++ profiles/libxc/main.sh | 4 ++++ profiles/mosquitto/main.sh | 6 +++++ profiles/nettle/main.sh | 5 ++++ profiles/opengl/main.sh | 45 ++++++++++++++++++++++++++++++++++++ profiles/openscad/main.sh | 8 +++++++ profiles/openvpn/main.sh | 10 ++++++++ profiles/pcre/main.sh | 5 ++++ profiles/perl/main.sh | 6 +++++ profiles/postgres/main.sh | 14 +++++++++++ profiles/postgres10/main.sh | 10 ++++++++ profiles/postgres11/main.sh | 10 ++++++++ profiles/proj/main.sh | 7 ++++++ profiles/python/main.sh | 7 ++++++ profiles/python2/main.sh | 8 +++++++ profiles/pythonbuild/main.sh | 7 ++++++ profiles/readline/main.sh | 4 ++++ profiles/redis/main.sh | 5 ++++ profiles/shared/main.sh | 7 ++++++ profiles/slcp/main.sh | 6 +++++ profiles/timescaledb/main.sh | 8 +++++++ profiles/uwsgi/main.sh | 9 ++++++++ profiles/varnish/main.sh | 21 +++++++++++++++++ profiles/x11/main.sh | 31 +++++++++++++++++++++++++ 45 files changed, 458 insertions(+) create mode 100755 profiles/bind/main.sh create mode 100755 profiles/blender/main.sh create mode 100755 profiles/bzip2/main.sh create mode 100755 profiles/cairo/main.sh create mode 100755 profiles/cmake/main.sh create mode 100755 profiles/curl/main.sh create mode 100755 profiles/default/main.sh create mode 100755 profiles/fluentbit/main.sh create mode 100755 profiles/gcc/main.sh create mode 100755 profiles/gcc11/main.sh create mode 100755 profiles/gcc6/main.sh create mode 100755 profiles/gcc7/main.sh create mode 100755 profiles/gccgo7/main.sh create mode 100755 profiles/git/main.sh create mode 100755 profiles/gnubuild/main.sh create mode 100755 profiles/gnudev/main.sh create mode 100755 profiles/gpaw/main.sh create mode 100755 profiles/haproxy/main.sh create mode 100755 profiles/iftop/main.sh create mode 100755 profiles/imagemagick/main.sh create mode 100755 profiles/leptonica/main.sh create mode 100755 profiles/libgit2/main.sh create mode 100755 profiles/libxc/main.sh create mode 100755 profiles/mosquitto/main.sh create mode 100755 profiles/nettle/main.sh create mode 100755 profiles/opengl/main.sh create mode 100755 profiles/openscad/main.sh create mode 100755 profiles/openvpn/main.sh create mode 100755 profiles/pcre/main.sh create mode 100755 profiles/perl/main.sh create mode 100755 profiles/postgres/main.sh create mode 100755 profiles/postgres10/main.sh create mode 100755 profiles/postgres11/main.sh create mode 100755 profiles/proj/main.sh create mode 100755 profiles/python/main.sh create mode 100755 profiles/python2/main.sh create mode 100755 profiles/pythonbuild/main.sh create mode 100755 profiles/readline/main.sh create mode 100755 profiles/redis/main.sh create mode 100755 profiles/shared/main.sh create mode 100755 profiles/slcp/main.sh create mode 100755 profiles/timescaledb/main.sh create mode 100755 profiles/uwsgi/main.sh create mode 100755 profiles/varnish/main.sh create mode 100755 profiles/x11/main.sh diff --git a/profiles/bind/main.sh b/profiles/bind/main.sh new file mode 100755 index 0000000..69f6452 --- /dev/null +++ b/profiles/bind/main.sh @@ -0,0 +1,9 @@ +profile_bind() +{ + # libxml2 & openssl are included in python profile + # mixing run-time and build-time dependencies is not supported at this time + # *IF* this means need to link from multiple prefixes) + profile_python + add_run_dep libuv + add_run_dep bind +} diff --git a/profiles/blender/main.sh b/profiles/blender/main.sh new file mode 100755 index 0000000..2115579 --- /dev/null +++ b/profiles/blender/main.sh @@ -0,0 +1,6 @@ +profile_blender() +{ + add_build_dep cmake + add_run_dep python # it needs python, but it could be a run-time dep only + add_run_dep blender +} diff --git a/profiles/bzip2/main.sh b/profiles/bzip2/main.sh new file mode 100755 index 0000000..71376f2 --- /dev/null +++ b/profiles/bzip2/main.sh @@ -0,0 +1,4 @@ +profile_bzip2() +{ + add_run_dep bzip2 +} diff --git a/profiles/cairo/main.sh b/profiles/cairo/main.sh new file mode 100755 index 0000000..3462548 --- /dev/null +++ b/profiles/cairo/main.sh @@ -0,0 +1,14 @@ +profile_cairo() +{ + #this will be needed when moving from alpine 3.8 to 3.9 + #add_build_dep pkgconfig + add_run_dep zlib + add_run_dep libpng + add_run_dep freetype + add_run_dep gperf + add_run_dep expat + #I thought uuid was not mandatory, temporarily re-disabling + #add_run_dep fontconfig + add_run_dep pixman + add_run_dep cairo +} diff --git a/profiles/cmake/main.sh b/profiles/cmake/main.sh new file mode 100755 index 0000000..67262a4 --- /dev/null +++ b/profiles/cmake/main.sh @@ -0,0 +1,6 @@ +# standalone cmake +profile_cmake() +{ + add_build_dep openssl + add_run_dep cmake +} diff --git a/profiles/curl/main.sh b/profiles/curl/main.sh new file mode 100755 index 0000000..1d8b84d --- /dev/null +++ b/profiles/curl/main.sh @@ -0,0 +1,7 @@ +profile_curl() +{ + add_run_dep openssl + add_run_dep curl + + return $? +} diff --git a/profiles/default/main.sh b/profiles/default/main.sh new file mode 100755 index 0000000..888b2a9 --- /dev/null +++ b/profiles/default/main.sh @@ -0,0 +1,24 @@ +# TODO: automate build orders & list +profile_default() +{ + profile_gnubuild + profile_python + add_build_dep bison + add_run_dep expat + add_run_dep pcre + add_run_dep apr + add_run_dep aprutil + add_run_dep libxml2 + add_run_dep httpd + + [ "$PHP_NEEDED" == "1" ] && + { + add_run_dep php + add_run_dep suhosin + } + + add_run_dep python3 + add_run_dep mod_wsgi + + return $? +} diff --git a/profiles/fluentbit/main.sh b/profiles/fluentbit/main.sh new file mode 100755 index 0000000..68db122 --- /dev/null +++ b/profiles/fluentbit/main.sh @@ -0,0 +1,5 @@ +profile_fluentbit() +{ + add_build_dep cmake + add_run_dep fluentbit +} diff --git a/profiles/gcc/main.sh b/profiles/gcc/main.sh new file mode 100755 index 0000000..4006fc0 --- /dev/null +++ b/profiles/gcc/main.sh @@ -0,0 +1,11 @@ +profile_gcc() +{ + add_build_dep m4 + add_run_dep zlib + add_run_dep binutils + add_run_dep gmp + add_run_dep mpfr + add_run_dep mpc + add_run_dep gcc + return $? +} diff --git a/profiles/gcc11/main.sh b/profiles/gcc11/main.sh new file mode 100755 index 0000000..54fea46 --- /dev/null +++ b/profiles/gcc11/main.sh @@ -0,0 +1,11 @@ +profile_gcc11() +{ + add_build_dep m4 + add_run_dep zlib + add_run_dep binutils + add_run_dep gmp + add_run_dep mpfr + add_run_dep mpc + add_run_dep gcc11 + return $? +} diff --git a/profiles/gcc6/main.sh b/profiles/gcc6/main.sh new file mode 100755 index 0000000..4ea0eb7 --- /dev/null +++ b/profiles/gcc6/main.sh @@ -0,0 +1,11 @@ +profile_gcc6() +{ + add_build_dep m4 + add_run_dep zlib + add_run_dep binutils + add_run_dep gmp + add_run_dep mpfr + add_run_dep mpc + add_run_dep gcc6 + return $? +} diff --git a/profiles/gcc7/main.sh b/profiles/gcc7/main.sh new file mode 100755 index 0000000..fa9fad1 --- /dev/null +++ b/profiles/gcc7/main.sh @@ -0,0 +1,11 @@ +profile_gcc7() +{ + add_build_dep m4 + add_run_dep zlib + add_run_dep binutils + add_run_dep gmp + add_run_dep mpfr + add_run_dep mpc + add_run_dep gcc7 + return $? +} diff --git a/profiles/gccgo7/main.sh b/profiles/gccgo7/main.sh new file mode 100755 index 0000000..b4fee83 --- /dev/null +++ b/profiles/gccgo7/main.sh @@ -0,0 +1,12 @@ +profile_gccgo7() +{ + add_build_dep m4 + add_run_dep zlib + add_run_dep binutils + add_run_dep gmp + add_run_dep mpfr + add_run_dep mpc + add_options gcc7 go + add_run_dep gcc7 + return $? +} diff --git a/profiles/git/main.sh b/profiles/git/main.sh new file mode 100755 index 0000000..5c28bb3 --- /dev/null +++ b/profiles/git/main.sh @@ -0,0 +1,8 @@ +profile_git() +{ + profile_gnubuild + add_run_dep zlib + add_run_dep git + + return $? +} diff --git a/profiles/gnubuild/main.sh b/profiles/gnubuild/main.sh new file mode 100755 index 0000000..a4f8c03 --- /dev/null +++ b/profiles/gnubuild/main.sh @@ -0,0 +1,10 @@ +profile_gnubuild() +{ + add_build_dep perl + add_build_dep makemaker + add_build_dep datadumper + add_build_dep m4 + add_build_dep autoconf + add_build_dep automake + add_build_dep libtool +} diff --git a/profiles/gnudev/main.sh b/profiles/gnudev/main.sh new file mode 100755 index 0000000..01c04b8 --- /dev/null +++ b/profiles/gnudev/main.sh @@ -0,0 +1,10 @@ +profile_gnudev() +{ + add_run_dep perl + add_run_dep makemaker + add_run_dep datadumper + add_run_dep m4 + add_run_dep autoconf + add_run_dep automake + add_run_dep libtool +} diff --git a/profiles/gpaw/main.sh b/profiles/gpaw/main.sh new file mode 100755 index 0000000..9e991a8 --- /dev/null +++ b/profiles/gpaw/main.sh @@ -0,0 +1,9 @@ +profile_gpaw() +{ + profile_python + + add_run_dep libxc + add_run_dep lapack + add_run_dep openblas + add_run_dep gpaw +} diff --git a/profiles/haproxy/main.sh b/profiles/haproxy/main.sh new file mode 100755 index 0000000..47d9a0c --- /dev/null +++ b/profiles/haproxy/main.sh @@ -0,0 +1,14 @@ +profile_haproxy() +{ + add_options pcre "--enable-jit" + + add_run_dep pcre + add_run_dep zlib + add_run_dep ncurses # needed by readline + add_run_dep readline # required by lua + add_run_dep openssl + add_run_dep lua + add_run_dep haproxy + + return $? +} diff --git a/profiles/iftop/main.sh b/profiles/iftop/main.sh new file mode 100755 index 0000000..f958302 --- /dev/null +++ b/profiles/iftop/main.sh @@ -0,0 +1,9 @@ +profile_iftop() +{ + profile_gnubuild + add_build_dep gettext + add_build_dep flex + add_run_dep libpcap + add_run_dep ncurses + add_run_dep iftop +} diff --git a/profiles/imagemagick/main.sh b/profiles/imagemagick/main.sh new file mode 100755 index 0000000..8cca80d --- /dev/null +++ b/profiles/imagemagick/main.sh @@ -0,0 +1,6 @@ +profile_imagemagick() +{ + add_run_dep zlib + add_run_dep libpng + add_run_dep imagemagick +} diff --git a/profiles/leptonica/main.sh b/profiles/leptonica/main.sh new file mode 100755 index 0000000..112a976 --- /dev/null +++ b/profiles/leptonica/main.sh @@ -0,0 +1,10 @@ +profile_leptonica() +{ + add_run_dep zlib + add_run_dep libpng + add_run_dep expat # required by freetype + add_run_dep gperf # required by fontconfig + add_run_dep freetype # required by fontconfig + add_run_dep fontconfig + add_run_dep leptonica +} diff --git a/profiles/libgit2/main.sh b/profiles/libgit2/main.sh new file mode 100755 index 0000000..8a62ce3 --- /dev/null +++ b/profiles/libgit2/main.sh @@ -0,0 +1,8 @@ +profile_libgit2() +{ + add_build_dep cmake + #profile_python + add_run_dep openssl + add_run_dep libssh2 + add_run_dep libgit2 +} diff --git a/profiles/libxc/main.sh b/profiles/libxc/main.sh new file mode 100755 index 0000000..dd62239 --- /dev/null +++ b/profiles/libxc/main.sh @@ -0,0 +1,4 @@ +profile_libxc() +{ + add_run_dep libxc +} diff --git a/profiles/mosquitto/main.sh b/profiles/mosquitto/main.sh new file mode 100755 index 0000000..a2c6116 --- /dev/null +++ b/profiles/mosquitto/main.sh @@ -0,0 +1,6 @@ +profile_mosquitto() +{ + add_build_dep cmake + add_run_dep openssl + add_run_dep mosquitto +} diff --git a/profiles/nettle/main.sh b/profiles/nettle/main.sh new file mode 100755 index 0000000..c0bb33f --- /dev/null +++ b/profiles/nettle/main.sh @@ -0,0 +1,5 @@ +profile_nettle() +{ + add_run_dep gmp + add_run_dep nettle +} diff --git a/profiles/opengl/main.sh b/profiles/opengl/main.sh new file mode 100755 index 0000000..c7d33cb --- /dev/null +++ b/profiles/opengl/main.sh @@ -0,0 +1,45 @@ +profile_opengl() +{ + #gnubuild to be used with alpine 3.9 or should we just check for pkgconf(ig) + #profile_gnubuild + + #xcbproto has some python code... + profile_pythonbuild + add_run_dep dri2proto + add_run_dep glproto + add_run_dep pciaccess + add_run_dep libdrm + add_run_dep xproto + add_run_dep xextproto + add_run_dep xtrans + add_run_dep kbproto + add_run_dep inputproto + add_run_dep xcbproto + add_run_dep pthreadstubs + add_run_dep xau + add_run_dep xcb + add_run_dep x11 + add_run_dep damageproto + add_run_dep fixesproto + add_run_dep xfixes + add_run_dep xdamage + add_run_dep xext + add_run_dep xf86vidmodeproto + add_run_dep xxf86vm + add_run_dep xorgmacros + add_run_dep xshmfence + add_run_dep randrproto + add_run_dep renderproto + add_run_dep libxrender + add_run_dep libxrandr + add_run_dep xrandr + add_run_dep expat2_1 + add_run_dep zlib + + #travis: currently building mesa3d exceeds 10 minutes and travil kills the process because nothing is sent to stdout + # this is a bit "excessive" but we want to hog almost all processors available + typeset cpucnt=$(egrep -c '^processor' /proc/cpuinfo) + [ $cpucnt -eq 2 ] && add_make_options mesa3d -j${cpucnt} + [ $cpucnt -gt 2 ] && { let cpucnt="(( $cpucnt - 1 ))"; add_make_options mesa3d -j${cpucnt}; } + add_run_dep mesa3d +} diff --git a/profiles/openscad/main.sh b/profiles/openscad/main.sh new file mode 100755 index 0000000..217eae1 --- /dev/null +++ b/profiles/openscad/main.sh @@ -0,0 +1,8 @@ +profile_openscad() +{ + profile_opengl + add_run_dep glew + add_run_dep opencsg + add_run_dep cgal + add_run_dep openscad +} diff --git a/profiles/openvpn/main.sh b/profiles/openvpn/main.sh new file mode 100755 index 0000000..a5ad0aa --- /dev/null +++ b/profiles/openvpn/main.sh @@ -0,0 +1,10 @@ +profile_openvpn() +{ + profile_gnudev + add_run_dep openssl + add_run_dep lzo + #we don't want you "linuxpam" + #add_run_dep linuxpam + add_run_dep openvpn + return $? +} diff --git a/profiles/pcre/main.sh b/profiles/pcre/main.sh new file mode 100755 index 0000000..72412c2 --- /dev/null +++ b/profiles/pcre/main.sh @@ -0,0 +1,5 @@ +profile_pcre() +{ + add_options pcre "--enable-jit" + add_run_dep pcre +} diff --git a/profiles/perl/main.sh b/profiles/perl/main.sh new file mode 100755 index 0000000..d8b62ff --- /dev/null +++ b/profiles/perl/main.sh @@ -0,0 +1,6 @@ +profile_perl() +{ + add_run_dep perl + add_run_dep makemaker + add_run_dep datadumper +} diff --git a/profiles/postgres/main.sh b/profiles/postgres/main.sh new file mode 100755 index 0000000..55b7c04 --- /dev/null +++ b/profiles/postgres/main.sh @@ -0,0 +1,14 @@ +profile_postgres() +{ +# 170519 changing to openssl because: +# building with libressl fails with: +#postgresql/postgresql-11.3/src/backend/libpq/be-secure-openssl.c:1103:63: error: ‘Port’ has no member named ‘peer'’ +# strlcpy(ptr, X509_NAME_to_cstring(X509_get_subject_name(port->peer)), len); + add_run_dep openssl + add_run_dep libxml2 + add_run_dep zlib + add_run_dep ncurses + add_run_dep readline + add_run_dep postgresql + return $? +} diff --git a/profiles/postgres10/main.sh b/profiles/postgres10/main.sh new file mode 100755 index 0000000..f2e895f --- /dev/null +++ b/profiles/postgres10/main.sh @@ -0,0 +1,10 @@ +profile_postgres10() +{ + add_run_dep openssl + add_run_dep libxml2 + add_run_dep zlib + add_run_dep ncurses + add_run_dep readline + add_run_dep postgresql10 + return $? +} diff --git a/profiles/postgres11/main.sh b/profiles/postgres11/main.sh new file mode 100755 index 0000000..332195f --- /dev/null +++ b/profiles/postgres11/main.sh @@ -0,0 +1,10 @@ +profile_postgres11() +{ + add_run_dep openssl + add_run_dep libxml2 + add_run_dep zlib + add_run_dep ncurses + add_run_dep readline + add_run_dep postgresql11 + return $? +} diff --git a/profiles/proj/main.sh b/profiles/proj/main.sh new file mode 100755 index 0000000..5a70ce8 --- /dev/null +++ b/profiles/proj/main.sh @@ -0,0 +1,7 @@ +profile_proj() +{ + profile_curl + add_run_dep sqlite3 + add_run_dep libtiff + add_run_dep proj +} diff --git a/profiles/python/main.sh b/profiles/python/main.sh new file mode 100755 index 0000000..7c1eca4 --- /dev/null +++ b/profiles/python/main.sh @@ -0,0 +1,7 @@ +profile_python() +{ + add_run_dep xz + add_run_dep libffi ncurses zlib bzip2 readline + add_run_dep openssl1_1 sqlite3 expat libxml2 + add_run_dep python3 +} diff --git a/profiles/python2/main.sh b/profiles/python2/main.sh new file mode 100755 index 0000000..470bc00 --- /dev/null +++ b/profiles/python2/main.sh @@ -0,0 +1,8 @@ +#python2 +profile_python2() +{ + add_run_dep xz + add_run_dep libffi ncurses zlib bzip2 readline + add_run_dep openssl sqlite3 expat libxml2 + add_run_dep python2 +} diff --git a/profiles/pythonbuild/main.sh b/profiles/pythonbuild/main.sh new file mode 100755 index 0000000..f83936b --- /dev/null +++ b/profiles/pythonbuild/main.sh @@ -0,0 +1,7 @@ +profile_pythonbuild() +{ + add_build_dep xz + add_build_dep libffi ncurses zlib bzip2 readline + add_build_dep openssl1_1 sqlite3 expat + add_build_dep python3 +} diff --git a/profiles/readline/main.sh b/profiles/readline/main.sh new file mode 100755 index 0000000..1e72dde --- /dev/null +++ b/profiles/readline/main.sh @@ -0,0 +1,4 @@ +profile_readline() +{ + add_run_dep readline +} diff --git a/profiles/redis/main.sh b/profiles/redis/main.sh new file mode 100755 index 0000000..0bf7675 --- /dev/null +++ b/profiles/redis/main.sh @@ -0,0 +1,5 @@ +profile_redis() +{ + add_run_dep redis + return $? +} diff --git a/profiles/shared/main.sh b/profiles/shared/main.sh new file mode 100755 index 0000000..fa88cf2 --- /dev/null +++ b/profiles/shared/main.sh @@ -0,0 +1,7 @@ +profile_shared() +{ + profile_gnudev + profile_python + profile_git + add_run_dep bison +} diff --git a/profiles/slcp/main.sh b/profiles/slcp/main.sh new file mode 100755 index 0000000..a055bf8 --- /dev/null +++ b/profiles/slcp/main.sh @@ -0,0 +1,6 @@ +profile_slcp() +{ + add_build_dep cmake + add_run_dep libgit2 + add_run_dep slcp +} diff --git a/profiles/timescaledb/main.sh b/profiles/timescaledb/main.sh new file mode 100755 index 0000000..72006c3 --- /dev/null +++ b/profiles/timescaledb/main.sh @@ -0,0 +1,8 @@ +profile_timescaledb() +{ + add_build_dep cmake + add_build_dep bison # only when building from commit/tag/branch (not "packaged" source) + profile_postgres + add_run_dep timescaledb + return $? +} diff --git a/profiles/uwsgi/main.sh b/profiles/uwsgi/main.sh new file mode 100755 index 0000000..37ec172 --- /dev/null +++ b/profiles/uwsgi/main.sh @@ -0,0 +1,9 @@ +profile_uwsgi() +{ + add_options pcre "--enable-jit" + + add_run_dep pcre + profile_python + add_run_dep uwsgi + return $? +} diff --git a/profiles/varnish/main.sh b/profiles/varnish/main.sh new file mode 100755 index 0000000..d26e07e --- /dev/null +++ b/profiles/varnish/main.sh @@ -0,0 +1,21 @@ +profile_varnish() +{ + # varnish needs python (">= 2.7") for generating some files + # build time dependency only so these should not stay here... + # + profile_python + profile_gnubuild + + # temporary workaround for missing backtrace() in musl + [ -f "/etc/alpine-release" ] && + { + apk add --no-cache libexecinfo-dev + } + + add_run_dep pcre + add_run_dep ncurses + add_run_dep readline + add_run_dep varnish + + return $? +} diff --git a/profiles/x11/main.sh b/profiles/x11/main.sh new file mode 100755 index 0000000..7ae855a --- /dev/null +++ b/profiles/x11/main.sh @@ -0,0 +1,31 @@ +profile_x11() +{ + add_run_dep dri2proto + add_run_dep glproto + add_run_dep pciaccess + add_run_dep libdrm + add_run_dep xproto + add_run_dep xextproto + add_run_dep xtrans + add_run_dep kbproto + add_run_dep inputproto + add_run_dep xcbproto + add_run_dep pthreadstubs + add_run_dep xau + add_run_dep xcb + add_run_dep x11 + add_run_dep damageproto + add_run_dep fixesproto + add_run_dep xfixes + add_run_dep xdamage + add_run_dep xext + add_run_dep xf86vidmodeproto + add_run_dep xxf86vm + add_run_dep xorgmacros + add_run_dep xshmfence + add_run_dep randrproto + add_run_dep renderproto + add_run_dep libxrender + add_run_dep libxrandr + add_run_dep xrandr +} From 7771598ca7a73264a96849fb82334de0533d90e1 Mon Sep 17 00:00:00 2001 From: Antonio Dell'Elce Date: Sat, 27 Apr 2024 13:38:21 +0100 Subject: [PATCH 29/34] update srcget version --- mkit.config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkit.config.sh b/mkit.config.sh index f9f80a2..8f65200 100755 --- a/mkit.config.sh +++ b/mkit.config.sh @@ -7,7 +7,7 @@ ### ENV ### - export srcget="0.0.14.5" # srcget version + export srcget="0.0.14.6" # srcget version # vt100 family sequences export ESC="" From b334a61f87e6d41e1a7007ed8180db4d70233200 Mon Sep 17 00:00:00 2001 From: Antonio Dell'Elce Date: Sun, 28 Apr 2024 12:56:26 +0100 Subject: [PATCH 30/34] rollback alpine version --- Dockerfile.base | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile.base b/Dockerfile.base index fd6f0a2..48d53df 100644 --- a/Dockerfile.base +++ b/Dockerfile.base @@ -1,4 +1,4 @@ -FROM alpine:3.19 +FROM alpine:3.8 WORKDIR /mkit @@ -12,4 +12,3 @@ COPY modules modules/ COPY mkit*.sh ./ RUN ls -lt - From ecd4e68f73f448e7c1530e34d5cf91ffcfd9c70e Mon Sep 17 00:00:00 2001 From: Antonio Dell'Elce Date: Sun, 28 Apr 2024 13:07:16 +0100 Subject: [PATCH 31/34] ncurses: disable library suffixes --- modules/ncurses/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ncurses/build.sh b/modules/ncurses/build.sh index a457fc1..9942bc4 100644 --- a/modules/ncurses/build.sh +++ b/modules/ncurses/build.sh @@ -4,6 +4,6 @@ build_ncurses() { build_gnuconf ncurses $srcdir_ncurses --with-shared --with-cxx-shared \ - --without-ada + --without-ada --disable-lib-suffixes return $? } From 245d305ca582585b180b37b496ae7ef291b6bd18 Mon Sep 17 00:00:00 2001 From: Antonio Dell'Elce Date: Sun, 28 Apr 2024 13:07:52 +0100 Subject: [PATCH 32/34] Dockerfile: re-switch alpine to 3.19 --- Dockerfile.base | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.base b/Dockerfile.base index 48d53df..d90b2c6 100644 --- a/Dockerfile.base +++ b/Dockerfile.base @@ -1,4 +1,4 @@ -FROM alpine:3.8 +FROM alpine:3.19 WORKDIR /mkit From 736fd5f624ebaa9edfe3e29a7b6e4f104f4b4efa Mon Sep 17 00:00:00 2001 From: Antonio Dell'Elce Date: Mon, 29 Apr 2024 13:23:05 +0100 Subject: [PATCH 33/34] gpaw: use "standard" build --- modules/gpaw/build.sh | 46 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/modules/gpaw/build.sh b/modules/gpaw/build.sh index 839e2a2..402ed3a 100644 --- a/modules/gpaw/build.sh +++ b/modules/gpaw/build.sh @@ -2,8 +2,50 @@ build_gpaw() { [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"; - prepare_build + build_gpaw_core gpaw $srcdir_gpaw - pip3 install . return $? } + +# +# Build gpaw +build_gpaw_core() +{ + export rc_pipinstall=0 + typeset id="$1"; shift # build id + typeset dir="$1"; shift # src directory + typeset pkgbuilddir="$BUILDDIR/$id" + + # Other steps + [ ! -d "$pkgbuilddir" ] && { mkdir -p "$pkgbuilddir"; } || + { + pkgbuilddir="$BUILDDIR/${id}.${RANDOM}"; mkdir -p "$pkgbuilddir"; + } + + cd "$pkgbuilddir" || + { + echo "build_gpaw: Failed to change to build directory: " $pkgbuilddir; + return 1; + } + + prepare_build $dir + + echo "Building $id [${BOLD}$(getbasename $id)${RESET}] at $(date)" + echo + + time_start + + logFile=$(logger_file ${id}_make) + echo "Running pip install..." + { + pip3 install . + + rc_pipinstall=$? + } > ${logFile} 2>&1 + [ $rc_make -ne 0 ] && { cd "$cwd"; time_end; cat "${logFile}"; echo ; echo "Failed make for ${id}"; return $rc_make; } + + cd "$WORKDIR" + + time_end + return $rc_pipinstall +} From 403fe2e7c803610e97a767e4c6bf2e70894d7b7a Mon Sep 17 00:00:00 2001 From: Antonio Dell'Elce Date: Tue, 30 Apr 2024 13:29:53 +0100 Subject: [PATCH 34/34] gpaw: add LDFLAGS & CFLAGS --- modules/gpaw/build.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/gpaw/build.sh b/modules/gpaw/build.sh index 402ed3a..3fc93ae 100644 --- a/modules/gpaw/build.sh +++ b/modules/gpaw/build.sh @@ -38,11 +38,12 @@ build_gpaw_core() logFile=$(logger_file ${id}_make) echo "Running pip install..." { - pip3 install . - - rc_pipinstall=$? + LDFLAGS="-L${prefix}/lib -L/usr/lib -Wl,-rpath=${prefix}/lib -Wl,-rpath=/usr/lib" \ + CFLAGS="-I${prefix}/include" \ + pip3 install . + rc_pipinstall=$? } > ${logFile} 2>&1 - [ $rc_make -ne 0 ] && { cd "$cwd"; time_end; cat "${logFile}"; echo ; echo "Failed make for ${id}"; return $rc_make; } + [ $rc_pipinstall -ne 0 ] && { cd "$cwd"; time_end; cat "${logFile}"; echo ; echo "Failed pip install for ${id}"; return $rc_make; } cd "$WORKDIR"