From 7a30a339dc6d8654e74f2b17c51234e7830dcd94 Mon Sep 17 00:00:00 2001 From: Peter Michael Green Date: Thu, 7 Sep 2017 07:14:27 +0000 Subject: [PATCH] Commit Debian 3.0 (quilt) metadata [dgit (3.12) quilt-fixup] --- ...1c124bfc65bd4da3d5bad2318b86155-1504768094 | 55 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 56 insertions(+) create mode 100644 debian/patches/auto-1:5.0~+rc2-1+rpi1-d8bb5e17a1c124bfc65bd4da3d5bad2318b86155-1504768094 diff --git a/debian/patches/auto-1:5.0~+rc2-1+rpi1-d8bb5e17a1c124bfc65bd4da3d5bad2318b86155-1504768094 b/debian/patches/auto-1:5.0~+rc2-1+rpi1-d8bb5e17a1c124bfc65bd4da3d5bad2318b86155-1504768094 new file mode 100644 index 000000000..4e7fd72a2 --- /dev/null +++ b/debian/patches/auto-1:5.0~+rc2-1+rpi1-d8bb5e17a1c124bfc65bd4da3d5bad2318b86155-1504768094 @@ -0,0 +1,55 @@ +From: Peter Micahel Green +Subject: Automatically generated patch (1:5.0~+rc2-1+rpi1) + +Last (up to) 3 git changes, FYI: + +commit d8bb5e17a1c124bfc65bd4da3d5bad2318b86155 +Author: Peter Michael Green +Date: Thu Sep 7 07:03:48 2017 +0000 + + Remove old cmake patch, dgit will regenerate it. + +commit 8479377cb2739eeaa610fbc0370f239e0cabda83 +Merge: 706ae0030 46e6d900f +Author: Peter Michael Green +Date: Thu Sep 7 07:11:20 2017 +0100 + + Merge raspbian changes from llvm-toolchain-4.0 + +commit 706ae0030c98b01e6594ab4a4aca848e9dbedbd5 +Merge: 2b80ff9a0 b60f1e5d8 +Author: plugwash +Date: Thu Sep 7 07:02:37 2017 +0100 + + Psuedomerge to tie in 4.0 history. +--- + +--- /dev/null ++++ llvm-toolchain-5.0-5.0~+rc2/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-5.0-5.0~+rc2.orig/cmake/modules/GetHostTriple.cmake ++++ llvm-toolchain-5.0-5.0~+rc2/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-5.0-5.0~+rc2.orig/compiler-rt/cmake/base-config-ix.cmake ++++ llvm-toolchain-5.0-5.0~+rc2/compiler-rt/cmake/base-config-ix.cmake +@@ -172,8 +172,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") + test_target_arch(armv6m "" "-march=armv6m" "-mfloat-abi=soft") + endif() + elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "aarch32") diff --git a/debian/patches/series b/debian/patches/series index 58de66c8d..d6ad4e465 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -46,3 +46,4 @@ disable-path-test-failing.diff silent-amd-tet.diff disable-error-xray.diff lldb-disable-swig-error.diff +auto-1:5.0~+rc2-1+rpi1-d8bb5e17a1c124bfc65bd4da3d5bad2318b86155-1504768094 -- 2.30.2