proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-06-10 23:42:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* disable lldb and polly on powerpc, currently ftbfs.

Browse Source 
setting the lldb archs in debian/control in just one
  place would be appreciated.
* quoting fixes in debian/rules, when make macros
  are empty 
  Thanks to Doko for the two previous changes (Closes: #806729)
This commit is contained in:
Sylvestre Ledru 2015-11-30 14:34:46 +00:00
parent 1b593d0870
commit b6af4ab8cd
3 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
debian/changelog vendored
View File

@ -1,3 +1,14 @@
llvm-toolchain-snapshot (1:3.8~svn254193-2) UNRELEASED; urgency=medium
* disable lldb and polly on powerpc, currently ftbfs.
setting the lldb archs in debian/control in just one
place would be appreciated.
* quoting fixes in debian/rules, when make macros
are empty
Thanks to Doko for the two previous changes (Closes: #806729)
-- Sylvestre Ledru <sylvestre@debian.org> Mon, 30 Nov 2015 15:34:12 +0100
llvm-toolchain-snapshot (1:3.8~svn254193-1) unstable; urgency=medium llvm-toolchain-snapshot (1:3.8~svn254193-1) unstable; urgency=medium
* New snapshot release * New snapshot release

12
debian/control vendored
View File

@ -380,8 +380,8 @@ Description: Modular compiler and toolchain technologies, examples
# ------------- lldb ------------- # ------------- lldb -------------
Package: lldb-3.8 Package: lldb-3.8
Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 powerpc mips mipsel Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 mips mipsel
# ia64 mips mipsel hurd ppc64el have been removed # ia64 mips mipsel hurd powerpc ppc64el have been removed
Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.8 (= ${binary:Version}), python, llvm-3.8-dev, python-lldb-3.8 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.8 (= ${binary:Version}), python, llvm-3.8-dev, python-lldb-3.8
Conflicts: lldb-3.4, lldb-3.5 Conflicts: lldb-3.4, lldb-3.5
Pre-Depends: ${misc:Pre-Depends} Pre-Depends: ${misc:Pre-Depends}
@ -391,8 +391,8 @@ Description: Next generation, high-performance debugger
Project, such as the Clang expression parser and LLVM disassembler. Project, such as the Clang expression parser and LLVM disassembler.
Package: liblldb-3.8 Package: liblldb-3.8
Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 powerpc mips mipsel Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 mips mipsel
# ia64 mips mipsel hurd ppc64el have been removed # ia64 mips mipsel hurd powerpc ppc64el have been removed
Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.8 (= ${binary:Version}) Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.8 (= ${binary:Version})
Pre-Depends: ${misc:Pre-Depends} Pre-Depends: ${misc:Pre-Depends}
Section: libs Section: libs
@ -435,8 +435,8 @@ Description: Next generation, high-performance debugger, python lib
Package: liblldb-3.8-dev Package: liblldb-3.8-dev
Section: libdevel Section: libdevel
Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 powerpc mips mipsel Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 mips mipsel
# ia64 mips mipsel hurd ppc64el have been removed # ia64 mips mipsel hurd powerpc ppc64el have been removed
Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-3.8 (= ${binary:Version}) Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-3.8 (= ${binary:Version})
Replaces: lldb-3.8-dev (<= 1:3.8~svn215195-2) Replaces: lldb-3.8-dev (<= 1:3.8~svn215195-2)
Breaks: lldb-3.8-dev (<< 1:3.8~svn215195-2) Breaks: lldb-3.8-dev (<< 1:3.8~svn215195-2)

18
debian/rules vendored
View File

@ -74,7 +74,9 @@ endif
endif endif
# Enable polly (or not) # Enable polly (or not)
POLLY_ENABLE=yes ifeq (,$(filter $(DEB_HOST_ARCH), powerpc))
POLLY_ENABLE=yes
endif
ifneq (,$(filter codecoverage,$(DEB_BUILD_OPTIONS))) ifneq (,$(filter codecoverage,$(DEB_BUILD_OPTIONS)))
# enable the code coverage # enable the code coverage
@ -115,7 +117,7 @@ endif
LLDB_ENABLE=yes LLDB_ENABLE=yes
LLDB_DISABLE_ARCHS := arm64 hurd-i386 ia64 ppc64el LLDB_DISABLE_ARCHS := arm64 hurd-i386 ia64 ppc64el powerpc
# hurd has threading issues # hurd has threading issues
ifeq (,$(filter-out $(LLDB_DISABLE_ARCHS), $(DEB_HOST_ARCH))) ifeq (,$(filter-out $(LLDB_DISABLE_ARCHS), $(DEB_HOST_ARCH)))
# Disable LLDB for this arch. # Disable LLDB for this arch.
@ -158,7 +160,7 @@ override_dh_auto_configure: preconfigure
ln -s ../clang .; \ ln -s ../clang .; \
readlink clang readlink clang
if test $(POLLY_ENABLE) = yes; then \ if test "$(POLLY_ENABLE)" = yes; then \
cd tools/ && \ cd tools/ && \
if test -h polly; then \ if test -h polly; then \
rm polly; \ rm polly; \
@ -166,7 +168,7 @@ override_dh_auto_configure: preconfigure
ln -s ../polly .; \ ln -s ../polly .; \
fi fi
if test $(LLDB_ENABLE) = yes; then \ if test "$(LLDB_ENABLE)" = yes; then \
cd tools/ && \ cd tools/ && \
if test -h lldb; then \ if test -h lldb; then \
rm lldb; \ rm lldb; \
@ -284,7 +286,7 @@ override_dh_auto_install:
mv libclang.so libclang-$(LLVM_VERSION).so.$(SONAME_EXT) && \ mv libclang.so libclang-$(LLVM_VERSION).so.$(SONAME_EXT) && \
ln -s libclang-$(LLVM_VERSION).so.$(SONAME_EXT) libclang.so.$(SONAME_EXT); \ ln -s libclang-$(LLVM_VERSION).so.$(SONAME_EXT) libclang.so.$(SONAME_EXT); \
ln -s libclang-$(LLVM_VERSION).so.$(SONAME_EXT) libclang-$(LLVM_VERSION).so; \ ln -s libclang-$(LLVM_VERSION).so.$(SONAME_EXT) libclang-$(LLVM_VERSION).so; \
if test $(LLDB_ENABLE) = yes; then \ if test "$(LLDB_ENABLE)" = yes; then \
mv liblldb.so liblldb-$(LLVM_VERSION).so.$(SONAME_EXT) && \ mv liblldb.so liblldb-$(LLVM_VERSION).so.$(SONAME_EXT) && \
ln -s liblldb-$(LLVM_VERSION).so.$(SONAME_EXT) liblldb.so.$(SONAME_EXT); \ ln -s liblldb-$(LLVM_VERSION).so.$(SONAME_EXT) liblldb.so.$(SONAME_EXT); \
fi; \ fi; \
@ -353,7 +355,7 @@ override_dh_auto_install:
rm -f $(CURDIR)/$(TARGET_BUILD)/$(BUILD_DIR)/lib/python*/site-packages/lldb/_lldb.so rm -f $(CURDIR)/$(TARGET_BUILD)/$(BUILD_DIR)/lib/python*/site-packages/lldb/_lldb.so
# Manage the polly files. Sometimes, we build them. Sometimes not. # Manage the polly files. Sometimes, we build them. Sometimes not.
if test $(POLLY_ENABLE) = yes; then \ if test "$(POLLY_ENABLE)" = yes; then \
mkdir -p $(CURDIR)/debian/libclang-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/lib/ $(CURDIR)/debian/libclang-common-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/include/polly/; \ mkdir -p $(CURDIR)/debian/libclang-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/lib/ $(CURDIR)/debian/libclang-common-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/include/polly/; \
mv -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libpolly* \ mv -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libpolly* \
$(CURDIR)/debian/libclang-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/lib/; \ $(CURDIR)/debian/libclang-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/lib/; \
@ -419,7 +421,7 @@ endif
# lldb tests # lldb tests
ifeq (,$(filter $(DEB_HOST_ARCH), $(LLDB_DISABLE_ARCHS) armhf armel)) ifeq (,$(filter $(DEB_HOST_ARCH), $(LLDB_DISABLE_ARCHS) armhf armel))
if test $(LLDB_ENABLE) = yes; then \ if test "$(LLDB_ENABLE)" = yes; then \
cd $(TARGET_BUILD)/$(BUILD_DIR)/lib/python2.7/site-packages/lldb && if test ! -h _lldb.so -o ! -f _lldb.so; then ln -s ../../../liblldb.so _lldb.so; fi; \ cd $(TARGET_BUILD)/$(BUILD_DIR)/lib/python2.7/site-packages/lldb && if test ! -h _lldb.so -o ! -f _lldb.so; then ln -s ../../../liblldb.so _lldb.so; fi; \
if test ! -h libLLVM-$(LLVM_VERSION).so.$(SONAME_EXT) -o ! -f _lldb.so; then \ if test ! -h libLLVM-$(LLVM_VERSION).so.$(SONAME_EXT) -o ! -f _lldb.so; then \
ln -s ../../../libLLVM-$(LLVM_VERSION_FULL).so libLLVM-$(LLVM_VERSION).so.$(SONAME_EXT); \ ln -s ../../../libLLVM-$(LLVM_VERSION_FULL).so libLLVM-$(LLVM_VERSION).so.$(SONAME_EXT); \
@ -443,7 +445,7 @@ endif
rm -f $(CURDIR)/$(TARGET_BUILD)/$(BUILD_DIR)/lib/python*/site-packages/lldb/_lldb.so $(TARGET_BUILD)/$(BUILD_DIR)/lib/liblldb-$(LLVM_VERSION).so rm -f $(CURDIR)/$(TARGET_BUILD)/$(BUILD_DIR)/lib/python*/site-packages/lldb/_lldb.so $(TARGET_BUILD)/$(BUILD_DIR)/lib/liblldb-$(LLVM_VERSION).so
# polly tests # polly tests
if test $(POLLY_ENABLE) = yes; then \ if test "$(POLLY_ENABLE)" = yes; then \
cd $(TARGET_BUILD)/ && LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/ $(MAKE) -C tools/polly/test/ check-polly || true; \ cd $(TARGET_BUILD)/ && LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/ $(MAKE) -C tools/polly/test/ check-polly || true; \
fi fi