X-Original-To: alpine-aports@lists.alpinelinux.org Received: from mx1.tetrasec.net (mx1.tetrasec.net [74.117.190.25]) by lists.alpinelinux.org (Postfix) with ESMTP id 2F964F83220 for ; Thu, 28 Feb 2019 08:38:02 +0000 (UTC) Received: from mx1.tetrasec.net (mail.local [127.0.0.1]) by mx1.tetrasec.net (Postfix) with ESMTP id EF84D9E1CB9; Thu, 28 Feb 2019 08:38:01 +0000 (UTC) Received: from ncopa-desktop.copa.dup.pw (67.63.200.37.customer.cdi.no [37.200.63.67]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: alpine@tanael.org) by mx1.tetrasec.net (Postfix) with ESMTPSA id 12DEA9E0046; Thu, 28 Feb 2019 08:38:00 +0000 (UTC) Date: Thu, 28 Feb 2019 09:37:55 +0100 From: Natanael Copa To: "Milan P. =?ISO-8859-1?B?U3Rhbmkq?=" Cc: alpine-aports@lists.alpinelinux.org Subject: Re: [alpine-aports] [PATCH] main/llvm6: new aport llvm major release (6.0.1) Message-ID: <20190228093755.7776b95b@ncopa-desktop.copa.dup.pw> In-Reply-To: <20190208190525.4722-1-mps@arvanta.net> References: <20190208190525.4722-1-mps@arvanta.net> X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-alpine-linux-musl) X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable On Fri, 8 Feb 2019 20:05:25 +0100 Milan P. Stani* wrote: > APKBUILD based on llvm5 which is already in aports > added diffutils in makedepends > enable check on arm* > rework patches, add some and remove some > --- This fails to build for me: [ 79%] Built target LLVMX86CodeGen Scanning dependencies of target LLVM [ 79%] Building CXX object tools/llvm-shlib/CMakeFiles/LLVM.dir/libllvm.cpp= .o [ 79%] Linking CXX shared library ../../lib/libLLVM-6.0.so /usr/lib/gcc/x86_64-alpine-linux-musl/8.3.0/../../../../x86_64-alpine-linux= -musl/bin/ld: /usr/lib/gcc/x86_64-alpine-linux-musl/8.3.0/../../../../lib/l= ibncursesw.a(lib_cur_term.o): relocation R_X86_64_PC32 against symbol `cur_= term' can not be used when making a shared object; recompile with -fPIC = =20 /usr/lib/gcc/x86_64-alpine-linux-musl/8.3.0/../../../../x86_64-alpine-linux= -musl/bin/ld: final link failed: bad value = =20 collect2: error: ld returned 1 exit status make[2]: *** [tools/llvm-shlib/CMakeFiles/LLVM.dir/build.make:247: lib/libL= LVM-6.0.so] Error 1 = =20 make[1]: *** [CMakeFiles/Makefile2:20952: tools/llvm-shlib/CMakeFiles/LLVM.= dir/all] Error 2 = =20 make: *** [Makefile:152: all] Error 2 -nc > ...lib-tests-for-musl-s-dlclose-is-noop.patch | 22 ++ > main/llvm6/APKBUILD | 253 ++++++++++++++++++ > main/llvm6/cmake-fix-libLLVM-name.patch | 26 ++ > ...ileSystemTest.CreateDir-perms-assert.patch | 61 +++++ > .../llvm6/dynamiclibrary-fix-build-musl.patch | 40 +++ > .../fix-LLVMConfig-cmake-install-prefix.patch | 24 ++ > .../llvm6/fix-memory-mf_exec-on-aarch64.patch | 33 +++ > .../fix-too-strict-gtest-banner-check.patch | 11 + > 8 files changed, 470 insertions(+) > create mode 100644 main/llvm6/0001-Disable-dynamic-lib-tests-for-musl-s-= dlclose-is-noop.patch > create mode 100644 main/llvm6/APKBUILD > create mode 100644 main/llvm6/cmake-fix-libLLVM-name.patch > create mode 100644 main/llvm6/disable-FileSystemTest.CreateDir-perms-ass= ert.patch > create mode 100644 main/llvm6/dynamiclibrary-fix-build-musl.patch > create mode 100644 main/llvm6/fix-LLVMConfig-cmake-install-prefix.patch > create mode 100644 main/llvm6/fix-memory-mf_exec-on-aarch64.patch > create mode 100644 main/llvm6/fix-too-strict-gtest-banner-check.patch >=20 > diff --git a/main/llvm6/0001-Disable-dynamic-lib-tests-for-musl-s-dlclose= -is-noop.patch b/main/llvm6/0001-Disable-dynamic-lib-tests-for-musl-s-dlclo= se-is-noop.patch > new file mode 100644 > index 0000000000..1bf2fbb607 > --- /dev/null > +++ b/main/llvm6/0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noo= p.patch > @@ -0,0 +1,22 @@ > +From f8e83c4c7866ae830abe9bec15cfe805dd825b6e Mon Sep 17 00:00:00 2001 > +From: xentec > +Date: Tue, 12 Sep 2017 07:18:38 +0200 > +Subject: [PATCH] Disable dynamic lib tests for musl's dlclose() is noop > + > +--- > + unittests/Support/CMakeLists.txt | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/unittests/Support/CMakeLists.txt b/unittests/Support/CMakeL= ists.txt > +index 641163e..4f508d9 100644 > +--- a/unittests/Support/CMakeLists.txt > ++++ b/unittests/Support/CMakeLists.txt > +@@ -75,4 +75,4 @@ set_source_files_properties(AlignOfTest.cpp PROPERTIES= COMPILE_FLAGS -w) > + # ManagedStatic.cpp uses . > + target_link_libraries(SupportTests LLVMTestingSupport ${LLVM_PTHREAD_LI= B}) > +=20 > +-add_subdirectory(DynamicLibrary) > ++# add_subdirectory(DynamicLibrary) > +--=20 > +2.14.1 > + > diff --git a/main/llvm6/APKBUILD b/main/llvm6/APKBUILD > new file mode 100644 > index 0000000000..4942de593d > --- /dev/null > +++ b/main/llvm6/APKBUILD > @@ -0,0 +1,253 @@ > +# Contributor: Travis Tilley > +# Contributor: Mitch Tishmack > +# Contributor: Jakub Jirutka > +# Maintainer: > +_pkgname=3Dllvm > +pkgver=3D6.0.1 > +_majorver=3D${pkgver%%.*} > +pkgname=3D$_pkgname$_majorver > +pkgrel=3D0 > +pkgdesc=3D"Low Level Virtual Machine compiler system, version $_majorver" > +arch=3D"all" > +url=3D"https://llvm.org/" > +license=3D"UOI-NCSA" > +depends_dev=3D"$pkgname=3D$pkgver-r$pkgrel" > +makedepends=3D"binutils-dev chrpath cmake file libffi-dev paxmark python= 2 py-setuptools zlib-dev diffutils" > +subpackages=3D"$pkgname-static $pkgname-libs $pkgname-dev $pkgname-test-= utils:_test_utils" > +source=3D"https://releases.llvm.org/$pkgver/llvm-$pkgver.src.tar.xz > + cmake-fix-libLLVM-name.patch > + disable-FileSystemTest.CreateDir-perms-assert.patch > + 0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch > + fix-memory-mf_exec-on-aarch64.patch > + fix-LLVMConfig-cmake-install-prefix.patch > + fix-too-strict-gtest-banner-check.patch > + " > +builddir=3D"$srcdir/$_pkgname-$pkgver.src" > +options=3D"!checkroot" > + > +# Whether is this package the default (latest) LLVM version. > +_default_llvm=3D"yes" > + > +if [ "$_default_llvm" =3D yes ]; then > + provides=3D"llvm=3D$pkgver-r$pkgrel" > + replaces=3D"llvm" > +fi > + > +# NOTE: It seems that there's no (sane) way how to change includedir, sh= aredir > +# etc. separately, just the CMAKE_INSTALL_PREFIX. Standard CMake variabl= es and > +# even LLVM-specific variables, that are related to these paths, actual= ly > +# don't work (in llvm 3.7). > +# > +# When building a software that depends on LLVM, utility llvm-config sho= uld be > +# used to discover where is LLVM installed. It provides options to print > +# path of bindir, includedir, and libdir separately, but in its source, = all > +# these paths are actually hard-coded against INSTALL_PREFIX. We can pat= ch it > +# and move paths manually, but I'm really not sure what it may break... > +# > +# Also note that we should *not* add version suffix to files in llvm bin= dir! > +# It breaks build system of some software that depends on LLVM, because = they > +# don't expect these files to have a sufix. > +# > +# So, we install all the LLVM files into /usr/lib/llvm$_majorver. > +# BTW, Fedora and Debian do the same thing. > +# > +_prefix=3D"usr/lib/llvm$_majorver" > + > +prepare() { > + default_prepare > + cd "$builddir" > + > + # https://bugs.llvm.org//show_bug.cgi?id=3D31870 > + rm test/tools/llvm-symbolizer/print_context.c > + > + mkdir -p "$builddir"/build > +} > + > +build() { > + cd "$builddir"/build > + > + # Auto-detect it by guessing either. > + local ffi_include_dir=3D"$(pkg-config --cflags-only-I libffi | sed 's|^= -I||g')" > + > + cmake -Wno-dev \ > + -DCMAKE_BUILD_TYPE=3DMinSizeRel \ > + -DCMAKE_C_FLAGS_MINSIZEREL_INIT=3D"$CFLAGS" \ > + -DCMAKE_CXX_FLAGS_MINSIZEREL_INIT=3D"$CXXFLAGS" \ > + -DCMAKE_EXE_LINKER_FLAGS_MINSIZEREL_INIT=3D"$LDFLAGS" \ > + -DCMAKE_INSTALL_PREFIX=3D/$_prefix \ > + \ > + -DFFI_INCLUDE_DIR=3D"$ffi_include_dir" \ > + -DLLVM_BINUTILS_INCDIR=3D/usr/include \ > + -DLLVM_BUILD_DOCS=3DOFF \ > + -DLLVM_BUILD_EXAMPLES=3DOFF \ > + -DLLVM_BUILD_EXTERNAL_COMPILER_RT=3DON \ > + -DLLVM_BUILD_LLVM_DYLIB=3DON \ > + -DLLVM_BUILD_TESTS=3DON \ > + -DLLVM_DEFAULT_TARGET_TRIPLE=3D"$CBUILD" \ > + -DLLVM_ENABLE_ASSERTIONS=3DOFF \ > + -DLLVM_ENABLE_CXX1Y=3DON \ > + -DLLVM_ENABLE_FFI=3DON \ > + -DLLVM_ENABLE_LIBCXX=3DOFF \ > + -DLLVM_ENABLE_PIC=3DON \ > + -DLLVM_ENABLE_RTTI=3DON \ > + -DLLVM_ENABLE_SPHINX=3DOFF \ > + -DLLVM_ENABLE_TERMINFO=3DON \ > + -DLLVM_ENABLE_ZLIB=3DON \ > + -DLLVM_HOST_TRIPLE=3D"$CHOST" \ > + -DLLVM_INCLUDE_EXAMPLES=3DOFF \ > + -DLLVM_LINK_LLVM_DYLIB=3DON \ > + -DLLVM_TARGETS_TO_BUILD=3D'X86;ARM;AArch64;PowerPC;SystemZ;AMDGPU;NVPT= X;Mips;BPF' \ > + -DLLVM_APPEND_VC_REV=3DOFF \ > + "$builddir" > + > + make llvm-tblgen > + make > + > + paxmark m \ > + bin/llvm-rtdyld \ > + bin/lli \ > + bin/lli-child-target \ > + unittests/ExecutionEngine/MCJIT/MCJITTests \ > + unittests/ExecutionEngine/Orc/OrcJITTests \ > + unittests/Support/SupportTests > + > + python2 ../utils/lit/setup.py build > +} > + > +check() { > + cd "$builddir"/build > + > + make check-llvm > +} > + > +package() { > + cd "$builddir"/build > + > + make DESTDIR=3D"$pkgdir" install > + > + cd "$pkgdir"/$_prefix > + > + # Remove RPATHs. > + file lib/*.so bin/* \ > + | awk -F: '$2~/ELF/{print $1}' \ > + | xargs -r chrpath -d > + > + # Symlink files from /usr/lib/llvm*/bin to /usr/bin. > + mkdir -p "$pkgdir"/usr/bin > + local name newname path > + for path in bin/*; do > + name=3D${path##*/} > + # Add version infix/suffix to the executable name. > + case "$name" in > + llvm-*) newname=3D"llvm$_majorver-${name#llvm-}";; > + *) newname=3D"$name$_majorver";; > + esac > + # If this package provides=3Dllvm (i.e. it's the default/latest > + # llvm package), omit version infix/suffix. > + if [ "$_default_llvm" =3D yes ]; then > + newname=3D$name > + fi > + case "$name" in > + FileCheck | obj2yaml | yaml2obj) continue;; > + esac > + ln -s ../lib/llvm$_majorver/bin/$name "$pkgdir"/usr/bin/$newname > + done > + > + # Move /usr/lib/$pkgname/include/ into /usr/include/$pkgname/ > + # and symlink it back. > + _mv include/* "$pkgdir"/usr/include/$pkgname/ > + rmdir include > + ln -s ../../include/$pkgname include > + > + # Move /usr/lib/$pkgname/lib/cmake/llvm/ into /usr/lib/cmake/$pkgname/ > + # and symlink it back. > + _mv lib/cmake/llvm/* "$pkgdir"/usr/lib/cmake/$pkgname/ > + rmdir lib/cmake/llvm > + ln -s ../../../cmake/$pkgname lib/cmake/llvm > +} > + > +static() { > + pkgdesc=3D"LLVM $_majorver static libraries" > + _common_subpkg > + > + _mv "$pkgdir"/$_prefix/lib/*.a "$subpkgdir"/$_prefix/lib/ > +} > + > +libs() { > + pkgdesc=3D"LLVM $_majorver runtime library" > + local soname=3D"libLLVM-$_majorver.0.so" > + local soname2=3D"libLLVM-$pkgver.so" > + _common_subpkg > + > + mkdir -p "$subpkgdir" > + cd "$subpkgdir" > + > + # libLLVM should be in /usr/lib. This is needed for binaries that are > + # dynamically linked with libLLVM, so they can find it on default path. > + _mv "$pkgdir"/$_prefix/lib/$soname usr/lib/ > + ln -s $soname usr/lib/$soname2 > + > + # And also symlink it back to the LLVM prefix. > + mkdir -p $_prefix/lib > + ln -s ../../$soname $_prefix/lib/$soname > + ln -s ../../$soname $_prefix/lib/$soname2 > +} > + > +dev() { > + _common_subpkg > + default_dev > + cd "$subpkgdir" > + > + _mv "$pkgdir"/$_prefix/lib $_prefix/ > + _mv "$pkgdir"/$_prefix/include $_prefix/ > + > + _mv "$pkgdir"/$_prefix/bin/llvm-config $_prefix/bin/ > + > + if [ "$_default_llvm" =3D yes ]; then > + ln -sf llvm$_majorver/lib/LLVMgold.so usr/lib/ > + ln -sf llvm$_majorver/lib/libLTO.so usr/lib/ > + ln -sf llvm$_majorver usr/lib/cmake/llvm > + fi > +} > + > +_test_utils() { > + pkgdesc=3D"LLVM $_majorver utilities for executing LLVM and Clang style= test suites" > + depends=3D"python2 py-setuptools" > + _common_subpkg > + replaces=3D"" > + > + local litver=3D$(python2 "$builddir"/utils/lit/setup.py --version 2>/de= v/null \ > + | sed 's/\.dev.*$//') > + test -n "$litver" > + provides=3D"$provides lit=3D$litver-r$pkgrel" > + > + cd "$builddir"/build > + > + install -D -m 755 bin/count "$subpkgdir"/$_prefix/bin/count > + install -D -m 755 bin/FileCheck "$subpkgdir"/$_prefix/bin/FileCheck > + install -D -m 755 bin/not "$subpkgdir"/$_prefix/bin/not > + > + python2 ../utils/lit/setup.py install --prefix=3D/usr --root=3D"$subpkg= dir" > + ln -s ../../../bin/lit "$subpkgdir"/$_prefix/bin/lit > +} > + > +_common_subpkg() { > + if [ "$_default_llvm" =3D yes ]; then > + replaces=3D"llvm${subpkgname#$pkgname}" > + provides=3D"$replaces=3D$pkgver-r$pkgrel" > + fi > +} > + > +_mv() { > + local dest; for dest; do true; done # get last argument > + mkdir -p "$dest" > + mv $@ > +} > + > +sha512sums=3D"cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108= 598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9 llv= m-6.0.1.src.tar.xz > +6d1a716e5aa24e6b9a3acf4cc11e2504b1b01abf574074e9e5617b991de87d5e4e687eb1= 8e85e73d5e632568afe2fc357771c4c96f9e136502071991496fb78c cmake-fix-libLLVM= -name.patch > +49c47f125014b60d0ea7870f981a2c1708ad705793f89287ed846ee881a837a4dc0170bf= 467e03f2ef56177473128945287749ac80dc2d13cfabcf8b929ba58a disable-FileSyste= mTest.CreateDir-perms-assert.patch > +695502bd3b5454c2f5630c59a8cf5f8aeb0deac16a76a8a4df34849e1e35c12ed4234572= a320fe4c7e96f974f572f429eb816c5aa3dcfb17057f550eac596495 0001-Disable-dyna= mic-lib-tests-for-musl-s-dlclose-is-noop.patch > +e6d925ddc71f9f2ce8a859ac519dad51cba99c07129e378a5388bb1dd2f7d5b9d5ed392e= 85267fd20043789c7460a7d705eb8f970b2d130edbf5a934e9505ac4 fix-memory-mf_exe= c-on-aarch64.patch > +7d4825d16107e56a14b7b05be847f03d75e2e05952bea0742a1233b5b0441c9934d8058e= 612abb6471272884372d9bfd3348355fbd3c19cba82a554003cc3eec fix-LLVMConfig-cm= ake-install-prefix.patch > +95b335237328e249c7de71648385d90e736932b1d47cf07a9188ea98d4c2bc740f217e41= 45f65cb9822058515b6fccaeaf28fb0319fd692e7278a2d542186f54 fix-too-strict-gt= est-banner-check.patch" > diff --git a/main/llvm6/cmake-fix-libLLVM-name.patch b/main/llvm6/cmake-f= ix-libLLVM-name.patch > new file mode 100644 > index 0000000000..cb29fe2efc > --- /dev/null > +++ b/main/llvm6/cmake-fix-libLLVM-name.patch > @@ -0,0 +1,26 @@ > +Include version in name of shared libs > + > +libLLVM.so -> libLLVM-$MAJOR.$MINOR.so > + > +Source: http://pkgs.fedoraproject.org/cgit/rpms/llvm3.9.git/tree/llvm-so= version.patch?id=3D3dac83eaa5b88f550ae50125b14b8f644e10617b > +--- a/cmake/modules/AddLLVM.cmake > ++++ b/cmake/modules/AddLLVM.cmake > +@@ -450,6 +450,18 @@ > + PREFIX "" > + ) > + endif() > ++ > ++ # Set SOVERSION on shared libraries that lack explicit SONAME > ++ # specifier, on *nix systems that are not Darwin. > ++ if(UNIX AND NOT APPLE AND NOT ARG_SONAME) > ++ set_target_properties(${name} > ++ PROPERTIES > ++ # Concatenate the version numbers since ldconfig expects exactly > ++ # one component indicating the ABI version, while LLVM uses > ++ # major+minor for that. > ++ SOVERSION ${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR} > ++ VERSION ${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERS= ION_PATCH}${LLVM_VERSION_SUFFIX}) > ++ endif() > + endif() > +=20 > + if(ARG_MODULE OR ARG_SHARED) > diff --git a/main/llvm6/disable-FileSystemTest.CreateDir-perms-assert.pat= ch b/main/llvm6/disable-FileSystemTest.CreateDir-perms-assert.patch > new file mode 100644 > index 0000000000..e73ce9b6f0 > --- /dev/null > +++ b/main/llvm6/disable-FileSystemTest.CreateDir-perms-assert.patch > @@ -0,0 +1,61 @@ > +Do not assert permissions of file created in /tmp directory. > + > +This assertion fails, probably due to some specific setup of /tmp > +on build servers. > + > + FAIL: LLVM-Unit :: Support/SupportTests/FileSystemTest.CreateDir (12= 93 of 17222) > + ******************** TEST 'LLVM-Unit :: Support/SupportTests/FileSys= temTest.CreateDir' FAILED ******************** > + Note: Google Test filter =3D FileSystemTest.CreateDir > + [=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D] Running 1 test from 1 test case. > + [----------] Global test environment set-up. > + [----------] 1 test from FileSystemTest > + [ RUN ] FileSystemTest.CreateDir > + /home/buildozer/aports/testing/llvm3.9/src/llvm-3.9.1.src/unittests/= Support/Path.cpp:591: Failure > + Value of: fs::perms::owner_read | fs::perms::owner_exe > + Actual: 320 > + Expected: Status.permissions() & fs::perms::all_all > + Which is: 448 > + > +--- a/unittests/Support/Path.cpp > ++++ b/unittests/Support/Path.cpp > +@@ -579,23 +579,23 @@ > + ASSERT_NO_ERROR(fs::remove(Twine(TestDirectory) + "foo")); > +=20 > + #ifdef LLVM_ON_UNIX > +- // Set a 0000 umask so that we can test our directory permissions. > +- mode_t OldUmask =3D ::umask(0000); > +- > +- fs::file_status Status; > +- ASSERT_NO_ERROR( > +- fs::create_directory(Twine(TestDirectory) + "baz500", false, > +- fs::perms::owner_read | fs::perms::owner_exe= )); > +- ASSERT_NO_ERROR(fs::status(Twine(TestDirectory) + "baz500", Status)); > +- ASSERT_EQ(Status.permissions() & fs::perms::all_all, > +- fs::perms::owner_read | fs::perms::owner_exe); > +- ASSERT_NO_ERROR(fs::create_directory(Twine(TestDirectory) + "baz777",= false, > +- fs::perms::all_all)); > +- ASSERT_NO_ERROR(fs::status(Twine(TestDirectory) + "baz777", Status)); > +- ASSERT_EQ(Status.permissions() & fs::perms::all_all, fs::perms::all_a= ll); > +- > +- // Restore umask to be safe. > +- ::umask(OldUmask); > ++// // Set a 0000 umask so that we can test our directory permissions. > ++// mode_t OldUmask =3D ::umask(0000); > ++// > ++// fs::file_status Status; > ++// ASSERT_NO_ERROR( > ++// fs::create_directory(Twine(TestDirectory) + "baz500", false, > ++// fs::perms::owner_read | fs::perms::owner_e= xe)); > ++// ASSERT_NO_ERROR(fs::status(Twine(TestDirectory) + "baz500", Status)= ); > ++// ASSERT_EQ(Status.permissions() & fs::perms::all_all, > ++// fs::perms::owner_read | fs::perms::owner_exe); > ++// ASSERT_NO_ERROR(fs::create_directory(Twine(TestDirectory) + "baz777= ", false, > ++// fs::perms::all_all)); > ++// ASSERT_NO_ERROR(fs::status(Twine(TestDirectory) + "baz777", Status)= ); > ++// ASSERT_EQ(Status.permissions() & fs::perms::all_all, fs::perms::all= _all); > ++// > ++// // Restore umask to be safe. > ++// ::umask(OldUmask); > + #endif > +=20 > + #ifdef LLVM_ON_WIN32 > diff --git a/main/llvm6/dynamiclibrary-fix-build-musl.patch b/main/llvm6/= dynamiclibrary-fix-build-musl.patch > new file mode 100644 > index 0000000000..a9bbe168e9 > --- /dev/null > +++ b/main/llvm6/dynamiclibrary-fix-build-musl.patch > @@ -0,0 +1,40 @@ > +From ae8900a8833835309aecb0a3d947c2ae46fd86c3 Mon Sep 17 00:00:00 2001 > +From: Keno Fischer > +Date: Thu, 26 Oct 2017 16:44:13 +0000 > +Subject: [PATCH] [DynamicLibrary] Fix build on musl libc > + > +Summary: > +On musl libc, stdin/out/err are defined as `FILE* const` globals, > +and their address is not implicitly convertible to void *, > +or at least gcc 6 doesn't allow it, giving errors like: > + > +``` > +error: cannot initialize return object of type 'void *' with an rvalue o= f type 'FILE *const *' (aka '_IO_FILE *const *') > + EXPLICIT_SYMBOL(stderr); > + ^~~~~~~~~~~~~~~~~~~~~~~ > +``` > + > +Add an explicit cast to fix that problem. > + > +Reviewers: marsupial, krytarowski, dim > +Reviewed By: dim > +Differential Revision: https://reviews.llvm.org/D39297 > + > +git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@316672 91177308= -0d34-0410-b5e6-96231b3b80d8 > +--- > + lib/Support/Unix/DynamicLibrary.inc | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/lib/Support/Unix/DynamicLibrary.inc b/lib/Support/Unix/Dyna= micLibrary.inc > +index f05103ccd1e..029451f347e 100644 > +--- a/lib/Support/Unix/DynamicLibrary.inc > ++++ b/lib/Support/Unix/DynamicLibrary.inc > +@@ -71,7 +71,7 @@ void *DynamicLibrary::HandleSet::DLSym(void *Handle, c= onst char *Symbol) { > + // Must declare the symbols in the global namespace. > + static void *DoSearch(const char* SymbolName) { > + #define EXPLICIT_SYMBOL(SYM) \ > +- extern void *SYM; if (!strcmp(SymbolName, #SYM)) return &SYM > ++ extern void *SYM; if (!strcmp(SymbolName, #SYM)) return (void*)&SYM > +=20 > + // If this is darwin, it has some funky issues, try to solve them her= e. Some > + // important symbols are marked 'private external' which doesn't allow > diff --git a/main/llvm6/fix-LLVMConfig-cmake-install-prefix.patch b/main/= llvm6/fix-LLVMConfig-cmake-install-prefix.patch > new file mode 100644 > index 0000000000..b7e3dbe294 > --- /dev/null > +++ b/main/llvm6/fix-LLVMConfig-cmake-install-prefix.patch > @@ -0,0 +1,24 @@ > +Fix LLVMConfig.cmake being generated to use correct LLVM_INSTALL_PREFIX > +(e.g. /usr/lib/llvm5). > + > +This is needed e.g. for building lldb. > + > +--- a/cmake/modules/CMakeLists.txt > ++++ b/cmake/modules/CMakeLists.txt > +@@ -75,15 +75,7 @@ > +=20 > + # Generate LLVMConfig.cmake for the install tree. > + set(LLVM_CONFIG_CODE " > +-# Compute the installation prefix from this LLVMConfig.cmake file locat= ion. > +-get_filename_component(LLVM_INSTALL_PREFIX \"\${CMAKE_CURRENT_LIST_FILE= }\" PATH)") > +-# Construct the proper number of get_filename_component(... PATH) > +-# calls to compute the installation prefix. > +-string(REGEX REPLACE "/" ";" _count "${LLVM_INSTALL_PACKAGE_DIR}") > +-foreach(p ${_count}) > +- set(LLVM_CONFIG_CODE "${LLVM_CONFIG_CODE} > +-get_filename_component(LLVM_INSTALL_PREFIX \"\${LLVM_INSTALL_PREFIX}\" = PATH)") > +-endforeach(p) > ++set(LLVM_INSTALL_PREFIX \"${CMAKE_INSTALL_PREFIX}\")") > + set(LLVM_CONFIG_INCLUDE_DIRS "\${LLVM_INSTALL_PREFIX}/include") > + set(LLVM_CONFIG_LIBRARY_DIRS "\${LLVM_INSTALL_PREFIX}/lib\${LLVM_LIBDIR= _SUFFIX}") > + set(LLVM_CONFIG_CMAKE_DIR "\${LLVM_INSTALL_PREFIX}/${LLVM_INSTALL_PACKA= GE_DIR}") > diff --git a/main/llvm6/fix-memory-mf_exec-on-aarch64.patch b/main/llvm6/= fix-memory-mf_exec-on-aarch64.patch > new file mode 100644 > index 0000000000..644c77790a > --- /dev/null > +++ b/main/llvm6/fix-memory-mf_exec-on-aarch64.patch > @@ -0,0 +1,33 @@ > +Fix failures in AllocationTests/MappedMemoryTest.* on aarch64: > + > + Failing Tests (8): > + LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemory= Test.AllocAndRelease/3 > + LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemory= Test.DuplicateNear/3 > + LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemory= Test.EnabledWrite/3 > + LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemory= Test.MultipleAllocAndRelease/3 > + LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemory= Test.SuccessiveNear/3 > + LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemory= Test.UnalignedNear/3 > + LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemory= Test.ZeroNear/3 > + LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemory= Test.ZeroSizeNear/3 > + > +Upstream-Issue: https://bugs.llvm.org/show_bug.cgi?id=3D14278#c10 > + > +--- a/lib/Support/Unix/Memory.inc > ++++ b/lib/Support/Unix/Memory.inc > +@@ -54,7 +54,7 @@ > + llvm::sys::Memory::MF_EXEC: > + return PROT_READ | PROT_WRITE | PROT_EXEC; > + case llvm::sys::Memory::MF_EXEC: > +-#if defined(__FreeBSD__) > ++#if defined(__FreeBSD__) || (defined(__linux__) && defined(__aarch64__)) > + // On PowerPC, having an executable page that has no read permission > + // can have unintended consequences. The function InvalidateInstru= ction- > + // Cache uses instructions dcbf and icbi, both of which are treated= by > +@@ -62,6 +62,7 @@ > + // executing these instructions will result in a segmentation fault. > + // Somehow, this problem is not present on Linux, but it does happen > + // on FreeBSD. > ++ // The same problem is present even on aarch64 Linux (at least on m= usl). > + return PROT_READ | PROT_EXEC; > + #else > + return PROT_EXEC; > diff --git a/main/llvm6/fix-too-strict-gtest-banner-check.patch b/main/ll= vm6/fix-too-strict-gtest-banner-check.patch > new file mode 100644 > index 0000000000..412888e420 > --- /dev/null > +++ b/main/llvm6/fix-too-strict-gtest-banner-check.patch > @@ -0,0 +1,11 @@ > +--- a/utils/lit/lit/formats/googletest.py > ++++ b/utils/lit/lit/formats/googletest.py > +@@ -42,7 +42,7 @@ > + for ln in output.splitlines(False): # Don't keep newlines. > + ln =3D lit.util.to_string(ln) > +=20 > +- if 'Running main() from gtest_main.cc' in ln: > ++ if ln.startswith('Running main() from '): > + # Upstream googletest prints this to stdout prior to ru= nning > + # tests. LLVM removed that print statement in r61540, b= ut we > + # handle it here in case upstream googletest is being u= sed. --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---