proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-07-27 16:41:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* Don't require g++-multilib on s390x for newer Ubuntu releases.

Browse Source
This commit is contained in:
Matthias Klose 2024-08-27 12:13:37 +02:00
parent d6a67df217
commit 1fc85c3142
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -2,6 +2,7 @@ llvm-toolchain-19 (1:19.1.0~++rc3-1~exp2) UNRELEASED; urgency=medium
* Add a .gitignore file with all toplevel upstream files and directories. * Add a .gitignore file with all toplevel upstream files and directories.
* Add some memory tracking, getting some information on memory hogs. * Add some memory tracking, getting some information on memory hogs.
* Don't require g++-multilib on s390x for newer Ubuntu releases.
-- Matthias Klose <doko@ubuntu.com> Tue, 27 Aug 2024 11:47:25 +0200 -- Matthias Klose <doko@ubuntu.com> Tue, 27 Aug 2024 11:47:25 +0200

2
debian/control.in vendored
View File

@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
libipt-dev [amd64 i386], libipt-dev [amd64 i386],
lcov, procps, help2man, lcov, procps, help2man,
zlib1g-dev, libzstd-dev, zlib1g-dev, libzstd-dev,
g++-multilib [amd64 i386 kfreebsd-amd64 mips64 mips64el mipsel powerpc ppc64 s390 s390x sparc sparc64 x32], g++-multilib [@MULTILIB_ARCHS@],
libjs-mathjax, python3-myst-parser | python3-recommonmark, python3-pexpect, libjs-mathjax, python3-myst-parser | python3-recommonmark, python3-pexpect,
doxygen,@USAGE_BUILD_DEP@ doxygen,@USAGE_BUILD_DEP@
ocaml-base [amd64 arm64 armhf ppc64el riscv64 s390x] | ocaml-nox [amd64 arm64 armhf ppc64el riscv64 s390x], ocaml-base [amd64 arm64 armhf ppc64el riscv64 s390x] | ocaml-nox [amd64 arm64 armhf ppc64el riscv64 s390x],

17
debian/rules vendored
View File

@ -53,6 +53,9 @@ endif
VENDOR=$(shell lsb_release -is) VENDOR=$(shell lsb_release -is)
DISTRO=$(shell lsb_release -sc) DISTRO=$(shell lsb_release -sc)
DERIVATIVE := $(shell if dpkg-vendor --derives-from Ubuntu; then echo Ubuntu; \
elif dpkg-vendor --derives-from Debian; then echo Debian; \
else echo Unknown; fi)
SONAME_EXT := 1 SONAME_EXT := 1
SONAME_OPENMP := 5 SONAME_OPENMP := 5
@ -89,6 +92,13 @@ DH_VERSION := $(shell dpkg -s debhelper | grep '^Version' | awk '{print $$2}')
include /usr/share/dpkg/architecture.mk include /usr/share/dpkg/architecture.mk
MULTILIB_ARCHS := amd64 i386 kfreebsd-amd64 mips64 mips64el mipsel powerpc ppc64 s390 s390x sparc sparc64 x32
ifeq ($(DERIVATIVE),Ubuntu)
ifeq (,$(filter $(DISTRO), bionic focal jammy noble))
MULTILIB_ARCHS := $(filter-out s390 s390x, $(MULTILIB_ARCHS))
endif
endif
CONFIGURE_EXTRA = CONFIGURE_EXTRA =
# these are handled on a per stage / build basis # these are handled on a per stage / build basis
@ -166,7 +176,7 @@ endif
Z3_FLAG = -DLLVM_ENABLE_Z3_SOLVER=OFF Z3_FLAG = -DLLVM_ENABLE_Z3_SOLVER=OFF
ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' libz3-dev) gt 4.7.0; echo $$?),0) ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' libz3-dev) gt 4.7.0; echo $$?),0)
# no ocaml support in main for Ubuntu # no ocaml support in main for Ubuntu
ifneq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes) ifeq ($(DERIVATIVE),Debian)
Z3_FLAG = -DLLVM_ENABLE_Z3_SOLVER=ON Z3_FLAG = -DLLVM_ENABLE_Z3_SOLVER=ON
endif endif
endif endif
@ -174,7 +184,7 @@ STAGE_2_CMAKE_EXTRA += $(Z3_FLAG)
# Change the default CPU for s390x # Change the default CPU for s390x
ZARCH=z196 ZARCH=z196
ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes) ifeq ($(DERIVATIVE),Ubuntu)
ZARCH=z13 ZARCH=z13
endif endif
STAGE_2_CMAKE_EXTRA += -DCLANG_SYSTEMZ_DEFAULT_ARCH=$(ZARCH) STAGE_2_CMAKE_EXTRA += -DCLANG_SYSTEMZ_DEFAULT_ARCH=$(ZARCH)
@ -404,7 +414,7 @@ RUN_TEST=yes
ifneq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) ifneq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
RUN_TEST=no RUN_TEST=no
endif endif
ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes) ifeq ($(DERIVATIVE),Ubuntu)
ifeq (riscv64,$(DEB_HOST_ARCH)) ifeq (riscv64,$(DEB_HOST_ARCH))
RUN_TEST=no RUN_TEST=no
endif endif
@ -653,6 +663,7 @@ stamps/preconfigure:
echo "$$f => $$f2"; \ echo "$$f => $$f2"; \
sed -e 's|@DEB_HOST_MULTIARCH@|$(DEB_HOST_MULTIARCH)|g' \ sed -e 's|@DEB_HOST_MULTIARCH@|$(DEB_HOST_MULTIARCH)|g' \
-e "s|@USAGE_BUILD_DEP@|$(USAGE_BUILD_DEP)|g" \ -e "s|@USAGE_BUILD_DEP@|$(USAGE_BUILD_DEP)|g" \
-e "s|@MULTILIB_ARCHS@|$(MULTILIB_ARCHS)|g" \
-e "s|@BRANCH_NAME@|$(BRANCH_NAME)|g" \ -e "s|@BRANCH_NAME@|$(BRANCH_NAME)|g" \
-e "s|@OCAML_STDLIB_DIR@|$(OCAML_STDLIB_DIR)|g" \ -e "s|@OCAML_STDLIB_DIR@|$(OCAML_STDLIB_DIR)|g" \
-e "s|@LLVM_EPOCH@|$(LLVM_EPOCH)|g" \ -e "s|@LLVM_EPOCH@|$(LLVM_EPOCH)|g" \