[PATCH] stop building libllvmopencl.so which is no longer used since 0.14

Gbp-Pq: Name 1001-stop-building-libllvmopencl.so-which-is-no-longer-us.patch

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3da10e19279dfb7e7d8bad4dd2859b6e3c348004..959dbfad1bc592e2b648d1ea8fd470b1f1280d75 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -338,7 +338,7 @@ endif()
 # for libpocl.so
 set(POCL_INSTALL_PUBLIC_LIBDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}" CACHE PATH "POCL public libdir")
 
-# for llvmopencl.so
+# for libpocl-devices-*.so
 set(POCL_INSTALL_PRIVATE_LIBDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pocl" CACHE PATH "POCL private libdir")
 
 # for pocl.icd

diff --git a/lib/llvmopencl/CMakeLists.txt b/lib/llvmopencl/CMakeLists.txt
index c106b0f2d0d50dcdee333b70931b4a05b5f6b9b5..875705075a40336d11e2946b9cf84b073dcd8c60 100644 (file)
--- a/lib/llvmopencl/CMakeLists.txt
+++ b/lib/llvmopencl/CMakeLists.txt
@@ -101,20 +101,6 @@ endif(MSVC)
 add_library("llvmpasses" OBJECT ${LLVMPASSES_SOURCES})
 harden("llvmpasses")
 
-# This creates a separate llvmopencl.so that is loaded to 'opt'
-# for the pocl-workgroup version.
-#pkglib_LTLIBRARIES = llvmopencl.la
-add_library("llvmopencl" MODULE "$<TARGET_OBJECTS:llvmpasses>")
-harden("llvmopencl")
-
-# not sure where other platforms get their library linkage list, probably there is
-# way to make this more consistent on different platforms
-if(MSVC)
-  target_link_libraries("llvmopencl" ${POCL_LLVM_LIBS})
-endif(MSVC)
-
-#target_link_libraries("llvmopencl" "${LLVM_SYSLIBS}")
- 
 # TODO cmake should handle this, i might me missing something …
 if(APPLE)
   set(ADD_LD_FLAGS "-Wl,-undefined -Wl,dynamic_lookup ")
@@ -122,22 +108,6 @@ else()
   set(ADD_LD_FLAGS "-Wl,-export-dynamic")
 endif()
 
-# TODO ENABLE_EXPORTS -> Wl,export_dynamic
-# https://www.cmake.org/cmake/help/v2.8.12/cmake.html#prop_tgt:ENABLE_EXPORTS
-# https://www.cmake.org/pipermail/cmake/2011-November/047708.html
-set_target_properties("llvmopencl" PROPERTIES LINK_FLAGS "${LLVM_LDFLAGS} ${ADD_LD_FLAGS}")
-if(NOT APPLE)
-  set_target_properties("llvmopencl" PROPERTIES SOVERSION "${KERNEL_COMPILER_LIB_VERSION}" VERSION "${KERNEL_COMPILER_LIB_VERSION}")
-endif()
-
-install(TARGETS "llvmopencl"
-        LIBRARY DESTINATION ${POCL_INSTALL_PRIVATE_LIBDIR}
-        COMPONENT "lib"
-        ARCHIVE DESTINATION ${POCL_INSTALL_PRIVATE_LIBDIR}/static
-        COMPONENT "dev"
-)
-
 if(ENABLE_IPO)
   set_property(TARGET "llvmpasses" PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE)
-  set_property(TARGET "llvmopencl" PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE)
 endif()