From 0dfb7554460f59ab6e96d8d48a8c529896fe5d1e Mon Sep 17 00:00:00 2001 From: Kron4ek Date: Sun, 28 May 2023 17:13:22 +0500 Subject: [PATCH] Remove the gcc13 fix for dwarfs Fixed in upstream. --- create-utils.sh | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/create-utils.sh b/create-utils.sh index a3c8836..18605ab 100755 --- a/create-utils.sh +++ b/create-utils.sh @@ -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