Package: src:llvm-toolchain-snapshot
Version: 1:3.8~svn254193-1
Tags: patch
- 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
* Disable polly on powerpc.
* Disable lldb on powerpc.
diff -Nru llvm-toolchain-snapshot-3.8~svn254193/debian/control
llvm-toolchain-snapshot-3.8~svn254193/debian/control
--- llvm-toolchain-snapshot-3.8~svn254193/debian/control 2015-11-27
10:01:00.000000000 +0100
+++ llvm-toolchain-snapshot-3.8~svn254193/debian/control 2015-11-30
14:59:22.000000000 +0100
@@ -380,8 +381,8 @@
# ------------- lldb -------------
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
-# ia64 mips mipsel hurd ppc64el have been removed
+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 powerpc ppc64el have been removed
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
Pre-Depends: ${misc:Pre-Depends}
@@ -391,8 +392,8 @@
Project, such as the Clang expression parser and LLVM disassembler.
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
-# ia64 mips mipsel hurd ppc64el have been removed
+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 powerpc ppc64el have been removed
Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.8 (= ${binary:Version})
Pre-Depends: ${misc:Pre-Depends}
Section: libs
@@ -435,8 +436,8 @@
Package: liblldb-3.8-dev
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
-# ia64 mips mipsel hurd ppc64el have been removed
+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 powerpc ppc64el have been removed
Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-3.8 (= ${binary:Version})
Replaces: lldb-3.8-dev (<= 1:3.8~svn215195-2)
Breaks: lldb-3.8-dev (<< 1:3.8~svn215195-2)
diff -Nru llvm-toolchain-snapshot-3.8~svn254193/debian/rules
llvm-toolchain-snapshot-3.8~svn254193/debian/rules
--- llvm-toolchain-snapshot-3.8~svn254193/debian/rules 2015-11-27
10:01:01.000000000 +0100
+++ llvm-toolchain-snapshot-3.8~svn254193/debian/rules 2015-11-30
14:53:39.000000000 +0100
@@ -74,7 +74,9 @@
endif
# Enable polly (or not)
-POLLY_ENABLE=yes
+ifeq (,$(filter $(DEB_HOST_ARCH), powerpc))
+ POLLY_ENABLE=yes
+endif
ifneq (,$(filter codecoverage,$(DEB_BUILD_OPTIONS)))
# enable the code coverage
@@ -115,7 +117,7 @@
LLDB_ENABLE=yes
-LLDB_DISABLE_ARCHS := arm64 hurd-i386 ia64 ppc64el
+LLDB_DISABLE_ARCHS := arm64 hurd-i386 ia64 ppc64el powerpc
# hurd has threading issues
ifeq (,$(filter-out $(LLDB_DISABLE_ARCHS), $(DEB_HOST_ARCH)))
# Disable LLDB for this arch.
@@ -158,7 +160,7 @@
ln -s ../clang .; \
readlink clang
- if test $(POLLY_ENABLE) = yes; then \
+ if test "$(POLLY_ENABLE)" = yes; then \
cd tools/ && \
if test -h polly; then \
rm polly; \
@@ -166,7 +168,7 @@
ln -s ../polly .; \
fi
- if test $(LLDB_ENABLE) = yes; then \
+ if test "$(LLDB_ENABLE)" = yes; then \
cd tools/ && \
if test -h lldb; then \
rm lldb; \
@@ -284,7 +286,7 @@
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-$(LLVM_VERSION).so; \
- if test $(LLDB_ENABLE) = yes; then \
+ if test "$(LLDB_ENABLE)" = yes; then \
mv liblldb.so liblldb-$(LLVM_VERSION).so.$(SONAME_EXT) && \
ln -s liblldb-$(LLVM_VERSION).so.$(SONAME_EXT)
liblldb.so.$(SONAME_EXT); \
fi; \
@@ -353,7 +355,7 @@
rm -f
$(CURDIR)/$(TARGET_BUILD)/$(BUILD_DIR)/lib/python*/site-packages/lldb/_lldb.so
# 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/;
\
mv -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libpolly* \
$(CURDIR)/debian/libclang-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/lib/;
\
@@ -419,7 +421,7 @@
# lldb tests
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; \
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); \
@@ -443,7 +445,7 @@
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
- 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; \
fi
