llvm-toolchain-19: restore armhf rt runtime.
This commit is contained in:
Ark74
parent
857bdc6eea
commit
159d5f03dc
3 changed files with 133 additions and 0 deletions
|
|
@ -0,0 +1,75 @@
|
|||
From 01c886f572c7efff994eb748f52f505edfe31bcb Mon Sep 17 00:00:00 2001
|
||||
From: Matthias Klose <doko@ubuntu.com>
|
||||
Date: Fri, 8 Mar 2024 15:44:50 +0100
|
||||
Subject: [PATCH] Enable compiler-rt runtime again for 32bit time_t64
|
||||
architectures.
|
||||
|
||||
---
|
||||
debian/changelog | 1 +
|
||||
debian/libclang-common-X.Y-dev.install.in | 4 ++--
|
||||
debian/rules | 3 +--
|
||||
3 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
#diff --git a/debian/changelog b/debian/changelog
|
||||
#index e39fbda2e..cd8a61bc8 100644
|
||||
#--- a/debian/changelog
|
||||
#+++ b/debian/changelog
|
||||
#@@ -6,6 +6,7 @@ llvm-toolchain-19 (1:19.1.2-2) UNRELEASED; urgency=medium
|
||||
#
|
||||
# [ Sylvestre Ledru ]
|
||||
# * Use the | hello trick for g++-multilib for s390x / Ubuntu Oracular
|
||||
#+ * Enable compiler-rt runtime again for 32bit time_t64 architectures.
|
||||
#
|
||||
# -- Sylvestre Ledru <sylvestre@debian.org> Mon, 21 Oct 2024 10:20:12 +0200
|
||||
|
||||
#diff --git a/debian/libclang-common-X.Y-dev.install.in b/debian/libclang-common-X.Y-dev.install.in
|
||||
#index 7b9dc1723..e15ef67ae 100644
|
||||
#--- a/debian/libclang-common-X.Y-dev.install.in
|
||||
#+++ b/debian/libclang-common-X.Y-dev.install.in
|
||||
#@@ -2,8 +2,8 @@
|
||||
#
|
||||
# usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/*.h
|
||||
# usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/module.modulemap
|
||||
#-[!armel !armhf !powerpc !x32 !hurd-any] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/xray/
|
||||
#-[!armel !armhf !powerpc !x32 !hurd-any] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/profile/
|
||||
#+[!powerpc !x32 !hurd-any] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/xray/
|
||||
#+[!powerpc !x32 !hurd-any] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/profile/
|
||||
# usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/ppc_wrappers/
|
||||
# usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/openmp_wrappers/
|
||||
# usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/cuda_wrappers/
|
||||
diff --git a/debian/rules b/debian/rules
|
||||
index 5e4aba682..32b372bf4 100755
|
||||
--- a/debian/rules
|
||||
+++ b/debian/rules
|
||||
@@ -31,12 +31,11 @@ ifeq ($(DEB_HOST_ARCH),i386)
|
||||
RUNTIMES = compiler-rt;libcxx;libcxxabi
|
||||
export DEB_BUILD_MAINT_OPTIONS = reproducible=-fixfilepath,-fixdebugpath optimize=-lto
|
||||
else
|
||||
+ RUNTIMES = compiler-rt;libcxx;libcxxabi
|
||||
ifeq ($(DEB_HOST_ARCH_BITS),32)
|
||||
- RUNTIMES = libcxx;libcxxabi
|
||||
export DEB_BUILD_MAINT_OPTIONS = reproducible=-fixfilepath,-fixdebugpath optimize=-lto abi=+time64,+lfs
|
||||
skip_packages = -Nlibclang-rt-$(LLVM_VERSION)-dev
|
||||
else
|
||||
- RUNTIMES = compiler-rt;libcxx;libcxxabi
|
||||
ifeq ($(DEB_HOST_ARCH),mips64el)
|
||||
export DEB_BUILD_MAINT_OPTIONS = reproducible=-fixfilepath,-fixdebugpath optimize=-lto hardening=-stackprotector,-stackprotectorstrong
|
||||
else
|
||||
--
|
||||
GitLab
|
||||
|
||||
diff --git a/debian/libclang-common-X.Y-dev.install.in b/debian/libclang-common-X.Y-dev.install.in
|
||||
index 571a6619..a6451d70 100644
|
||||
--- a/debian/libclang-common-X.Y-dev.install.in
|
||||
+++ b/debian/libclang-common-X.Y-dev.install.in
|
||||
@@ -2,8 +2,8 @@
|
||||
|
||||
usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/*.h
|
||||
usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/module.modulemap
|
||||
-[!armel !armhf !x32] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/xray/
|
||||
-[!armel !armhf !x32] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/profile/
|
||||
+[!x32] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/xray/
|
||||
+[!x32] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/profile/
|
||||
usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/ppc_wrappers/
|
||||
usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/openmp_wrappers/
|
||||
usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/cuda_wrappers/
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
From 09aa2cbf9ba5762c815c8f893349754e2ee01ac9 Mon Sep 17 00:00:00 2001
|
||||
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
|
||||
Date: Sun, 27 Oct 2024 10:45:40 +0100
|
||||
Subject: [PATCH] Really re-enable compiler-rt for 32bit time_t64
|
||||
architectures.
|
||||
|
||||
---
|
||||
debian/rules | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/debian/rules b/debian/rules
|
||||
index 1e4e4726c..cc4a1696a 100755
|
||||
--- a/debian/rules
|
||||
+++ b/debian/rules
|
||||
@@ -34,7 +34,6 @@ else
|
||||
RUNTIMES = compiler-rt;libcxx;libcxxabi
|
||||
ifeq ($(DEB_HOST_ARCH_BITS),32)
|
||||
export DEB_BUILD_MAINT_OPTIONS = reproducible=-fixfilepath,-fixdebugpath optimize=-lto abi=+time64,+lfs
|
||||
- skip_packages = -Nlibclang-rt-$(LLVM_VERSION)-dev
|
||||
else
|
||||
ifeq ($(DEB_HOST_ARCH),mips64el)
|
||||
export DEB_BUILD_MAINT_OPTIONS = reproducible=-fixfilepath,-fixdebugpath optimize=-lto hardening=-stackprotector,-stackprotectorstrong
|
||||
--
|
||||
GitLab
|
||||
|
||||
33
helpers/make-llvm-toolchain-19
Normal file
33
helpers/make-llvm-toolchain-19
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# Copyright (C) 2025 Luis Guzmán <ark@switnet.org>
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
#
|
||||
|
||||
VERSION=1
|
||||
EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu $UPSTREAM main universe'
|
||||
BACKPORTS=true
|
||||
|
||||
. ./config
|
||||
|
||||
# Set distro as part of matching upstream one.
|
||||
sed -i "s|$UPSTREAM|$UPSTREAM $CODENAME|" debian/rules
|
||||
|
||||
apply_patch_changes
|
||||
|
||||
changelog "Import as dependency of newer abrowser/icedove deb dependencies. | Enable compiler-rt runtime again for 32bit time_t64 architectures."
|
||||
|
||||
package
|
||||
Loading…
Add table
Add a link
Reference in a new issue