diff --git a/lldb-cmake.patch b/lldb-cmake.patch deleted file mode 100644 index 2ccb82f..0000000 --- a/lldb-cmake.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- llvm.orig/tools/lldb/scripts/CMakeLists.txt 2013-06-13 09:05:41.000000000 -0700 -+++ llvm/tools/lldb/scripts/CMakeLists.txt 2014-03-08 00:59:09.089734896 -0800 -@@ -16,5 +16,16 @@ - - # Install the LLDB python module on all operating systems (except Windows) - if (NOT CMAKE_SYSTEM_NAME MATCHES "Windows") -- install(SCRIPT lldb_python_module.cmake -DCMAKE_INSTALL_PREFIX=\"${CMAKE_INSTALL_PREFIX}\" -DCMAKE_BUILD_DIR=\"${CMAKE_BUILD_DIR}\") -+ install(CODE " -+ include(FindPythonInterp) -+ -+ SET(PYTHON_DIRECTORY python\${PYTHON_VERSION_MAJOR}.\${PYTHON_VERSION_MINOR}) -+ -+ SET(lldb_module_src ${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/\${PYTHON_DIRECTORY}) -+ SET(lldb_module_dest \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}) -+ -+ MESSAGE(STATUS \"Installing LLDB python module from: \${lldb_module_src} to \${lldb_module_dest}\") -+ FILE(COPY \${lldb_module_src} DESTINATION \${lldb_module_dest}) -+ " -+ ) - endif() ---- llvm.orig/tools/lldb/scripts/lldb_python_module.cmake 2013-06-13 09:05:41.000000000 -0700 -+++ /dev/null 2014-02-14 05:57:02.719999980 -0800 -@@ -1,14 +0,0 @@ --# This CMake script installs the LLDB python module from the build directory --# to the install directory. -- --# FIXME: if a non-standard version of python is requested, the cmake macro --# below will need Python_ADDITIONAL_VERSIONS set in order to find it. --include(FindPythonInterp) -- --SET(PYTHON_DIRECTORY python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}) -- --SET(lldb_module_src ${CMAKE_CURRENT_BINARY_DIR}/lib/${PYTHON_DIRECTORY}) --SET(lldb_module_dest ${CMAKE_INSTALL_PREFIX}/lib) -- --MESSAGE(STATUS "Installing LLDB python module from: ${lldb_module_src} to ${lldb_module_dest}") --FILE(COPY "${lldb_module_src}" DESTINATION "${lldb_module_dest}") ---- llvm.orig/tools/lldb/source/CMakeLists.txt 2013-11-15 06:15:10.000000000 -0800 -+++ llvm/tools/lldb/source/CMakeLists.txt 2014-03-08 03:38:38.480795021 -0800 -@@ -225,5 +225,5 @@ - - install(TARGETS liblldb - RUNTIME DESTINATION bin -- LIBRARY DESTINATION lib -- ARCHIVE DESTINATION lib) -+ LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} -+ ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) diff --git a/lldb.changes b/lldb.changes new file mode 100644 index 0000000..6bb1324 --- /dev/null +++ b/lldb.changes @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Mon Mar 17 09:02:51 UTC 2014 - idonmez@suse.com + +- First release on build.opensuse.org + diff --git a/lldb.spec b/lldb.spec new file mode 100644 index 0000000..78b7f91 --- /dev/null +++ b/lldb.spec @@ -0,0 +1,98 @@ +# +# spec file for package lldb +# +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +Name: lldb +Version: 3.4 +Release: 0 +Summary: The LLDB Debugger +License: LLVM +Group: Development/Languages +Url: http://lldb.llvm.org/ +Source: lldb-%{version}.tar.bz2 +BuildRequires: cmake +BuildRequires: libedit-devel +BuildRequires: llvm-clang-devel +BuildRequires: llvm-devel +BuildRequires: swig +BuildRoot: %{_tmppath}/%{name}-%{version}-build +ExclusiveArch: arm x86_64 + +%description +LLDB is a next generation, high-performance debugger. +It is built as a set of reusable components which highly +leverage existing libraries in the larger LLVM Project, +such as the Clang expression parser and LLVM disassembler. + +%package +Summary: Next generation high-performance debugger +Group: Development/Languages +BuildRequires: libedit-devel +BuildRequires: python-devel +BuildRequires: swig + +%description +LLDB is a next generation, high-performance debugger. It is built as a set +of reusable components which highly leverage existing libraries in the +larger LLVM Project, such as the Clang expression parser and LLVM +disassembler. + +%package devel +Summary: Next generation high-performance debugger (devel package) +Group: Development/Languages +BuildRequires: libedit-devel +BuildRequires: python-devel +BuildRequires: swig +Requires: lldb = %{version} + +%description devel +LLDB is a next generation, high-performance debugger. It is built as a set +of reusable components which highly leverage existing libraries in the +larger LLVM Project, such as the Clang expression parser and LLVM +disassembler. + +%prep +%setup -q + +%build +mkdir build +popd build +CC=clang CXX=clang++ \ +cmake -DLLDB_PATH_TO_LLVM_BUILD=%{_prefix} \ + -DLLDB_PATH_TO_CLANG_BUILD=%{_prefix} .. + +%install +popd build +%makeinstall + +rm %{buildroot}%{_libdir}/liblldb*.a + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root,-) +%{_libdir}/liblldb.so.* +%{_bindir}/lldb* +%{_libdir}/python*/site-packages/lldb + +%files devel +%defattr(-,root,root,-) +%{_includedir}/lldb +%{_libdir}/liblldb.so + +%changelog diff --git a/llvm.changes b/llvm.changes index eb95544..3de7370 100644 --- a/llvm.changes +++ b/llvm.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Tue Mar 11 09:39:47 UTC 2014 - idonmez@suse.com - -- Enable lldb on x86-64 and ARM, work done by Jason Newton. - ------------------------------------------------------------------- Sat Feb 22 18:18:57 CET 2014 - ro@suse.de diff --git a/llvm.spec b/llvm.spec index d3783fb..6dde90c 100644 --- a/llvm.spec +++ b/llvm.spec @@ -27,7 +27,6 @@ License: NCSA Group: Development/Languages/Other Url: http://www.llvm.org Source0: %{name}-%{version}.tar.bz2 -Source1: lldb-%{version}.tar.bz2 Source100: %{name}-rpmlintrc # PATCH-FIX-OPENSUSE set-revision.patch idoenmez@suse.de -- Allow us to set revision Patch1: set-revision.patch @@ -46,7 +45,6 @@ Patch8: aarch64-suse-support.patch Patch9: arm-remove-xfails.diff # PATCH-FIX-OPENSUSE asan-disable-hugemalloctest.patch -- Disable ASAN HugeMallocTest Patch10: asan-disable-hugemalloctest.patch -Patch11: lldb-cmake.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake @@ -124,37 +122,6 @@ Requires: llvm-devel = %{version} This package contains the clang (C language) frontend for LLVM. (development files) -%ifarch x86_64 arm -%package -n lldb -Summary: Next generation high-performance debugger -Group: Development/Languages -Requires: llvm%{?_isa} = %{version}-%{release} -BuildRequires: libedit-devel -BuildRequires: python-devel -BuildRequires: swig - -%description -n lldb -LLDB is a next generation, high-performance debugger. It is built as a set -of reusable components which highly leverage existing libraries in the -larger LLVM Project, such as the Clang expression parser and LLVM -disassembler. - -%package -n lldb-devel -Summary: Next generation high-performance debugger (devel package) -Group: Development/Languages -Requires: llvm%{?_isa} = %{version}-%{release} -BuildRequires: libedit-devel -BuildRequires: python-devel -BuildRequires: swig -Requires: lldb = %{version} - -%description -n lldb-devel -LLDB is a next generation, high-performance debugger. It is built as a set -of reusable components which highly leverage existing libraries in the -larger LLVM Project, such as the Clang expression parser and LLVM -disassembler. -%endif - %package vim-plugins Summary: Vim plugins for LLVM Group: Productivity/Text/Editors @@ -173,10 +140,7 @@ Requires: python This package contains the Python bindings to clang (C language) frontend for LLVM. %prep -%setup -q -n %{name} -a1 -%ifarch x86_64 arm -mv lldb-%{version} tools/lldb -%endif +%setup -q -n %{name} %patch1 -p1 %patch2 -p1 %patch3 -p1 @@ -189,9 +153,6 @@ mv lldb-%{version} tools/lldb %patch8 -p1 %patch9 %patch10 -p1 -%ifarch x86_64 arm -%patch11 -p1 -%endif # We hardcode i586 rm tools/clang/test/Driver/x86_features.c @@ -340,7 +301,7 @@ ln -s lib lib64 %endif make check -#make clang-test +make clang-test %endif %endif @@ -432,9 +393,6 @@ mv utils/vim/README utils/vim/README.vim rm %{buildroot}%{_libdir}/BugpointPasses.* rm %{buildroot}%{_libdir}/LLVMHello.* rm %{buildroot}%{_libdir}/libgtest* -%ifarch x86_64 arm -rm %{buildroot}%{_libdir}/liblldb*.a -%endif rm %{buildroot}%{_mandir}/man1/lit.1 %fdupes -s %{buildroot}%{_docdir}/%{name} @@ -446,11 +404,6 @@ rm %{buildroot}%{_mandir}/man1/lit.1 %post -n libclang -p /sbin/ldconfig %postun -n libclang -p /sbin/ldconfig -%ifarch x86_64 arm -%post -n lldb -p /sbin/ldconfig -%postun -n lldb -p /sbin/ldconfig -%endif - %post clang-devel -p /sbin/ldconfig %postun clang-devel -p /sbin/ldconfig @@ -530,22 +483,6 @@ rm %{buildroot}%{_mandir}/man1/lit.1 %{_datadir}/%{name}/cmake/ %doc %{_docdir}/%{name} -%ifarch x86_64 arm -%files -n lldb -%defattr(-,root,root,-) -%{_libdir}/liblldb.so.* -%ifarch ppc64 -%{_libdir}/liblldb*.a -%endif -%{_bindir}/lldb* -%{_libdir}/python*/site-packages/lldb - -%files -n lldb-devel -%defattr(-,root,root,-) -%{_includedir}/lldb -%{_libdir}/liblldb.so -%endif - %files vim-plugins %defattr(-,root,root,-) %doc utils/vim/README.vim