Skip to content

Commit

Permalink
Remove the gcc13 fix for dwarfs
Browse files Browse the repository at this point in the history
Fixed in upstream.
  • Loading branch information
Kron4ek authored May 28, 2023
1 parent e7bcce3 commit 0dfb755
Showing 1 changed file with 8 additions and 14 deletions.
22 changes: 8 additions & 14 deletions create-utils.sh
Original file line number Diff line number Diff line change
Expand Up @@ -129,20 +129,14 @@ if [ "${build_dwarfs}" = "true" ]; then

git clone https://github.com/mhx/dwarfs.git --recursive

# Revert commit aeeddae, because otherwise dwarfs might use
# /usr/lib/locale/locale-archive file, which would break it
# on systems using musl libc
#
# This can also be worked around by setting LC_ALL=C, but for now
# let's revert the commit
cd dwarfs || exit 1
git revert --no-commit aeeddaecab5d4648780b0e11dc03fca19e23409a

# Fix compilation with GCC 13
cd folly
curl -#Lo gcc13.patch https://github.com/facebook/folly/commit/39d0cbd592a4d57c34bbf3c751ecd9a4055fbc45.patch
patch -Np1 < ./gcc13.patch || exit 1
cd ..
# Revert commit aeeddae, because otherwise dwarfs might use
# /usr/lib/locale/locale-archive file, which would break it
# on systems using musl libc
#
# This can also be worked around by setting LC_ALL=C, but for now
# let's revert the commit
cd dwarfs || exit 1
git revert --no-commit aeeddaecab5d4648780b0e11dc03fca19e23409a

mkdir build
cd build || exit 1
Expand Down

0 comments on commit 0dfb755

Please sign in to comment.