From 99d2cef4d0760eed7ba318f2a2f99a0a5545f15b Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Fri, 10 Apr 2020 11:35:30 -0400 Subject: [PATCH 1/4] ldc: update to 1.20.1. --- common/shlibs | 10 +++++----- srcpkgs/ldc/template | 13 +++++++------ 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/common/shlibs b/common/shlibs index 0aa615a8d11..96ab92215cd 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2072,11 +2072,11 @@ libFcitxQt5WidgetsAddons.so.1 libfcitx-qt5-1.2.1_1 libfcitx-qt5.so.0 libfcitx-qt5-0.1.3_1 liblastfm.so.1 liblastfm-1.0.9_1 liblastfm_fingerprint.so.1 liblastfm-1.0.9_1 -libdruntime-ldc-debug-shared.so.83 ldc-runtime-1.13.0_1 -libdruntime-ldc-shared.so.83 ldc-runtime-1.13.0_1 -libphobos2-ldc-shared.so.83 ldc-runtime-1.13.0_1 -libphobos2-ldc-debug-shared.so.83 ldc-runtime-1.13.0_1 -libldc-jit.so.83 ldc-runtime-1.13.0_1 +libdruntime-ldc-debug-shared.so.90 ldc-runtime-1.20.1_1 +libdruntime-ldc-shared.so.90 ldc-runtime-1.20.1_1 +libphobos2-ldc-shared.so.90 ldc-runtime-1.20.1_1 +libphobos2-ldc-debug-shared.so.90 ldc-runtime-1.20.1_1 +libldc-jit.so.90 ldc-runtime-1.20.1_1 libmarblewidget-qt5.so.28 marble5-17.12.2_1 libastro.so.2 marble5-17.12.2_1 libparrot.so.6.9.0 parrot-6.9.0_1 diff --git a/srcpkgs/ldc/template b/srcpkgs/ldc/template index 3a13b367938..95755004713 100644 --- a/srcpkgs/ldc/template +++ b/srcpkgs/ldc/template @@ -1,13 +1,14 @@ # Template file for 'ldc' pkgname=ldc -version=1.13.0 -revision=3 +version=1.20.1 +revision=1 wrksrc="ldc-${version}-src" build_style=cmake -configure_args="-DINCLUDE_INSTALL_DIR=/usr/include/dlang/ldc -DBUILD_SHARED_LIBS=ON - -DBASH_COMPLETION_COMPLETIONSDIR=/usr/share/bash-completion" +configure_args="-DINCLUDE_INSTALL_DIR=/usr/include/dlang/ldc + -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo + -DBASH_COMPLETION_COMPLETIONSDIR=/usr/share/bash-completion" conf_files="/etc/ldc2.conf" -hostmakedepends="dmd llvm7 perl pkg-config" +hostmakedepends="dmd llvm9 perl pkg-config" makedepends="libcurl-devel libffi-devel ncurses-devel zlib-devel" depends="ldc-runtime" short_desc="Portable D programming language compiler based on LLVM" @@ -16,7 +17,7 @@ license="BSD-3-Clause, BSL-1.0" homepage="https://wiki.dlang.org/LDC" changelog="https://raw.githubusercontent.com/ldc-developers/ldc/master/CHANGELOG.md" distfiles="https://github.com/ldc-developers/ldc/releases/download/v${version}/ldc-${version}-src.tar.gz" -checksum=4b2fd3eb90fb6debc0ae6d70406bc78fcb531a0f20806640e626d4822e87b2e0 +checksum=2b21dfffb6efd2c2158bc83422765335aae34b709ebdc406bb026c21967a1aaf nopie=yes nocross=yes From 1c31e1824a6f7b0677d3090ae0161abd2ae1fc0d Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Fri, 10 Apr 2020 11:38:41 -0400 Subject: [PATCH 2/4] llvm7: remove package --- common/shlibs | 1 - srcpkgs/llvm7/INSTALL.msg | 1 + srcpkgs/llvm7/files/llvm-Config-config.h | 9 -- srcpkgs/llvm7/files/llvm-Config-llvm-config.h | 9 -- .../patches/cfe/cfe-001-fix-stdint.patch | 41 -------- .../cfe-003-fix-unwind-chain-inclusion.patch | 45 --------- .../cfe/cfe-004-add-musl-triples.patch | 56 ----------- .../cfe-005-ppc64-dynamic-linker-path.patch | 18 ---- .../cfe/cfe-006-ppc64-musl-elfv2.patch | 26 ----- .../files/patches/lldb/zzz-aarch64.patch | 25 ----- .../files/patches/llvm/llvm-001-musl.patch | 58 ----------- .../llvm/llvm-002-musl-ppc64-elfv2.patch | 27 ----- .../llvm/llvm-003-llvm-config-cflags.patch | 88 ----------------- srcpkgs/llvm7/template | 99 +------------------ srcpkgs/llvm7/update | 3 - 15 files changed, 5 insertions(+), 501 deletions(-) create mode 100644 srcpkgs/llvm7/INSTALL.msg delete mode 100644 srcpkgs/llvm7/files/llvm-Config-config.h delete mode 100644 srcpkgs/llvm7/files/llvm-Config-llvm-config.h delete mode 100644 srcpkgs/llvm7/files/patches/cfe/cfe-001-fix-stdint.patch delete mode 100644 srcpkgs/llvm7/files/patches/cfe/cfe-003-fix-unwind-chain-inclusion.patch delete mode 100644 srcpkgs/llvm7/files/patches/cfe/cfe-004-add-musl-triples.patch delete mode 100644 srcpkgs/llvm7/files/patches/cfe/cfe-005-ppc64-dynamic-linker-path.patch delete mode 100644 srcpkgs/llvm7/files/patches/cfe/cfe-006-ppc64-musl-elfv2.patch delete mode 100644 srcpkgs/llvm7/files/patches/lldb/zzz-aarch64.patch delete mode 100644 srcpkgs/llvm7/files/patches/llvm/llvm-001-musl.patch delete mode 100644 srcpkgs/llvm7/files/patches/llvm/llvm-002-musl-ppc64-elfv2.patch delete mode 100644 srcpkgs/llvm7/files/patches/llvm/llvm-003-llvm-config-cflags.patch delete mode 100644 srcpkgs/llvm7/update diff --git a/common/shlibs b/common/shlibs index 96ab92215cd..2deca5d7cb0 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1030,7 +1030,6 @@ libconfuse.so.2 confuse-3.2.1_1 liblldb.so.9 lldb-9.0.0_1 libclang.so.9 clang-9.0.0_1 libclang-cpp.so.9 clang-9.0.0_1 -libLLVM-7.so libllvm7-7.0.0_1 libLLVM-9.so libllvm9-9.0.0_1 libisofs.so.6 libisofs-0.6.24_1 libmpack.so.0 libmpack-1.0.5_1 diff --git a/srcpkgs/llvm7/INSTALL.msg b/srcpkgs/llvm7/INSTALL.msg new file mode 100644 index 00000000000..2bb143ac3bd --- /dev/null +++ b/srcpkgs/llvm7/INSTALL.msg @@ -0,0 +1 @@ +llvm7 is no longer provided by Void Linux diff --git a/srcpkgs/llvm7/files/llvm-Config-config.h b/srcpkgs/llvm7/files/llvm-Config-config.h deleted file mode 100644 index c369b4551f7..00000000000 --- a/srcpkgs/llvm7/files/llvm-Config-config.h +++ /dev/null @@ -1,9 +0,0 @@ -#include - -#if __WORDSIZE == 32 -#include "config-32.h" -#elif __WORDSIZE == 64 -#include "config-64.h" -#else -#error "Unknown word size" -#endif diff --git a/srcpkgs/llvm7/files/llvm-Config-llvm-config.h b/srcpkgs/llvm7/files/llvm-Config-llvm-config.h deleted file mode 100644 index 2fa08c9be69..00000000000 --- a/srcpkgs/llvm7/files/llvm-Config-llvm-config.h +++ /dev/null @@ -1,9 +0,0 @@ -#include - -#if __WORDSIZE == 32 -#include "llvm-config-32.h" -#elif __WORDSIZE == 64 -#include "llvm-config-64.h" -#else -#error "Unknown word size" -#endif diff --git a/srcpkgs/llvm7/files/patches/cfe/cfe-001-fix-stdint.patch b/srcpkgs/llvm7/files/patches/cfe/cfe-001-fix-stdint.patch deleted file mode 100644 index 17c6989dc8f..00000000000 --- a/srcpkgs/llvm7/files/patches/cfe/cfe-001-fix-stdint.patch +++ /dev/null @@ -1,41 +0,0 @@ -From fd3bcfddcdb11757e95bc3a625017cbf234b67ed Mon Sep 17 00:00:00 2001 -From: Andrea Brancaleoni -Date: Tue, 8 Sep 2015 22:14:32 +0200 -Subject: [PATCH 1/7] fix stdint - ---- - lib/Headers/stdint.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/lib/Headers/stdint.h b/lib/Headers/stdint.h -index 0303db9..8ca28df 100644 ---- a/lib/Headers/stdint.h -+++ b/lib/Headers/stdint.h -@@ -22,8 +22,6 @@ - * - \*===----------------------------------------------------------------------===*/ - --#ifndef __CLANG_STDINT_H --#define __CLANG_STDINT_H - - /* If we're hosted, fall back to the system's stdint.h, which might have - * additional definitions. -@@ -72,6 +70,8 @@ - # endif - - #else -+#ifndef __CLANG_STDINT_H -+#define __CLANG_STDINT_H - - /* C99 7.18.1.1 Exact-width integer types. - * C99 7.18.1.2 Minimum-width integer types. -@@ -703,5 +703,5 @@ typedef __UINTMAX_TYPE__ uintmax_t; - #define INTMAX_C(v) __INTN_C(__INTMAX_WIDTH__, v) - #define UINTMAX_C(v) __UINTN_C(__INTMAX_WIDTH__, v) - --#endif /* __STDC_HOSTED__ */ - #endif /* __CLANG_STDINT_H */ -+#endif /* __STDC_HOSTED__ */ --- -2.5.1 - diff --git a/srcpkgs/llvm7/files/patches/cfe/cfe-003-fix-unwind-chain-inclusion.patch b/srcpkgs/llvm7/files/patches/cfe/cfe-003-fix-unwind-chain-inclusion.patch deleted file mode 100644 index a399ac17a0c..00000000000 --- a/srcpkgs/llvm7/files/patches/cfe/cfe-003-fix-unwind-chain-inclusion.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 352974169f0d2b5da3d5321f588f5e3b5941330e Mon Sep 17 00:00:00 2001 -From: Andrea Brancaleoni -Date: Tue, 8 Sep 2015 22:14:57 +0200 -Subject: [PATCH 2/7] fix unwind chain inclusion - ---- - lib/Headers/unwind.h | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/lib/Headers/unwind.h b/lib/Headers/unwind.h -index 303d792..44e10cc 100644 ---- a/lib/Headers/unwind.h -+++ b/lib/Headers/unwind.h -@@ -23,9 +23,6 @@ - - /* See "Data Definitions for libgcc_s" in the Linux Standard Base.*/ - --#ifndef __CLANG_UNWIND_H --#define __CLANG_UNWIND_H -- - #if defined(__APPLE__) && __has_include_next() - /* Darwin (from 11.x on) provide an unwind.h. If that's available, - * use it. libunwind wraps some of its definitions in #ifdef _GNU_SOURCE, -@@ -53,6 +50,9 @@ - # endif - #else - -+#ifndef __CLANG_UNWIND_H -+#define __CLANG_UNWIND_H -+ - #include - - #ifdef __cplusplus -@@ -277,6 +277,7 @@ _Unwind_Ptr _Unwind_GetTextRelBase(struct _Unwind_Context *); - } - #endif - -+#endif /* __CLANG_UNWIND_H */ -+ - #endif - --#endif /* __CLANG_UNWIND_H */ --- -2.5.1 - diff --git a/srcpkgs/llvm7/files/patches/cfe/cfe-004-add-musl-triples.patch b/srcpkgs/llvm7/files/patches/cfe/cfe-004-add-musl-triples.patch deleted file mode 100644 index fccf619f621..00000000000 --- a/srcpkgs/llvm7/files/patches/cfe/cfe-004-add-musl-triples.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- clang/lib/Driver/ToolChains/Gnu.cpp -+++ clang/lib/Driver/ToolChains/Gnu.cpp -@@ -1812,7 +1812,7 @@ - static const char *const AArch64LibDirs[] = {"/lib64", "/lib"}; - static const char *const AArch64Triples[] = { - "aarch64-none-linux-gnu", "aarch64-linux-gnu", "aarch64-redhat-linux", -- "aarch64-suse-linux"}; -+ "aarch64-suse-linux","aarch64-linux-musl"}; - static const char *const AArch64beLibDirs[] = {"/lib"}; - static const char *const AArch64beTriples[] = {"aarch64_be-none-linux-gnu", - "aarch64_be-linux-gnu"}; -@@ -1822,7 +1822,9 @@ - static const char *const ARMHFTriples[] = {"arm-linux-gnueabihf", - "armv7hl-redhat-linux-gnueabi", - "armv6hl-suse-linux-gnueabi", -- "armv7hl-suse-linux-gnueabi"}; -+ "armv7hl-suse-linux-gnueabi", -+ "arm-linux-musleabihf", -+ "armv7l-linux-musleabihf"}; - static const char *const ARMebLibDirs[] = {"/lib"}; - static const char *const ARMebTriples[] = {"armeb-linux-gnueabi"}; - static const char *const ARMebHFTriples[] = { -@@ -1835,14 +1837,15 @@ - "x86_64-redhat-linux", "x86_64-suse-linux", - "x86_64-manbo-linux-gnu", "x86_64-linux-gnu", - "x86_64-slackware-linux", "x86_64-unknown-linux", -- "x86_64-amazon-linux"}; -+ "x86_64-amazon-linux", "x86_64-linux-musl"}; - static const char *const X32LibDirs[] = {"/libx32"}; - static const char *const X86LibDirs[] = {"/lib32", "/lib"}; - static const char *const X86Triples[] = { - "i686-linux-gnu", "i686-pc-linux-gnu", "i486-linux-gnu", - "i386-linux-gnu", "i386-redhat-linux6E", "i686-redhat-linux", - "i586-redhat-linux", "i386-redhat-linux", "i586-suse-linux", -- "i486-slackware-linux", "i686-montavista-linux", "i586-linux-gnu"}; -+ "i486-slackware-linux", "i686-montavista-linux", "i586-linux-gnu", -+ "i686-linux-musl"}; - - static const char *const MIPSLibDirs[] = {"/lib"}; - static const char *const MIPSTriples[] = {"mips-linux-gnu", "mips-mti-linux", -@@ -1869,11 +1872,13 @@ - static const char *const PPC64LibDirs[] = {"/lib64", "/lib"}; - static const char *const PPC64Triples[] = { - "powerpc64-linux-gnu", "powerpc64-unknown-linux-gnu", -- "powerpc64-suse-linux", "ppc64-redhat-linux"}; -+ "powerpc64-suse-linux", "ppc64-redhat-linux", -+ "powerpc64-linux-musl"}; - static const char *const PPC64LELibDirs[] = {"/lib64", "/lib"}; - static const char *const PPC64LETriples[] = { - "powerpc64le-linux-gnu", "powerpc64le-unknown-linux-gnu", -- "powerpc64le-suse-linux", "ppc64le-redhat-linux"}; -+ "powerpc64le-suse-linux", "ppc64le-redhat-linux", -+ "powerpc64le-linux-musl"}; - - static const char *const RISCV32LibDirs[] = {"/lib", "/lib32"}; - static const char *const RISCVTriples[] = {"riscv32-unknown-linux-gnu", diff --git a/srcpkgs/llvm7/files/patches/cfe/cfe-005-ppc64-dynamic-linker-path.patch b/srcpkgs/llvm7/files/patches/cfe/cfe-005-ppc64-dynamic-linker-path.patch deleted file mode 100644 index 272ad1c1d85..00000000000 --- a/srcpkgs/llvm7/files/patches/cfe/cfe-005-ppc64-dynamic-linker-path.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/lib/Driver/ToolChains/Linux.cpp -+++ b/lib/Driver/ToolChains/Linux.cpp -@@ -590,12 +590,12 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const { - Loader = "ld.so.1"; - break; - case llvm::Triple::ppc64: -- LibDir = "lib64"; -+ LibDir = "lib"; - Loader = -- (tools::ppc::hasPPCAbiArg(Args, "elfv2")) ? "ld64.so.2" : "ld64.so.1"; -+ (tools::ppc::hasPPCAbiArg(Args, "elfv1")) ? "ld64.so.1" : "ld64.so.2"; - break; - case llvm::Triple::ppc64le: -- LibDir = "lib64"; -+ LibDir = "lib"; - Loader = - (tools::ppc::hasPPCAbiArg(Args, "elfv1")) ? "ld64.so.1" : "ld64.so.2"; - break; diff --git a/srcpkgs/llvm7/files/patches/cfe/cfe-006-ppc64-musl-elfv2.patch b/srcpkgs/llvm7/files/patches/cfe/cfe-006-ppc64-musl-elfv2.patch deleted file mode 100644 index bf873ed1260..00000000000 --- a/srcpkgs/llvm7/files/patches/cfe/cfe-006-ppc64-musl-elfv2.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/lib/Basic/Targets/PPC.h -+++ b/lib/Basic/Targets/PPC.h -@@ -364,11 +364,10 @@ public: - - if ((Triple.getArch() == llvm::Triple::ppc64le)) { - resetDataLayout("e-m:e-i64:64-n32:64"); -- ABI = "elfv2"; - } else { - resetDataLayout("E-m:e-i64:64-n32:64"); -- ABI = "elfv1"; - } -+ ABI = "elfv2"; - - switch (getTriple().getOS()) { - case llvm::Triple::FreeBSD: ---- a/lib/Driver/ToolChains/Clang.cpp -+++ b/lib/Driver/ToolChains/Clang.cpp -@@ -1745,7 +1745,7 @@ void Clang::AddPPCTargetArgs(const ArgList &Args, - break; - } - -- ABIName = "elfv1"; -+ ABIName = "elfv2"; - break; - } - case llvm::Triple::ppc64le: diff --git a/srcpkgs/llvm7/files/patches/lldb/zzz-aarch64.patch b/srcpkgs/llvm7/files/patches/lldb/zzz-aarch64.patch deleted file mode 100644 index 5bacbf47296..00000000000 --- a/srcpkgs/llvm7/files/patches/lldb/zzz-aarch64.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- lldb/source/Plugins/Process/Linux/Procfs.h.orig -+++ lldb/source/Plugins/Process/Linux/Procfs.h -@@ -11,21 +11,6 @@ - // sys/procfs.h on Android/Linux for all supported architectures. - - #include -+#include - --#ifdef __ANDROID__ --#if defined(__arm64__) || defined(__aarch64__) --typedef unsigned long elf_greg_t; --typedef elf_greg_t -- elf_gregset_t[(sizeof(struct user_pt_regs) / sizeof(elf_greg_t))]; --typedef struct user_fpsimd_state elf_fpregset_t; --#ifndef NT_FPREGSET --#define NT_FPREGSET NT_PRFPREG --#endif // NT_FPREGSET --#elif defined(__mips__) --#ifndef NT_FPREGSET --#define NT_FPREGSET NT_PRFPREG --#endif // NT_FPREGSET --#endif --#else // __ANDROID__ - #include --#endif // __ANDROID__ diff --git a/srcpkgs/llvm7/files/patches/llvm/llvm-001-musl.patch b/srcpkgs/llvm7/files/patches/llvm/llvm-001-musl.patch deleted file mode 100644 index 05afc89be30..00000000000 --- a/srcpkgs/llvm7/files/patches/llvm/llvm-001-musl.patch +++ /dev/null @@ -1,58 +0,0 @@ -From faca3fbd15d0c3108493c3c54cd93138e049ac43 Mon Sep 17 00:00:00 2001 -From: Andrea Brancaleoni -Date: Tue, 8 Sep 2015 22:03:02 +0200 -Subject: [PATCH 3/3] musl - ---- - include/llvm/Analysis/TargetLibraryInfo.h | 9 +++++++++ - lib/Support/DynamicLibrary.cpp | 2 +- - lib/Support/Unix/Signals.inc | 6 +++--- - utils/unittest/googletest/src/gtest.cc | 1 + - 5 files changed, 17 insertions(+), 6 deletions(-) - -diff --git a/include/llvm/Analysis/TargetLibraryInfo.h b/include/llvm/Analysis/TargetLibraryInfo.h -index e0a1ee3..465b65a 100644 ---- a/include/llvm/Analysis/TargetLibraryInfo.h -+++ b/include/llvm/Analysis/TargetLibraryInfo.h -@@ -18,6 +18,15 @@ - #include "llvm/IR/Module.h" - #include "llvm/Pass.h" - -+#undef fopen64 -+#undef fseeko64 -+#undef fstat64 -+#undef fstatvfs64 -+#undef ftello64 -+#undef lstat64 -+#undef stat64 -+#undef tmpfile64 -+ - namespace llvm { - /// VecDesc - Describes a possible vectorization of a function. - /// Function 'VectorFnName' is equivalent to 'ScalarFnName' vectorized -diff --git a/utils/unittest/googletest/src/gtest.cc b/utils/unittest/googletest/src/gtest.cc -index 5780764..1d548c1 100644 ---- a/utils/unittest/googletest/src/gtest.cc -+++ b/utils/unittest/googletest/src/gtest.cc -@@ -120,6 +120,7 @@ - - #if GTEST_CAN_STREAM_RESULTS_ - # include // NOLINT -+# include // NOLINT - # include // NOLINT - #endif - --- -2.5.1 - ---- llvm-5.0.0.src/lib/Support/Unix/DynamicLibrary.inc.orig -+++ llvm-5.0.0.src/lib/Support/Unix/DynamicLibrary.inc -@@ -103,7 +103,7 @@ - - // This macro returns the address of a well-known, explicit symbol - #define EXPLICIT_SYMBOL(SYM) \ -- if (!strcmp(SymbolName, #SYM)) return &SYM -+ if (!strcmp(SymbolName, #SYM)) return (void *)&SYM - - // Under glibc we have a weird situation. The stderr/out/in symbols are both - // macros and global variables because of standards requirements. So, we diff --git a/srcpkgs/llvm7/files/patches/llvm/llvm-002-musl-ppc64-elfv2.patch b/srcpkgs/llvm7/files/patches/llvm/llvm-002-musl-ppc64-elfv2.patch deleted file mode 100644 index 6433147d5d4..00000000000 --- a/srcpkgs/llvm7/files/patches/llvm/llvm-002-musl-ppc64-elfv2.patch +++ /dev/null @@ -1,27 +0,0 @@ -This patches LLVM to use ELFv2 on ppc64 uncoditionally unless overridden. We -need this because unlike most distros we use ELFv2 for both glibc and musl -on big endian ppc64. - ---- a/lib/Target/PowerPC/PPCTargetMachine.cpp -+++ b/lib/Target/PowerPC/PPCTargetMachine.cpp -@@ -197,9 +197,9 @@ static PPCTargetMachine::PPCABI computeTargetABI(const Triple &TT, - - switch (TT.getArch()) { - case Triple::ppc64le: -- return PPCTargetMachine::PPC_ABI_ELFv2; - case Triple::ppc64: -- return PPCTargetMachine::PPC_ABI_ELFv1; -+ /* we use elfv2 by default for both endians and both libcs */ -+ return PPCTargetMachine::PPC_ABI_ELFv2; - default: - return PPCTargetMachine::PPC_ABI_UNKNOWN; - } ---- a/test/CodeGen/PowerPC/ppc64-elf-abi.ll -+++ b/test/CodeGen/PowerPC/ppc64-elf-abi.ll -@@ -1,4 +1,5 @@ --; RUN: llc -verify-machineinstrs -mtriple=powerpc64-unknown-linux-gnu < %s | FileCheck %s -check-prefix=CHECK-ELFv1 -+; RUN: llc -verify-machineinstrs -mtriple=powerpc64-unknown-linux-gnu < %s | FileCheck %s -check-prefix=CHECK-ELFv2 -+; RUN: llc -verify-machineinstrs -mtriple=powerpc64-unknown-linux-musl < %s | FileCheck %s -check-prefix=CHECK-ELFv2 - ; RUN: llc -verify-machineinstrs -mtriple=powerpc64-unknown-linux-gnu -target-abi elfv1 < %s | FileCheck %s -check-prefix=CHECK-ELFv1 - ; RUN: llc -verify-machineinstrs -mtriple=powerpc64-unknown-linux-gnu -target-abi elfv2 < %s | FileCheck %s -check-prefix=CHECK-ELFv2 - ; RUN: llc -verify-machineinstrs -mtriple=powerpc64le-unknown-linux-gnu < %s | FileCheck %s -check-prefix=CHECK-ELFv2 diff --git a/srcpkgs/llvm7/files/patches/llvm/llvm-003-llvm-config-cflags.patch b/srcpkgs/llvm7/files/patches/llvm/llvm-003-llvm-config-cflags.patch deleted file mode 100644 index ba28904da91..00000000000 --- a/srcpkgs/llvm7/files/patches/llvm/llvm-003-llvm-config-cflags.patch +++ /dev/null @@ -1,88 +0,0 @@ -From dda331284db4cb6a43481aa7735dee26e504ff36 Mon Sep 17 00:00:00 2001 -From: Tom Stellard -Date: Thu, 13 Dec 2018 18:21:23 +0000 -Subject: [PATCH] Don't add unnecessary compiler flags to llvm-config output - -Summary: -llvm-config --cxxflags --cflags, should only output the minimal flags -required to link against the llvm libraries. They currently contain -all flags used to compile llvm including flags like -g, -pedantic, --Wall, etc, which users may not always want. - -This changes the llvm-config output to only include flags that have been -explictly added to the COMPILE_FLAGS property of the llvm-config target -by the llvm build system. - -llvm.org/PR8220 - -Output from llvm-config when running cmake with: -cmake -G Ninja .. -DCMAKE_CXX_FLAGS=-funroll-loops - -Before: - ---cppflags: -I$HEADERS_DIR/llvm/include -I$HEADERS_DIR/llvm/build/include - -D_GNU_SOURCE -D_DEBUG -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS ---cflags: -I$HEADERS_DIR/llvm/include -I$HEADERS_DIR/llvm/build/include - -fPIC -Werror=date-time -Wall -Wextra -Wno-unused-parameter -Wwrite-strings \ - -Wno-missing-field-initializers -pedantic -Wno-long-long -Wimplicit-fallthrough \ - -Wno-comment -fdiagnostics-color -g -D_GNU_SOURCE -D_DEBUG -D__STDC_CONSTANT_MACROS \ - -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS ---cxxflags: -I$HEADERS_DIR/llvm/include -I$HEADERS_DIR/llvm/build/include\ - -funroll-loops -fPIC -fvisibility-inlines-hidden -Werror=date-time -std=c++11 -Wall \ - -Wextra -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wno-missing-field-initializers \ - -pedantic -Wno-long-long -Wimplicit-fallthrough -Wno-maybe-uninitialized \ - -Wno-class-memaccess -Wno-noexcept-type -Wdelete-non-virtual-dtor -Wno-comment \ - -fdiagnostics-color -g -fno-exceptions -fno-rtti -D_GNU_SOURCE -D_DEBUG \ - -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS" - -After: - ---cppflags: -I$HEADERS_DIR/llvm/include -I$HEADERS_DIR/llvm/build/include \ - -D_GNU_SOURCE -D_DEBUG -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS ---cflags: -I$HEADERS_DIR/llvm/include -I$HEADERS_DIR/llvm/build/include \ - -D_GNU_SOURCE -D_DEBUG -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS ---cxxflags: -I$HEADERS_DIR/llvm/include -I$HEADERS_DIR/llvm/build/include \ - -std=c++11 -fno-exceptions -fno-rtti \ - -D_GNU_SOURCE -D_DEBUG -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS - -Reviewers: sylvestre.ledru, infinity0, mgorny - -Reviewed By: sylvestre.ledru, mgorny - -Subscribers: mgorny, dmgreen, llvm-commits - -Differential Revision: https://reviews.llvm.org/D55391 - -llvm-svn: 349068 ---- - llvm/tools/llvm-config/CMakeLists.txt | 14 +++++++++++--- - 1 file changed, 11 insertions(+), 3 deletions(-) - -diff --git a/tools/llvm-config/CMakeLists.txt b/tools/llvm-config/CMakeLists.txt -index a0bd36c3731..a7db17386fb 100644 ---- a/tools/llvm-config/CMakeLists.txt -+++ b/tools/llvm-config/CMakeLists.txt -@@ -29,12 +29,20 @@ string(REPLACE ";" " " SYSTEM_LIBS "${SYSTEM_LIBS}") - # Fetch target specific compile options, e.g. RTTI option - get_property(COMPILE_FLAGS TARGET llvm-config PROPERTY COMPILE_FLAGS) - -+# The language standard potentially affects the ABI/API of LLVM, so we want -+# to make sure it is reported by llvm-config. -+# NOTE: We don't want to start extracting any random C/CXX flags that the -+# user may add that could affect the ABI. We only want to extract flags -+# that have been added by the LLVM build system. -+string(REGEX MATCH "-std=[^ ]\+" LLVM_CXX_STD_FLAG ${CMAKE_CXX_FLAGS}) -+string(REGEX MATCH "-std=[^ ]\+" LLVM_C_STD_FLAG ${CMAKE_C_FLAGS}) -+ - # Use configure_file to create BuildVariables.inc. - set(LLVM_SRC_ROOT ${LLVM_MAIN_SRC_DIR}) - set(LLVM_OBJ_ROOT ${LLVM_BINARY_DIR}) --set(LLVM_CPPFLAGS "${CMAKE_CPP_FLAGS} ${CMAKE_CPP_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") --set(LLVM_CFLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") --set(LLVM_CXXFLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${COMPILE_FLAGS} ${LLVM_DEFINITIONS}") -+set(LLVM_CPPFLAGS "${LLVM_DEFINITIONS}") -+set(LLVM_CFLAGS "${LLVM_C_STD_FLAG} ${LLVM_DEFINITIONS}") -+set(LLVM_CXXFLAGS "${LLVM_CXX_STD_FLAG} ${COMPILE_FLAGS} ${LLVM_DEFINITIONS}") - set(LLVM_BUILD_SYSTEM cmake) - set(LLVM_HAS_RTTI ${LLVM_CONFIG_HAS_RTTI}) - set(LLVM_DYLIB_VERSION "${LLVM_VERSION_MAJOR}${LLVM_VERSION_SUFFIX}") diff --git a/srcpkgs/llvm7/template b/srcpkgs/llvm7/template index c40892e7a61..b06f887c3b7 100644 --- a/srcpkgs/llvm7/template +++ b/srcpkgs/llvm7/template @@ -1,105 +1,14 @@ # Template file for 'llvm7' pkgname=llvm7 version=7.0.1 -revision=8 -wrksrc="llvm-${version}.src" -build_style=cmake -configure_args=" - -DCMAKE_BUILD_TYPE=Release - -DLLVM_INSTALL_UTILS=ON - -DLLVM_BUILD_LLVM_DYLIB=ON - -DLLVM_LINK_LLVM_DYLIB=ON - -DLLVM_ENABLE_RTTI=ON - -DLLVM_ENABLE_FFI=ON - -DLLVM_BINUTILS_INCDIR=/usr/include" -short_desc="Low Level Virtual Machine" +revision=9 +archs=noarch +build_style=meta +short_desc="Low Level Virtual Machine (removed package)" maintainer="Enno Boland " license="NCSA" homepage="https://www.llvm.org" -distfiles="https://www.llvm.org/releases/${version}/llvm-${version}.src.tar.xz" -checksum=a38dfc4db47102ec79dcc2aa61e93722c5f6f06f0a961073bd84b78fb949419b -disable_parallel_builds=yes -lib32disabled=yes - -# XXX Investigate ocaml bindings. -hostmakedepends="groff perl python zlib-devel libffi-devel swig" -makedepends="python-devel zlib-devel libffi-devel libedit-devel libxml2-devel binutils-devel libatomic-devel" -depends="libllvm7" -# all of these provide llvm-config -conflicts="llvm>=0 llvm3.9>=0 llvm6.0>=0 llvm7>=0" - -subpackages="libllvm7" -case "$XBPS_TARGET_MACHINE" in - armv5*) broken="Tries to assemble VFP instructions with armv5tel arch";; -esac - -post_extract() { - # patches - cd ${XBPS_BUILDDIR}/llvm-${version}.src - for i in ${FILESDIR}/patches/llvm/llvm-*.patch; do - msg_normal "Applying $i to llvm\n" - patch -sNp1 -i ${i} - done -} - -pre_configure() { - # Vastly reduce size of debugging symbols: - CFLAGS=${CFLAGS/ -g/ -g1} - CXXFLAGS=${CXXFLAGS/ -g/ -g1} - - if [ "$CROSS_BUILD" ]; then - msg_normal "Building host tblgen\n" - mkdir -p build/HOST - cd build/HOST - CC="$BUILD_CC" CXX="$BUILD_CXX" CFLAGS="$BUILD_CFLAGS" \ - CXXFLAGS="$BUILD_CXXFLAGS" LDFLAGS="$BUILD_LDFLAGS" \ - cmake ../.. -DCMAKE_BUILD_TYPE=Release - make ${makejobs} -C utils/TableGen - configure_args+=" -DLLVM_TABLEGEN=${wrksrc}/build/HOST/bin/llvm-tblgen" - cd ../.. - fi - - case "$XBPS_TARGET_MACHINE" in - i686*) _arch="X86";; - x86_64*) _arch="X86";; - armv5*) _arch="Armv5te";; - armv6*) _arch="Armv6";; - armv7*) _arch="Armv7";; - aarch64*) _arch="AArch64";; - mips*) _arch="Mips";; - ppc*) _arch="PowerPC";; - esac - configure_args+=" -DLLVM_TARGET_ARCH=${_arch}" - configure_args+=" -DLLVM_DEFAULT_TARGET_TRIPLE=${XBPS_CROSS_TRIPLET:-$XBPS_TRIPLET}" -} - -do_install() { - vlicense LICENSE.TXT - - cd build - cmake -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr -P cmake_install.cmake - - # Fix permissions of static libs - chmod -x ${DESTDIR}/usr/lib/*.a - - # Required for multilib. - if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then - for _header in llvm-config; do - mv ${DESTDIR}/usr/include/llvm/Config/${_header}{,-64}.h - vinstall ${FILESDIR}/llvm-Config-${_header}.h 644 \ - usr/include/llvm/Config ${_header}.h - done - fi - - # Remove llvm-config-host in cross builds. - if [ "$CROSS_BUILD" ]; then - rm -f ${DESTDIR}/usr/bin/llvm-config-host - fi -} libllvm7_package() { short_desc+=" - runtime library" - pkg_install() { - vmove "usr/lib/libLLVM-*.so*" - } } diff --git a/srcpkgs/llvm7/update b/srcpkgs/llvm7/update deleted file mode 100644 index 071d14ce89e..00000000000 --- a/srcpkgs/llvm7/update +++ /dev/null @@ -1,3 +0,0 @@ -site=https://releases.llvm.org/ -pattern="'\K[\d\.]*(?=')" -ignore="8.*" From 22335fb2af3c3ac5f9f4d155bfeba65c4aee7e38 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Fri, 10 Apr 2020 11:39:15 -0400 Subject: [PATCH 3/4] gtkd: update to 3.9.0. --- srcpkgs/gtkd/template | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/srcpkgs/gtkd/template b/srcpkgs/gtkd/template index cc45b651f9e..cccc522bdaa 100644 --- a/srcpkgs/gtkd/template +++ b/srcpkgs/gtkd/template @@ -1,6 +1,6 @@ # Template file for 'gtkd' pkgname=gtkd -version=3.8.5 +version=3.9.0 revision=1 wrksrc="GtkD-${version}" build_style=gnu-makefile @@ -12,7 +12,7 @@ make_install_target="install-shared-gstreamer install-headers-gstreamer install-shared-gtkdgl install-headers-gtkdgl install-shared install-headers install-shared-peas install-headers-peas install-shared-vte install-headers-vte" -hostmakedepends="ldc pkg-config tar" +hostmakedepends="ldc pkg-config tar which" makedepends="gstreamer1-devel gtksourceview-devel libpeas-devel librsvg-devel vte3-devel" short_desc="D bindings for GTK+3 and related libraries" @@ -21,9 +21,14 @@ license="LGPL-3.0-or-later" homepage="https://gtkd.org" #changelog="https://gtkd.org/changelog.html" distfiles="https://github.com/gtkd-developers/GtkD/archive/v${version}.tar.gz" -checksum=10b388d4ce00854a29ea9b74ebeb632c03fe9c39daa5dafe8554005ca33c55c8 +checksum=02a5d84b120e66011d6595f92679780f5782e8fe733c5517de1629c397a0d7d9 nocross="Uses host flags for cross compilations" +do_patch() { + # Makefile wants to install pkgconfig in /lib by default + vsed -e 's@$(DESTDIR)$(libdir)@$(DESTDIR)$(prefix)/$(libdir)@g' -i GNUmakefile +} + libpeasd_package() { short_desc+=" - peasd library" pkg_install() { @@ -38,7 +43,7 @@ libpeasd-devel_package() { vmove usr/include/d/gtkd-3/peas vmove usr/include/d/gtkd-3/peasc vmove usr/lib/libpeasd-3.so - vmove usr/share/pkgconfig/peasd-3.pc + vmove usr/lib/pkgconfig/peasd-3.pc } } @@ -57,7 +62,7 @@ libgtkdgl-devel_package() { vmove usr/include/d/gtkd-3/glgdk vmove usr/include/d/gtkd-3/gtkglc vmove usr/lib/libgtkdgl-3.so - vmove usr/share/pkgconfig/gtkdgl-3.pc + vmove usr/lib/pkgconfig/gtkdgl-3.pc } } @@ -75,7 +80,7 @@ libvted-devel_package() { vmove usr/include/d/gtkd-3/vte vmove usr/include/d/gtkd-3/vtec vmove usr/lib/libvted-3.so - vmove usr/share/pkgconfig/vted-3.pc + vmove usr/lib/pkgconfig/vted-3.pc } } @@ -95,7 +100,7 @@ libgstreamerd-devel_package() { vmove usr/include/d/gtkd-3/gstreamer vmove usr/include/d/gtkd-3/gstreamerc vmove usr/lib/libgstreamerd-3.so - vmove usr/share/pkgconfig/gstreamerd-3.pc + vmove usr/lib/pkgconfig/gstreamerd-3.pc } } @@ -113,7 +118,7 @@ libgtkdsv-devel_package() { vmove usr/include/d/gtkd-3/gsv vmove usr/include/d/gtkd-3/gsvc vmove usr/lib/libgtkdsv-3.so - vmove usr/share/pkgconfig/gtkdsv-3.pc + vmove usr/lib/pkgconfig/gtkdsv-3.pc } } @@ -135,6 +140,6 @@ gtkd-devel_package() { vmove usr/include/d/gtkd-3/pango vmove usr/include/d/gtkd-3/rsvg vmove usr/lib/libgtkd-3.so - vmove usr/share/pkgconfig/gtkd-3.pc + vmove usr/lib/pkgconfig/gtkd-3.pc } } From d07bb40e23a98df618bdf74f64d945cc7bc85338 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Fri, 10 Apr 2020 11:44:57 -0400 Subject: [PATCH 4/4] tilix: revbump and fix for ldc-1.20.1_1 --- srcpkgs/tilix/template | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/srcpkgs/tilix/template b/srcpkgs/tilix/template index ee33c2bd77a..5ff4d3d8e4b 100644 --- a/srcpkgs/tilix/template +++ b/srcpkgs/tilix/template @@ -1,10 +1,10 @@ # Template file for 'tilix' pkgname=tilix version=1.9.3 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="automake gettext-devel gdk-pixbuf glib-devel ldc po4a pkg-config - librsvg" + librsvg tar" makedepends="dconf-devel gtkd-devel libglib-devel libvted-devel libX11-devel" depends="gsettings-desktop-schemas vte3" short_desc="Tiling terminal emulator for Linux" @@ -22,5 +22,7 @@ pre_configure() { ;; esac + vsed -i source/gx/tilix/terminal/monitor.d -e 's/processes.values()/processes/g' + autoreconf -fi }