Skip to Content.
Sympa Menu

sm-commit - Re: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (9f05e15ffb05e55d25ba1304481a40cc71800310)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <ismael AT iodev.co.uk>
  • To: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
  • Cc: sm-commit AT lists.ibiblio.org
  • Subject: Re: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (9f05e15ffb05e55d25ba1304481a40cc71800310)
  • Date: Sat, 28 Aug 2021 21:12:00 +0200

Why make the patch optional? Optional patches are problematic.

Also, can lld be built separately?

On 10/Jul/2021 14:33, Florian Franzmann wrote:
> GIT changes to master grimoire by Florian Franzmann
> <siflfran AT hawo.stw.uni-erlangen.de>:
>
> devel/llvm/HISTORY | 3 +++
> devel/llvm/PRE_BUILD | 14 ++++++++------
> 2 files changed, 11 insertions(+), 6 deletions(-)
>
> New commits:
> commit 9f05e15ffb05e55d25ba1304481a40cc71800310
> Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
> Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
>
> devel/llvm: Only apply lld-related patch when lld is built
>
> diff --git a/devel/llvm/HISTORY b/devel/llvm/HISTORY
> index ef8c489..0bc8459 100644
> --- a/devel/llvm/HISTORY
> +++ b/devel/llvm/HISTORY
> @@ -1,3 +1,6 @@
> +2021-07-10 Florian Franzmann <bwlf AT bandrate.org>
> + * PRE_BUILD: only apply lld-related patch when lld is actually built
> +
> 2021-07-09 Florian Franzmann <bwlf AT bandrate.org>
> * DETAILS: version 12.0.1
>
> diff --git a/devel/llvm/PRE_BUILD b/devel/llvm/PRE_BUILD
> index bcde14f..1c8c8eb 100755
> --- a/devel/llvm/PRE_BUILD
> +++ b/devel/llvm/PRE_BUILD
> @@ -36,8 +36,15 @@ if [[ "$LLVM_WITH_LLD" == y ]]; then
> mv libcxx-${VERSION}.src projects/libcxx &&
> unpack_file 19 &&
> mv libcxxabi-${VERSION}.src projects/libcxxabi
> +
> + # Bugfix for llvm 12.0.0, cf.
> https://groups.google.com/g/llvm-dev/c/gIY5COm6V5E
> + # This will probably be fixed in llvm 12.0.1.
> + # As of 2021-07-10 this has not been fixed.
> + cd "$SOURCE_DIRECTORY/tools" &&
> + patch -p1 <
> "$SPELL_DIRECTORY/0001-Include-libunwind-from-source-directory.patch"
> fi &&
>
> +cd "$SOURCE_DIRECTORY" &&
>
> # small cmake related fix for libffi
> if spell_ok libffi;then
> @@ -48,9 +55,4 @@ if spell_ok libffi;then
> fi &&
>
> # do not build all backends
> -sed -i "/^set.*all\"$/s/all//" CMakeLists.txt &&
> -
> -# Bugfix for llvm 12.0.0, cf.
> https://groups.google.com/g/llvm-dev/c/gIY5COm6V5E
> -# This will probably be fixed in llvm 12.0.1.
> -cd "$SOURCE_DIRECTORY/tools" &&
> -patch -p1 <
> "$SPELL_DIRECTORY/0001-Include-libunwind-from-source-directory.patch"
> +sed -i "/^set.*all\"$/s/all//" CMakeLists.txt
> _______________________________________________
> SM-Commit mailing list
> SM-Commit AT lists.ibiblio.org
> https://lists.ibiblio.org/mailman/listinfo/sm-commit

--
Ismael Luceno
http://iodev.co.uk/




Archive powered by MHonArc 2.6.24.

Top of Page