Skip to content

Commit

Permalink
Github workflows: attempt fix for libc++ 4
Browse files Browse the repository at this point in the history
  • Loading branch information
mnottale committed Nov 16, 2023
1 parent 949e4db commit f720e4a
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 1 deletion.
4 changes: 3 additions & 1 deletion .github/workflows/build-linux-clang-libcxx-static.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ jobs:
submodules: true
- name: dependencies
run: sudo apt-get install -y clang libc++-14-dev wget
- name: patch
run: sudo patch /usr/lib/llvm-14/include/c++/v1/__config $GITHUB_WORKSPACE/dev/libc++-config.patch
- name: Version
run: cd $GITHUB_WORKSPACE && git describe --always > /tmp/version.txt
- name: Boost
Expand All @@ -29,7 +31,7 @@ jobs:
run: mkdir $GITHUB_WORKSPACE/build && cd $GITHUB_WORKSPACE/build && BOOST_ROOT=$GITHUB_WORKSPACE/boostinst/ cmake -D CMAKE_INCLUDE_PATH=$GITHUB_WORKSPACE/boostinst/include -D CMAKE_LIBRARY_PATH=$GITHUB_WORKSPACE/boostinst/lib -D CMAKE_C_COMPILER=clang -D CMAKE_CXX_COMPILER=clang++ -D CMAKE_CXX_STANDARD=17 -D CMAKE_CXX_FLAGS="-stdlib=libc++ -fno-delete-null-pointer-checks -fPIC" -DSTATIC_BUILD=On -DWITH_EMBED=On -DBoost_NO_SYSTEM_PATHS=On -DCMAKE_INSTALL_PREFIX=/tmp/urbisdk -DCMAKE_BUILD_TYPE=Release -DBoost_USE_STATIC_LIBS=On ..
- name: Build
# Build your program with the given configuration
run: cd $GITHUB_WORKSPACE/build && make -j $(nproc)
run: cd $GITHUB_WORKSPACE/build && make -j $(nproc) VERBOSE=1 V=1
- name: Install
# Build your program with the given configuration
run: cd $GITHUB_WORKSPACE/build && make install -j $(nproc)
Expand Down
12 changes: 12 additions & 0 deletions dev/libc++-config.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
--- /usr/lib/llvm-14/include/c++/v1/__config 2022-03-23 08:41:07.000000000 +0100
+++ /usr/lib/llvm-14/include/c++/v1/__config.new 2023-11-16 13:39:12.027393115 +0100
@@ -167,7 +167,8 @@
#define _LIBCPP_CONCAT(_LIBCPP_X,_LIBCPP_Y) _LIBCPP_CONCAT1(_LIBCPP_X,_LIBCPP_Y)

#ifndef _LIBCPP_ABI_NAMESPACE
-# define _LIBCPP_ABI_NAMESPACE _LIBCPP_CONCAT(__,_LIBCPP_ABI_VERSION)
+//# define _LIBCPP_ABI_NAMESPACE _LIBCPP_CONCAT(__,_LIBCPP_ABI_VERSION)
+# define _LIBCPP_ABI_NAMESPACE __1
#endif

#if __cplusplus < 201103L

0 comments on commit f720e4a

Please sign in to comment.