diff --git a/.github/workflows/build_many_linux.yml b/.github/workflows/build_many_linux.yml index c7a1f8c3..e2d9822e 100644 --- a/.github/workflows/build_many_linux.yml +++ b/.github/workflows/build_many_linux.yml @@ -11,7 +11,7 @@ on: jobs: build: runs-on: ubuntu-20.04 - container: quay.io/pypa/manylinux2014_x86_64 + container: quay.io/pypa/manylinux_2_28_x86_64:latest steps: - uses: actions/checkout@v3 diff --git a/Makefile b/Makefile index d0247a82..b8018281 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ CXXFLAGS=-std=c++17 -O2 -Wall -fmessage-length=0 -fPIC -Iinc \ -Iext/mkn/kul/inc \ -Iext/mkn/kul/os/$(OS)/inc \ -Iext/mkn/kul/os/nixish/inc -LDFLAGS = -pthread -ldl -rdynamic +LDFLAGS = -pthread -rdynamic -ldl entry: @@echo "Options include" @@ -19,7 +19,7 @@ entry: @@echo "make bsd" nix: - $(MAKE) build OS=nix + $(MAKE) build OS=nix LDFLAGS="-pthread -rdynamic -Wl,--no-as-needed -ldl" bsd: $(MAKE) build OS=bsd diff --git a/mkn.yaml b/mkn.yaml index f6588514..93a0b283 100644 --- a/mkn.yaml +++ b/mkn.yaml @@ -1,10 +1,9 @@ #! clean build test -dtKOW 9 -g 0 -q name: mkn -# scm: https://github.com/mkn/mkn version: master property: - DATE: 06-APR-2024 + DATE: 11-AUG-2024 parent: bin mode: none diff --git a/src/maiken/depmod.cpp b/src/maiken/depmod.cpp index 5524516b..51e0441d 100644 --- a/src/maiken/depmod.cpp +++ b/src/maiken/depmod.cpp @@ -89,7 +89,7 @@ mkn::kul::Dir maiken::Application::resolveDepOrModDirectory(YAML::Node const& n, d = (*AppVars::INSTANCE().properkeys().find(module ? "MKN_MOD_REPO" : "MKN_REPO")).second; try { mkn::kul::File verFile(depName, ".mkn/dep/ver"); - auto resolveSCMBranch = [=]() -> std::string { + auto resolveSCMBranch = [&]() -> std::string { if (n[STR_VERSION]) return Properties::RESOLVE(*this, n[STR_VERSION].Scalar()); if (verFile) return mkn::kul::io::Reader(verFile).readLine(); {