Several Patches Updated

1. lldb-mi error fix
2. VS debug indicator error patch

Change-Id: I859116bf5472238aa67fea4d97f73048c1737d17
Signed-off-by: chunseoklee <chunseok.lee@samsung.com>

diff --git a/packaging/lldb.tar.gz b/packaging/lldb.tar.gz
index 11763dc..47d100b 100644 (file)
Binary files a/packaging/lldb.tar.gz and b/packaging/lldb.tar.gz differ

diff --git a/packaging/llvm.spec b/packaging/llvm.spec
index 069060a..113dca9 100644 (file)
--- a/packaging/llvm.spec
+++ b/packaging/llvm.spec
@@ -15,6 +15,13 @@ BuildRequires: python-devel
 #BuildRequires: swig
 Requires: libllvm = %{version}-%{release}
 
+%define install_prefix /usr/local
+%ifarch x86_64 aarch64
+%define library_dir %{install_prefix}/lib64
+%else
+%define library_dir %{install_prefix}/lib
+%endif
+
 
 %description
 LLVM is a compiler infrastructure designed for compile-time, link-time, runtime,
@@ -57,7 +64,7 @@ Requires: clang = %{version}-%{release}
 This package contains the clang (C language) frontend for LLVM.
 (development files)
 
-%ifnarch aarch64
+#%ifnarch aarch64
 %package -n lldb
 Summary: LLDB
 License: NCSA
@@ -75,7 +82,7 @@ Requires: lldb = %{version}-%{release}
 
 %description -n lldb-devel
 The package contains header files for the LLDB debugger.
-%endif
+#%endif
 
 %prep
 %setup -q -n llvm-%{version}.src
@@ -100,21 +107,28 @@ cd build
 cmake \
     -DCMAKE_C_COMPILER=/usr/bin/gcc \
     -DCMAKE_CXX_COMPILER=/usr/bin/g++ \
+    -DCMAKE_INSTALL_PREFIX=%{install_prefix} \
     -DCMAKE_BUILD_TYPE=Release \
     -DLLVM_ENABLE_ASSERTIONS=No \
     -DLLVM_TARGETS_TO_BUILD='X86;ARM;AArch64' \
     -DLLVM_BUILD_LLVM_DYLIB=1 \
     -DLLDB_DISABLE_LIBEDIT=1 \
     -DLLDB_DISABLE_PYTHON=1 \
-    -DLLDB_DISABLE_CURSES=1 ..
+%ifarch x86_64
+    -DLLVM_LIBDIR_SUFFIX=64 \
+%endif                
+    -DLLDB_DISABLE_CURSES=1 \
+    ..
 %else
 cmake \
     -DCMAKE_C_COMPILER=/usr/bin/gcc \
     -DCMAKE_CXX_COMPILER=/usr/bin/g++ \
     -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=%{install_prefix} \
     -DLLVM_ENABLE_ASSERTIONS=No \
     -DLLVM_TARGETS_TO_BUILD='X86;ARM;AArch64' \
     -DLLVM_BUILD_LLVM_DYLIB=1 \
+    -DLLVM_LIBDIR_SUFFIX=64 \
     ..
 %endif
 
@@ -125,7 +139,7 @@ cd build
 %make_install
 
 rm -rf %{buildroot}/usr/lib/debug/*
-rm -rf %{buildroot}/usr/local/lib/lib*.a
+rm -rf %{buildroot}%{library_dir}/lib*.a
 
 %post -n clang -p /sbin/ldconfig
 %postun -n clang -p /sbin/ldconfig
@@ -142,102 +156,103 @@ echo Cleaning %{buildroot}
 %files
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
-/usr/local/bin/bugpoint
-/usr/local/bin/llc
-/usr/local/bin/lli
-/usr/local/bin/llvm-ar
-/usr/local/bin/llvm-as
-/usr/local/bin/llvm-bcanalyzer
-/usr/local/bin/llvm-c-test
-/usr/local/bin/llvm-config
-/usr/local/bin/llvm-cov
-/usr/local/bin/llvm-cxxdump
-/usr/local/bin/llvm-diff
-/usr/local/bin/llvm-dis
-/usr/local/bin/llvm-dsymutil
-/usr/local/bin/llvm-dwarfdump
-/usr/local/bin/llvm-dwp
-/usr/local/bin/llvm-extract
-/usr/local/bin/llvm-lib
-/usr/local/bin/llvm-link
-/usr/local/bin/llvm-lto
-/usr/local/bin/llvm-mc
-/usr/local/bin/llvm-mcmarkup
-/usr/local/bin/llvm-nm
-/usr/local/bin/llvm-objdump
-/usr/local/bin/llvm-pdbdump
-/usr/local/bin/llvm-profdata
-/usr/local/bin/llvm-ranlib
-/usr/local/bin/llvm-readobj
-/usr/local/bin/llvm-rtdyld
-/usr/local/bin/llvm-size
-/usr/local/bin/llvm-split
-/usr/local/bin/llvm-stress
-/usr/local/bin/llvm-symbolizer
-/usr/local/bin/llvm-tblgen
-/usr/local/bin/obj2yaml
-/usr/local/bin/opt
-/usr/local/bin/sancov
-/usr/local/bin/scan-build
-/usr/local/bin/scan-view
-/usr/local/bin/verify-uselistorder
-/usr/local/bin/yaml2obj
-/usr/local/lib/BugpointPasses.so
-/usr/local/lib/LLVMHello.so
-/usr/local/lib/libLTO.so
+%{install_prefix}/bin/bugpoint
+%{install_prefix}/bin/llc
+%{install_prefix}/bin/lli
+%{install_prefix}/bin/llvm-ar
+%{install_prefix}/bin/llvm-as
+%{install_prefix}/bin/llvm-bcanalyzer
+%{install_prefix}/bin/llvm-c-test
+%{install_prefix}/bin/llvm-config
+%{install_prefix}/bin/llvm-cov
+%{install_prefix}/bin/llvm-cxxdump
+%{install_prefix}/bin/llvm-diff
+%{install_prefix}/bin/llvm-dis
+%{install_prefix}/bin/llvm-dsymutil
+%{install_prefix}/bin/llvm-dwarfdump
+%{install_prefix}/bin/llvm-dwp
+%{install_prefix}/bin/llvm-extract
+%{install_prefix}/bin/llvm-lib
+%{install_prefix}/bin/llvm-link
+%{install_prefix}/bin/llvm-lto
+%{install_prefix}/bin/llvm-mc
+%{install_prefix}/bin/llvm-mcmarkup
+%{install_prefix}/bin/llvm-nm
+%{install_prefix}/bin/llvm-objdump
+%{install_prefix}/bin/llvm-pdbdump
+%{install_prefix}/bin/llvm-profdata
+%{install_prefix}/bin/llvm-ranlib
+%{install_prefix}/bin/llvm-readobj
+%{install_prefix}/bin/llvm-rtdyld
+%{install_prefix}/bin/llvm-size
+%{install_prefix}/bin/llvm-split
+%{install_prefix}/bin/llvm-stress
+%{install_prefix}/bin/llvm-symbolizer
+%{install_prefix}/bin/llvm-tblgen
+%{install_prefix}/bin/obj2yaml
+%{install_prefix}/bin/opt
+%{install_prefix}/bin/sancov
+%{install_prefix}/bin/scan-build
+%{install_prefix}/bin/scan-view
+%{install_prefix}/bin/verify-uselistorder
+%{install_prefix}/bin/yaml2obj
+%{library_dir}/BugpointPasses.so
+%{library_dir}/LLVMHello.so
+%{library_dir}/libLTO.so
 
 %files devel
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
-/usr/local/include/llvm/*
-/usr/local/include/llvm-c/*
-/usr/local/share/*
+%{install_prefix}/include/llvm/*
+%{install_prefix}/include/llvm-c/*
+%{install_prefix}/share/*
 
 %files -n libllvm
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
-/usr/local/lib/libLLVM*.so*
+%{library_dir}/libLLVM*.so*
 
 
 %files -n clang
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
-/usr/local/bin/c-index-test
-/usr/local/bin/clang
-/usr/local/bin/clang++
-/usr/local/bin/clang-3.8
-/usr/local/bin/clang-check
-/usr/local/bin/clang-cl
-/usr/local/bin/clang-format
-/usr/local/bin/git-clang-format
-/usr/local/lib/clang/3.8.1/include/*
-/usr/local/lib/libclang.so
-/usr/local/lib/libclang.so.3.8
-/usr/local/libexec/c++-analyzer
-/usr/local/libexec/ccc-analyzer
+%{install_prefix}/bin/c-index-test
+%{install_prefix}/bin/clang
+%{install_prefix}/bin/clang++
+%{install_prefix}/bin/clang-3.8
+%{install_prefix}/bin/clang-check
+%{install_prefix}/bin/clang-cl
+%{install_prefix}/bin/clang-format
+%{install_prefix}/bin/git-clang-format
+%{library_dir}/clang/3.8.1/include/*
+%{library_dir}/libclang.so
+%{library_dir}/libclang.so.3.8
+%{install_prefix}/libexec/c++-analyzer
+%{install_prefix}/libexec/ccc-analyzer
 
 %files -n clang-devel
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
-/usr/local/include/clang/*
-/usr/local/include/clang-c/*
+%{install_prefix}/include/clang/*
+%{install_prefix}/include/clang-c/*
 
 %ifnarch aarch64
 %files -n lldb
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
-/usr/local/bin/lldb
-/usr/local/bin/lldb-3.8.1
-/usr/local/bin/lldb-argdumper
-/usr/local/bin/lldb-mi
-/usr/local/bin/lldb-mi-3.8.1
-/usr/local/bin/lldb-server
-/usr/local/bin/lldb-server-3.8.1
-/usr/local/lib/liblldb.so
-/usr/local/lib/liblldb.so.3.8.1
+%{install_prefix}/bin/lldb
+%{install_prefix}/bin/lldb-3.8.1
+%{install_prefix}/bin/lldb-argdumper
+%{install_prefix}/bin/lldb-mi
+%{install_prefix}/bin/lldb-mi-3.8.1
+%{install_prefix}/bin/lldb-server
+%{install_prefix}/bin/lldb-server-3.8.1
+%{library_dir}/liblldb.so
+%{library_dir}/liblldb.so.3.8.1
+#%{library_dir}/python2.7/*
 
 %files -n lldb-devel
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
-/usr/local/include/lldb/*
+%{install_prefix}/include/lldb/*
 %endif