diff --git a/custom-triplets/x64-linux-nes.cmake b/custom-triplets/x64-linux-nes.cmake index 85427c3..47c2222 100644 --- a/custom-triplets/x64-linux-nes.cmake +++ b/custom-triplets/x64-linux-nes.cmake @@ -4,6 +4,9 @@ set(VCPKG_LIBRARY_LINKAGE static) set(VCPKG_CMAKE_SYSTEM_NAME Linux) +set(VCPKG_CXX_FLAGS -std=c++20) +set(VCPKG_C_FLAGS "") + if(NOT CMAKE_HOST_SYSTEM_PROCESSOR) execute_process(COMMAND "uname" "-m" OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_PROCESSOR OUTPUT_STRIP_TRAILING_WHITESPACE) endif() @@ -30,4 +33,4 @@ endif() if (PORT STREQUAL oatpp) set(VCPKG_LIBRARY_LINKAGE static) -endif() \ No newline at end of file +endif() diff --git a/docker/Dockerfile-ubuntu-22.04 b/docker/Dockerfile-ubuntu-22.04 index 7572942..698012c 100644 --- a/docker/Dockerfile-ubuntu-22.04 +++ b/docker/Dockerfile-ubuntu-22.04 @@ -18,9 +18,15 @@ RUN apt-get update -qq && DEBIAN_FRONTEND="noninteractive" apt-get install -qq \ ninja-build \ flex \ bison \ + libgsasl7 \ + libkrb5-3 \ && apt-get clean -qq +RUN apt-get install -y libc-client-dev libkrb5-dev +RUN apt-get install -y libc-client-dev libgsasl7-dev + +RUN apt-get install -y libc-client-dev uuid-dev ADD ./entrypoint-build.sh /entrypoint.sh diff --git a/vcpkg.json b/vcpkg.json index 77bf866..a07f51e 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -6,6 +6,12 @@ "supports": "x64 & (linux | osx)", "builtin-baseline": "daa7215f3d68c2a2f2e18c398cb73dab63cda829", "dependencies": [ + "libuuid", "libhdfs3" + ], + "overrides": [ + { + "name": "krb5", "version": "1.21.3", "port-version": 0 + } ] }