From f52f8d1962f3366df5e0409bc2aa5ce1a79b0ae8 Mon Sep 17 00:00:00 2001 From: Peter Michael Green Date: Thu, 6 Jul 2017 21:36:15 +0000 Subject: [PATCH] Commit Debian 3.0 (quilt) metadata [dgit (3.10) quilt-fixup] --- ...78deb53de96a26ff0f0f5ac8ffaabde-1499376797 | 55 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 56 insertions(+) create mode 100644 debian/patches/auto-1:4.0.1-1+rpi1-67c335abb78deb53de96a26ff0f0f5ac8ffaabde-1499376797 diff --git a/debian/patches/auto-1:4.0.1-1+rpi1-67c335abb78deb53de96a26ff0f0f5ac8ffaabde-1499376797 b/debian/patches/auto-1:4.0.1-1+rpi1-67c335abb78deb53de96a26ff0f0f5ac8ffaabde-1499376797 new file mode 100644 index 000000000..5d5c8f9cb --- /dev/null +++ b/debian/patches/auto-1:4.0.1-1+rpi1-67c335abb78deb53de96a26ff0f0f5ac8ffaabde-1499376797 @@ -0,0 +1,55 @@ +From: Peter Micahel Green +Subject: Automatically generated patch (1:4.0.1-1+rpi1) + +Last (up to) 3 git changes, FYI: + +commit 67c335abb78deb53de96a26ff0f0f5ac8ffaabde +Author: Peter Michael Green +Date: Thu Jul 6 21:25:21 2017 +0000 + + Remove old cmake-arm-version-hack.patch. dgit will regenerate it. + +commit 019f07c5de27a04a420eb6889bbe96c9dca246d7 +Merge: d19e83d0b d0f4f4a87 +Author: Peter Michael Green +Date: Thu Jul 6 21:49:03 2017 +0100 + + Merge raspbian changes from llvm-toolchain-3.9 packaging. + +commit d19e83d0b14cf997e617ffbf125d744d1ac08100 +Merge: b60f1e5d8 301c08848 +Author: root +Date: Thu Jul 6 21:39:58 2017 +0100 + + Psudeomerge to tie in llvm-toolchain-3.9 upstream history. +--- + +--- /dev/null ++++ llvm-toolchain-4.0-4.0.1/cmake/config.guess.hack +@@ -0,0 +1,2 @@ ++#!/bin/bash -e ++$(dirname "$0")/config.guess | sed -r s/arm[a-zA-Z0-9]*/armv6/ +--- llvm-toolchain-4.0-4.0.1.orig/cmake/modules/GetHostTriple.cmake ++++ llvm-toolchain-4.0-4.0.1/cmake/modules/GetHostTriple.cmake +@@ -15,7 +15,7 @@ function( get_host_triple var ) + set( value "i686-pc-mingw32" ) + endif() + else( MSVC ) +- set(config_guess ${LLVM_MAIN_SRC_DIR}/cmake/config.guess) ++ set(config_guess ${LLVM_MAIN_SRC_DIR}/cmake/config.guess.hack) + execute_process(COMMAND sh ${config_guess} + RESULT_VARIABLE TT_RV + OUTPUT_VARIABLE TT_OUT +--- llvm-toolchain-4.0-4.0.1.orig/compiler-rt/cmake/base-config-ix.cmake ++++ llvm-toolchain-4.0-4.0.1/compiler-rt/cmake/base-config-ix.cmake +@@ -170,8 +170,8 @@ macro(test_targets) + if(WIN32) + test_target_arch(arm "" "" "") + else() +- test_target_arch(arm "" "-march=armv7-a" "-mfloat-abi=soft") +- test_target_arch(armhf "" "-march=armv7-a" "-mfloat-abi=hard") ++ test_target_arch(arm "" "" "-mfloat-abi=soft") ++ test_target_arch(armhf "" "" "-mfloat-abi=hard") + endif() + elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "aarch32") + test_target_arch(aarch32 "" "-march=armv8-a") diff --git a/debian/patches/series b/debian/patches/series index 0af13e9ed..4679df39e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -46,3 +46,4 @@ silent-test-failing-codeverage.diff silent-amdgpu-test-failing.diff pthread-link.diff add_symbols_versioning.patch +auto-1:4.0.1-1+rpi1-67c335abb78deb53de96a26ff0f0f5ac8ffaabde-1499376797 -- 2.30.2