From 6af052a53ad3fe69ef51c6bad41ad95c384affa1 Mon Sep 17 00:00:00 2001 From: sherlock2010 <15151851377@163.com> Date: Fri, 3 Apr 2020 10:05:24 +0800 Subject: [PATCH 1/2] Remove useless scriptlet --- clang.spec | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/clang.spec b/clang.spec index 3a49ece..ac434e9 100644 --- a/clang.spec +++ b/clang.spec @@ -7,7 +7,7 @@ Name: clang Version: %{maj_ver}.%{min_ver}.%{patch_ver} -Release: 5 +Release: 6 License: NCSA Summary: An "LLVM native" C/C++/Objective-C compiler URL: http://llvm.org @@ -111,12 +111,6 @@ mv ../%{clang_tools_srcdir} tools/extra %build -%if 0%{?__isa_bits} == 64 -sed -i 's/\@FEDORA_LLVM_LIB_SUFFIX\@/64/g' test/lit.cfg.py -%else -sed -i 's/\@FEDORA_LLVM_LIB_SUFFIX\@//g' test/lit.cfg.py -%endif - mkdir -p _build cd _build @@ -255,6 +249,9 @@ false %{python2_sitelib}/clang/ %changelog +* Fri Apr 03 2020 zhouyihang - 7.0.0-6 +- Remove useless scriptlet + * Thu Feb 20 2020 openEuler Buildteam - 7.0.0-5 - Add buildrequire compiler-rt -- Gitee From d1d84c7270990b8e453224bd63b4faedb0b834af Mon Sep 17 00:00:00 2001 From: sherlock2010 <15151851377@163.com> Date: Fri, 3 Apr 2020 15:14:58 +0800 Subject: [PATCH 2/2] Remove useless scriptlet --- 0001-lit.cfg-Add-hack-so-lit-can-find-not-and-FileCheck.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/0001-lit.cfg-Add-hack-so-lit-can-find-not-and-FileCheck.patch b/0001-lit.cfg-Add-hack-so-lit-can-find-not-and-FileCheck.patch index 508434d..4664fdc 100644 --- a/0001-lit.cfg-Add-hack-so-lit-can-find-not-and-FileCheck.patch +++ b/0001-lit.cfg-Add-hack-so-lit-can-find-not-and-FileCheck.patch @@ -16,7 +16,7 @@ index 5323cfe..5b4184e 100644 config.test_exec_root = os.path.join(config.clang_obj_root, 'test') +old_llvm_tools_dir = llvm_config.config.llvm_tools_dir -+llvm_config.config.llvm_tools_dir = '/usr/lib@FEDORA_LLVM_LIB_SUFFIX@/llvm' ++llvm_config.config.llvm_tools_dir = '/usr/lib64/llvm' llvm_config.use_default_substitutions() +llvm_config.config.llvm_tools_dir = old_llvm_tools_dir -- Gitee