From 9adce59e2cc182e1cf1bc48114f52c650d41cdea Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 31 Aug 2015 07:39:49 +0000 Subject: [PATCH] remove patches merged upstream --- debian/patches/lit-lang.diff | 13 ------------- debian/patches/locale-issue-ld.diff | 13 ------------- 2 files changed, 26 deletions(-) delete mode 100644 debian/patches/lit-lang.diff delete mode 100644 debian/patches/locale-issue-ld.diff diff --git a/debian/patches/lit-lang.diff b/debian/patches/lit-lang.diff deleted file mode 100644 index 7c9f4543..00000000 --- a/debian/patches/lit-lang.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: llvm-toolchain-snapshot_3.7~svn242297/test/lit.cfg -=================================================================== ---- llvm-toolchain-snapshot_3.7~svn242297.orig/test/lit.cfg -+++ llvm-toolchain-snapshot_3.7~svn242297/test/lit.cfg -@@ -345,7 +345,7 @@ def have_ld_plugin_support(): - if not os.path.exists(os.path.join(config.llvm_shlib_dir, 'LLVMgold.so')): - return False - -- ld_cmd = subprocess.Popen([config.gold_executable, '--help'], stdout = subprocess.PIPE) -+ ld_cmd = subprocess.Popen([config.gold_executable, '--help'], stdout = subprocess.PIPE, env={'LANG': 'C'}) - ld_out = ld_cmd.stdout.read().decode() - ld_cmd.wait() - diff --git a/debian/patches/locale-issue-ld.diff b/debian/patches/locale-issue-ld.diff deleted file mode 100644 index c2243d97..00000000 --- a/debian/patches/locale-issue-ld.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: llvm-toolchain-snapshot_3.7~svn241962/test/lit.cfg -=================================================================== ---- llvm-toolchain-snapshot_3.7~svn241962.orig/test/lit.cfg -+++ llvm-toolchain-snapshot_3.7~svn241962/test/lit.cfg -@@ -366,7 +366,7 @@ def have_ld_plugin_support(): - if 'elf32ppc' in emulations: - config.available_features.add('ld_emu_elf32ppc') - -- ld_version = subprocess.Popen([config.gold_executable, '--version'], stdout = subprocess.PIPE) -+ ld_version = subprocess.Popen([config.gold_executable, '--version'], stdout = subprocess.PIPE, env={'LANG': 'C'}) - if not 'GNU gold' in ld_version.stdout.read().decode(): - return False - ld_version.wait()