From 0e70d3892e0d8bcdd67dfb5564a93bedf1704f1f Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Sun, 15 Sep 2024 19:15:22 +0300 Subject: [PATCH] F U --- .github/release-nest-v3 | 2 +- debian/control | 16 ++++++++-------- debian/rules | 2 +- pika-build-config/amd64-v3.sh | 10 +++++----- pika-build-config/amd64-v3.sh.bak0 | 10 ++++++++++ pika-build-config/amd64-v3.sh.bak1 | 10 ---------- 6 files changed, 25 insertions(+), 25 deletions(-) mode change 100644 => 100755 pika-build-config/amd64-v3.sh create mode 100644 pika-build-config/amd64-v3.sh.bak0 delete mode 100755 pika-build-config/amd64-v3.sh.bak1 diff --git a/.github/release-nest-v3 b/.github/release-nest-v3 index c793025..301160a 100644 --- a/.github/release-nest-v3 +++ b/.github/release-nest-v3 @@ -1 +1 @@ -7 \ No newline at end of file +8 \ No newline at end of file diff --git a/debian/control b/debian/control index 9d3517d..468f5b4 100644 --- a/debian/control +++ b/debian/control @@ -51,11 +51,11 @@ Build-Depends: libelf-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], libwayland-dev (>= 1.15.0) [linux-any], libwayland-egl-backend-dev (>= 1.15.0) [linux-any], - llvm-17-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], - libclang-17-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], - libclang-cpp17-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], - libclc-17-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], - libclc-17 [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], + llvm-18-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], + libclang-18-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], + libclang-cpp18-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], + libclc-18-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], + libclc-18 [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], wayland-protocols (>= 1.34), zlib1g-dev, libglvnd-core-dev (>= 1.3.2), @@ -64,8 +64,8 @@ Build-Depends: rustfmt [amd64 arm64 armel armhf loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32], bindgen (>= 0.66.1~) [amd64 arm64 armel armhf loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32], cbindgen [amd64 arm64 armel armhf loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32], - llvm-spirv-17 [amd64 arm64 armel armhf loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32], - libllvmspirvlib-17-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], + llvm-spirv-18 [amd64 arm64 armel armhf loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32], + libllvmspirvlib-18-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], librust-paste-dev [amd64 arm64 armhf ppc64 riscv64 x32], librust-syn-dev [amd64 arm64 armhf ppc64 riscv64 x32], Rules-Requires-Root: no @@ -421,7 +421,7 @@ Section: libs Architecture: amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32 Pre-Depends: ${misc:Pre-Depends} Depends: - libclc-17, + libclc-18, ocl-icd-libopencl1 | libopencl1, ${shlibs:Depends}, ${misc:Depends}, diff --git a/debian/rules b/debian/rules index 7812fff..1c8375b 100755 --- a/debian/rules +++ b/debian/rules @@ -13,7 +13,7 @@ DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) # for finding the correct llvm-config when meson doesn't know about it yet -LLVM_VERSION = 17 +LLVM_VERSION = 18 export PATH:=/usr/lib/llvm-$(LLVM_VERSION)/bin/:$(PATH) export DEB_BUILD_MAINT_OPTIONS=optimize=-lto diff --git a/pika-build-config/amd64-v3.sh b/pika-build-config/amd64-v3.sh old mode 100644 new mode 100755 index aa46f1f..10285b4 --- a/pika-build-config/amd64-v3.sh +++ b/pika-build-config/amd64-v3.sh @@ -1,10 +1,10 @@ #! /bin/bash export PIKA_BUILD_ARCH="amd64-v3" export DEBIAN_FRONTEND="noninteractive" -export DEB_BUILD_MAINT_OPTIONS="-march=x86-64-v3 -O3" -export DEB_CFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3" -export DEB_CPPFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3" -export DEB_CXXFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3" -export DEB_LDFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3" +export DEB_BUILD_MAINT_OPTIONS="optimize=+lto -march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32" +export DEB_CFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32" +export DEB_CPPFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32" +export DEB_CXXFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32" +export DEB_LDFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32" export DEB_BUILD_OPTIONS="nocheck notest terse" export DPKG_GENSYMBOLS_CHECK_LEVEL=0 diff --git a/pika-build-config/amd64-v3.sh.bak0 b/pika-build-config/amd64-v3.sh.bak0 new file mode 100644 index 0000000..aa46f1f --- /dev/null +++ b/pika-build-config/amd64-v3.sh.bak0 @@ -0,0 +1,10 @@ +#! /bin/bash +export PIKA_BUILD_ARCH="amd64-v3" +export DEBIAN_FRONTEND="noninteractive" +export DEB_BUILD_MAINT_OPTIONS="-march=x86-64-v3 -O3" +export DEB_CFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3" +export DEB_CPPFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3" +export DEB_CXXFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3" +export DEB_LDFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3" +export DEB_BUILD_OPTIONS="nocheck notest terse" +export DPKG_GENSYMBOLS_CHECK_LEVEL=0 diff --git a/pika-build-config/amd64-v3.sh.bak1 b/pika-build-config/amd64-v3.sh.bak1 deleted file mode 100755 index 10285b4..0000000 --- a/pika-build-config/amd64-v3.sh.bak1 +++ /dev/null @@ -1,10 +0,0 @@ -#! /bin/bash -export PIKA_BUILD_ARCH="amd64-v3" -export DEBIAN_FRONTEND="noninteractive" -export DEB_BUILD_MAINT_OPTIONS="optimize=+lto -march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32" -export DEB_CFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32" -export DEB_CPPFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32" -export DEB_CXXFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32" -export DEB_LDFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32" -export DEB_BUILD_OPTIONS="nocheck notest terse" -export DPKG_GENSYMBOLS_CHECK_LEVEL=0