Hello community,
here is the log from the commit of package llvm6 for openSUSE:Factory checked
in at 2018-04-07 20:53:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/llvm6 (Old)
and /work/SRC/openSUSE:Factory/.llvm6.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "llvm6"
Sat Apr 7 20:53:29 2018 rev:2 rq:593934 version:6.0.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/llvm6/llvm6.changes 2018-03-28
10:31:39.384452214 +0200
+++ /work/SRC/openSUSE:Factory/.llvm6.new/llvm6.changes 2018-04-07
20:53:31.566058542 +0200
@@ -1,0 +2,10 @@
+Thu Apr 5 09:33:40 UTC 2018 - m...@suse.com
+
+- Do not export Polly static libraries which we do not distribute.
+ * Updated llvm-do-not-install-static-libraries.patch
+- Use external jsoncpp instead of the bundled one.
+ * Added polly-cmake-Trust-pkg-config-in-FindJsoncpp.patch
+- llvm6-devel must require llvm6-polly-devel
+ * Files in llvm6-devel reference Polly.
+
+-------------------------------------------------------------------
New:
----
polly-cmake-Trust-pkg-config-in-FindJsoncpp.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ llvm6.spec ++++++
--- /var/tmp/diff_new_pack.EvDd7X/_old 2018-04-07 20:53:36.701872658 +0200
+++ /var/tmp/diff_new_pack.EvDd7X/_new 2018-04-07 20:53:36.705872513 +0200
@@ -96,11 +96,13 @@
Patch14: llvm-do-not-install-static-libraries.patch
Patch15: opt-viewer-Do-not-require-python-2.patch
Patch16: n_clang_allow_BUILD_SHARED_LIBRARY.patch
+Patch17: polly-cmake-Trust-pkg-config-in-FindJsoncpp.patch
BuildRequires: binutils-devel >= 2.21.90
BuildRequires: binutils-gold
BuildRequires: cmake
BuildRequires: fdupes
BuildRequires: groff
+BuildRequires: jsoncpp-devel
BuildRequires: libstdc++-devel
BuildRequires: libtool
BuildRequires: ncurses-devel
@@ -160,6 +162,7 @@
Requires: libtool
Requires: llvm%{_sonum}-LTO-devel
Requires: llvm%{_sonum}-gold
+Requires: llvm%{_sonum}-polly-devel
Requires: ncurses-devel
Requires: pkgconfig
Requires: pkgconfig(libedit)
@@ -531,6 +534,10 @@
popd
%endif
+pushd polly-%{version}.src
+%patch17 -p1
+popd
+
# Move into right place
mv cfe-%{version}.src tools/clang
mv compiler-rt-%{version}.src projects/compiler-rt
@@ -723,7 +730,7 @@
-DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,--build-id=sha1" \
-DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python3 \
-DPOLLY_BUNDLED_ISL:BOOL=ON \
- -DPOLLY_BUNDLED_JSONCPP:BOOL=ON
+ -DPOLLY_BUNDLED_JSONCPP:BOOL=OFF
ninja -v %{?_smp_mflags}
cd ..
@@ -830,9 +837,6 @@
# XXX: FIXME we should put these in a sub-package
rm %{buildroot}%{_datadir}/clang/run-find-all-symbols.py
-# Polly static libraries (we only distribute LLVMPolly.so)
-rm %{buildroot}%{_libdir}/libPolly*.a
-
# Prepare for update-alternatives usage
mkdir -p %{buildroot}%{_sysconfdir}/alternatives
binfiles=( bugpoint llc lli \
++++++ llvm-do-not-install-static-libraries.patch ++++++
--- /var/tmp/diff_new_pack.EvDd7X/_old 2018-04-07 20:53:36.809868749 +0200
+++ /var/tmp/diff_new_pack.EvDd7X/_new 2018-04-07 20:53:36.809868749 +0200
@@ -69,3 +69,48 @@
endif()
if (NOT CMAKE_CONFIGURATION_TYPES)
add_llvm_install_targets(install-${name}
+Index: llvm-6.0.0.src/polly-6.0.0.src/cmake/polly_macros.cmake
+===================================================================
+--- llvm-6.0.0.src.orig/polly-6.0.0.src/cmake/polly_macros.cmake
++++ llvm-6.0.0.src/polly-6.0.0.src/cmake/polly_macros.cmake
+@@ -42,12 +42,22 @@ macro(add_polly_library name)
+ llvm_config(${name} ${LLVM_LINK_COMPONENTS})
+ endif( LLVM_LINK_COMPONENTS )
+ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ${name} STREQUAL "LLVMPolly")
+- install(TARGETS ${name}
+- EXPORT LLVMExports
+- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}
+- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX})
++ if (MODULE OR SHARED_LIBRARY)
++ install(TARGETS ${name}
++ EXPORT LLVMExports
++ LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}
++ ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX})
++ set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name})
++ else()
++ if(NOT LLVM_BUILD_LLVM_DYLIB)
++ install(TARGETS ${name}
++ EXPORT LLVMExports
++ LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}
++ ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX})
++ set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name})
++ endif()
++ endif()
+ endif()
+- set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name})
+ endmacro(add_polly_library)
+
+ macro(add_polly_loadable_module name)
+Index: llvm-6.0.0.src/polly-6.0.0.src/lib/CMakeLists.txt
+===================================================================
+--- llvm-6.0.0.src.orig/polly-6.0.0.src/lib/CMakeLists.txt
++++ llvm-6.0.0.src/polly-6.0.0.src/lib/CMakeLists.txt
+@@ -145,7 +145,7 @@ else ()
+ # hosts. This is not the case for bugpoint. Use
LLVM_POLLY_LINK_INTO_TOOLS=ON
+ # instead which will automatically resolve the additional dependencies by
+ # Polly.
+- target_link_libraries(LLVMPolly ${ISL_TARGET} ${JSONCPP_LIBRARIES})
++ target_link_libraries(LLVMPolly PRIVATE ${ISL_TARGET} ${JSONCPP_LIBRARIES})
+ if (GPU_CODEGEN)
+ target_link_libraries(LLVMPolly PollyPPCG)
+ endif ()
++++++ polly-cmake-Trust-pkg-config-in-FindJsoncpp.patch ++++++
>From d23e9b88671d72caffa970f6176fab09d381bfd9 Mon Sep 17 00:00:00 2001
From: Michal Srb <m...@suse.com>
Date: Thu, 5 Apr 2018 14:48:46 +0200
Subject: [PATCH] cmake: Trust pkg-config in FindJsoncpp.
If it says that the module was found, then accept it even if
JSONCPP_INCLUDE_DIRS or JSONCPP_CFLAGS are empty. They may be empty if jsoncpp
is installed in system directories.
---
cmake/FindJsoncpp.cmake | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/cmake/FindJsoncpp.cmake b/cmake/FindJsoncpp.cmake
index cee44d10..663288ca 100644
--- a/cmake/FindJsoncpp.cmake
+++ b/cmake/FindJsoncpp.cmake
@@ -1,6 +1,7 @@
find_package(PkgConfig QUIET)
if (PkgConfig_FOUND)
pkg_search_module(JSONCPP jsoncpp QUIET)
+ set(Jsoncpp_FOUND JSONCPP_FOUND)
# Get the libraries full paths, to be consistent with find_library().
set(fulllibs)
@@ -38,10 +39,10 @@ else ()
find_library(JSONCPP_LIBRARY NAMES jsoncpp)
mark_as_advanced(JSONCPP_LIBRARY)
set(JSON_LIBRARIES ${JSON_LIBRARY})
-endif ()
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Jsoncpp DEFAULT_MSG JSONCPP_INCLUDE_DIRS
JSONCPP_LIBRARIES JSONCPP_DEFINITIONS)
+ include(FindPackageHandleStandardArgs)
+ find_package_handle_standard_args(Jsoncpp DEFAULT_MSG JSONCPP_INCLUDE_DIRS
JSONCPP_LIBRARIES JSONCPP_DEFINITIONS)
+endif ()
if (Jsoncpp_FOUND)
add_library(jsoncpp INTERFACE IMPORTED)
--
2.13.6
