Move config.guess.hack to new location.

diff --git a/cmake/config.guess.hack b/cmake/config.guess.hack
deleted file mode 100644 (file)
index 13b18bf..0000000
--- a/cmake/config.guess.hack
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash -e
-$(dirname "$0")/config.guess | sed -r s/arm[a-zA-Z0-9]*/armv6/

diff --git a/debian/changelog b/debian/changelog
index 5524112d1ede21763e1b577ccaf62a57cb849a1d..db325f06488992becbb91d40fdba42ed00832cb4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,7 +34,7 @@ llvm-toolchain-9 (1:9.0.0-3+rpi1) bullseye-staging; urgency=medium
   [changes introduced in llvm-toolchain-7 1:7.0.1-1+rpi2 by Peter Michael Green]
   * Change triplet in debian/rules to use armv6k rather than armv7l
 
- -- Raspbian forward porter <root@raspbian.org>  Mon, 25 Nov 2019 03:12:48 +0000
+ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 26 Nov 2019 11:23:31 +0000
 
 llvm-toolchain-9 (1:9.0.0-3) unstable; urgency=medium
 

diff --git a/debian/patches/raspbian-triplet.patch b/debian/patches/raspbian-triplet.patch
index 02c93a08ad06dd567e78efd827639e9eb4f5fa1a..f5806f717ff828db9fb87ada31eef18c037d95e5 100644 (file)
--- a/debian/patches/raspbian-triplet.patch
+++ b/debian/patches/raspbian-triplet.patch
@@ -2,7 +2,7 @@ hack to replace arm version in triplet returned by config.guess
 with the one we want for raspbian.
 
 --- /dev/null
-+++ llvm-toolchain-9-9/cmake/config.guess.hack
++++ llvm-toolchain-9-9/llvm/cmake/config.guess.hack
 @@ -0,0 +1,2 @@
 +#!/bin/bash -e
 +$(dirname "$0")/config.guess | sed -r s/arm[a-zA-Z0-9]*/armv6/

diff --git a/debian/rules b/debian/rules
index aaa01e75f7ebc7d742c1cac7d7f3c08731994f98..76f99da7e4808d3d64568678ff56595cbc9a83ad 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -300,9 +300,9 @@ preconfigure:
 
        # add executable flag to script we added as part of triplet hack
        # --plugwash
-       chmod 755 cmake/config.guess.hack
+       chmod 755 llvm/cmake/config.guess.hack
        # also make sure config.guess is executable
-       chmod 755 cmake/config.guess
+       chmod 755 llvm/cmake/config.guess
        
        for f in debian/*.in; do \
                f2=$$(echo $$f | sed 's/\.in$$//;s/X\.Y/$(LLVM_VERSION)/'); \
@@ -884,7 +884,7 @@ override_dh_auto_clean:
        rm -f debian/*.links debian/c*.lintian-overrides debian/l*.lintian-overrides debian/*.META debian/*.dirs debian/*.docs debian/*.symbols debian/*.postinst debian/*.manpages debian/*.examples debian/*.binfmt debian/*.prerm
        -rmdir clang/include/clang/Debian/
        -rmdir lldb/docs/doc/
-       chmod 644 cmake/config.guess.hack
+       chmod 644 llvm/cmake/config.guess.hack
        if test -f lld/docs/ld.lld-$(LLVM_VERSION).1; then \
                mv lld/docs/ld.lld-$(LLVM_VERSION).1 lld/docs/ld.lld.1; \
        fi

diff --git a/llvm/cmake/config.guess.hack b/llvm/cmake/config.guess.hack
new file mode 100644 (file)
index 0000000..13b18bf
--- /dev/null
+++ b/llvm/cmake/config.guess.hack
@@ -0,0 +1,2 @@
+#!/bin/bash -e
+$(dirname "$0")/config.guess | sed -r s/arm[a-zA-Z0-9]*/armv6/