From 74834881c5f12d0d17fc9b47aa1c75495c0b7a8e Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 11 Feb 2024 14:29:38 +0100 Subject: [PATCH 1/4] Add abi=+time64,+lfs only on 64bits system --- debian/changelog | 6 ++++++ debian/rules | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 887297ec..3109171d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-18 (1:18.1.0~rc2-3) unstable; urgency=medium + + * Add abi=+time64,+lfs only on 64bits system + + -- Sylvestre Ledru Sun, 11 Feb 2024 14:29:31 +0100 + llvm-toolchain-18 (1:18.1.0~rc2-2) unstable; urgency=medium [ Gianfranco Costamagna ] diff --git a/debian/rules b/debian/rules index 00a2432a..7f060988 100755 --- a/debian/rules +++ b/debian/rules @@ -66,7 +66,12 @@ CONFIGURE_EXTRA = # dpkg-buildflags support # disable fixfilepath in favor of the llvm-project supplied flavor, disable lto # remove +time64,+lfs once the time64_t transition starts -export DEB_BUILD_MAINT_OPTIONS = reproducible=-fixfilepath,-fixdebugpath optimize=-lto abi=+time64,+lfs +export DEB_BUILD_MAINT_OPTIONS = reproducible=-fixfilepath,-fixdebugpath optimize=-lto + +ifeq ($(DEB_BUILD_ARCH_BITS),64) + export DEB_BUILD_MAINT_OPTIONS += abi=+time64,+lfs +endif + # these are handled on a per stage / build basis ifeq ($(VENDOR)-$(DEB_HOST_ARCH),Ubuntu-ppc64el) From 2a5c838b138e6bc683dec585e3daea61e66e4da1 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 11 Feb 2024 14:44:43 +0100 Subject: [PATCH 2/4] show DEB_BUILD_MAINT_OPTIONS too --- debian/rules | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/rules b/debian/rules index 7f060988..9948e467 100755 --- a/debian/rules +++ b/debian/rules @@ -587,6 +587,7 @@ stamps/preconfigure: @echo "DEB_HOST_ARCH_BITS=$(DEB_HOST_ARCH_BITS)" @echo "DEB_HOST_ARCH=$(DEB_HOST_ARCH)" @echo "DEB_HOST_ARCH_OS=$(DEB_HOST_ARCH_OS)" + @echo "DEB_BUILD_MAINT_OPTIONS=$(DEB_BUILD_MAINT_OPTIONS)" @echo "DISTRO=$(DISTRO)" @echo "GCC_VERSION=$(GCC_VERSION)" @echo "PROJECTS=$(PROJECTS_LIST)" From 34affc37681f612ef8e33b3254cb0bf667cea724 Mon Sep 17 00:00:00 2001 From: John Paul Adrian Glaubitz Date: Fri, 16 Feb 2024 09:54:15 +0100 Subject: [PATCH 3/4] Install *clang_rt* on sparc and sparc64 --- debian/changelog | 7 +++++++ debian/libclang-rt-X.Y-dev.install.in | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 3109171d..04173f79 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +llvm-toolchain-18 (1:18.1.0~rc2-4) UNRELEASED; urgency=medium + + [ John Paul Adrian Glaubitz ] + * Install *clang_rt* on sparc and sparc64 + + -- John Paul Adrian Glaubitz Fri, 16 Feb 2024 09:53:15 +0100 + llvm-toolchain-18 (1:18.1.0~rc2-3) unstable; urgency=medium * Add abi=+time64,+lfs only on 64bits system diff --git a/debian/libclang-rt-X.Y-dev.install.in b/debian/libclang-rt-X.Y-dev.install.in index 8b973ead..cd2a8425 100644 --- a/debian/libclang-rt-X.Y-dev.install.in +++ b/debian/libclang-rt-X.Y-dev.install.in @@ -2,7 +2,7 @@ usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/share/*.txt usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/sanitizer/ -[!sparc !sparc64] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/lib/*/*clang_rt* +usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/lib/*/*clang_rt* usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/README.txt usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/fuzzer/ usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/orc/c_api.h From 88f4607443718947014f1553df6d367ea9b25ea3 Mon Sep 17 00:00:00 2001 From: John Paul Adrian Glaubitz Date: Fri, 16 Feb 2024 09:55:07 +0100 Subject: [PATCH 4/4] Run chrpath for libclang on sparc and sparc64 --- debian/changelog | 1 + debian/rules | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 04173f79..6f1015ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ llvm-toolchain-18 (1:18.1.0~rc2-4) UNRELEASED; urgency=medium [ John Paul Adrian Glaubitz ] * Install *clang_rt* on sparc and sparc64 + * Run chrpath for libclang on sparc and sparc64 -- John Paul Adrian Glaubitz Fri, 16 Feb 2024 09:53:15 +0100 diff --git a/debian/rules b/debian/rules index 9948e467..a5820140 100755 --- a/debian/rules +++ b/debian/rules @@ -1132,7 +1132,7 @@ override_dh_auto_install: # Only run on executable, not script chrpath -d `find $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/ -type f -executable -exec file -i '{}' \; | grep 'x-executable; charset=binary'|cut -d: -f1` -ifeq (,$(filter $(DEB_HOST_ARCH), powerpc powerpcspe sparc sparc64)) +ifeq (,$(filter $(DEB_HOST_ARCH), powerpc powerpcspe)) ifneq (,$(filter $(DEB_HOST_ARCH_OS),linux)) # To fix custom-library-search-path chrpath -d $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION)*/lib/linux/*.so