libical: Upgrade 1.0.0 -> 1.0.1

PATCH Superseded Maxin B. John 1 participant 1 message Dec 7, 2015

lore

Share & tools

lore

Maxin B. John

author

2015-12-07 15:54 UTC #0 lore raw

PATCH 1/1 libical: Upgrade 1.0.0 -> 1.0.1

From: Jussi Kukkonen <[email protected]>

* Build system changed to cmake.
* Patch build system to not check for perl (we use host perl which won't be found)

Signed-off-by Jussi Kukkonen <[email protected]>

Signed-off-by Maxin B. John <[email protected]>

---
 .../libical/Remove-cmake-check-for-Perl.patch      | 45 ++++++++++++++++++++++
 .../libical/{libical_1.0.0.bb => libical_1.0.1.bb} | 12 ++++--
 2 files changed, 53 insertions(+), 4 deletions(-)
 create mode 100644 meta/recipes-support/libical/libical/Remove-cmake-check-for-Perl.patch
 rename meta/recipes-support/libical/{libical_1.0.0.bb => libical_1.0.1.bb} (61%)

meta/recipes-support/libical/libical/Remove-cmake-check-for-Perl.patch new file +45 -0

new file mode 100644
index 0000000..11cffbb
@@ -0,0 +1,45 @@
+Subject: [PATCH] Remove cmake check for Perl
+
+We set "CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY" in cmake bbclass to
+make sure cmake does not find host programs. In this case we actually
+are fine with host perl: remove the check.
+
+Also fix the x32 ABI build.
+
+Inappropriate [workaround]
+
+Signed-off-by: Jussi Kukkonen <[email protected]>
+Signed-off-by: Maxin B. John <[email protected]>
+---
+diff -Naur libical-1.0.1-orig/CMakeLists.txt libical-1.0.1/CMakeLists.txt
+--- libical-1.0.1-orig/CMakeLists.txt	2014-10-09 18:07:05.000000000 +0300
++++ libical-1.0.1/CMakeLists.txt	2015-12-07 17:19:52.519081963 +0200
+@@ -91,8 +91,11 @@
+   set(LIBRARY_TYPE SHARED)
+ endif()
+ 
+-# must have Perl to create the derived stuff
+-find_package(Perl REQUIRED)
++set(PERL_EXECUTABLE perl)
++# Ensure finding 64bit libs when using 64-bit compilers
++if(CMAKE_CL_64)
++  set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS True)
++endif()
+ 
+ # MSVC specific definitions
+ if(WIN32)
+@@ -105,10 +108,10 @@
+   add_definitions(-DBIG_ENDIAN=0 -DLITTLE_ENDIAN=1 -DBYTE_ORDER=BIG_ENDIAN)
+ endif()
+ 
+-set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)")
+-set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE STRING "Library directory name" FORCE)
+-set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE STRING "Include directory name" FORCE)
+-set(SHARE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share" CACHE STRING "Share directory name" FORCE)
++include(GNUInstallDirs)
++set(LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR} CACHE STRING "Library directory name" FORCE)
++set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE STRING "Include directory name" FORCE)
++set(SHARE_INSTALL_DIR ${CMAKE_INSTALL_DATAROOTDIR} CACHE STRING "Share directory name")
+ 
+ # set the output paths
+ set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)

meta/recipes-support/libical/libical_1.0.1.bb renamed from meta/recipes-support/libical/libical_1.0.0.bb +8 -4

similarity index 61%
rename from meta/recipes-support/libical/libical_1.0.0.bb
rename to meta/recipes-support/libical/libical_1.0.1.bb
index be6b635..7dcb9eb 100644
@@ -6,8 +6,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d4fc58309d8ed46587ac63bb449d82f8 \
                     file://LICENSE;md5=d1a0891cd3e582b3e2ec8fe63badbbb6"
 SECTION = "libs"
 
-SRC_URI = "https://github.com/${BPN}/${BPN}/archive/v${PV}.tar.gz"
-SRC_URI[md5sum] = "f4b8e33ae5efb2f025eb43ce69682a36"
-SRC_URI[sha256sum] = "0072e83834092315772e6719b85fc8b11530b1ff53f4d108315fb38cddbce8c2"
+SRC_URI = "https://github.com/${BPN}/${BPN}/archive/v${PV}.tar.gz \
+           file://Remove-cmake-check-for-Perl.patch \
+           "
+SRC_URI[md5sum] = "af91db06b22559f863869c5a382ad08a"
+SRC_URI[sha256sum] = "7d5f613454ec6c7d1bcfb441c919215be53292aa15cd1cb14249d1413d6c610c"
 
-inherit autotools
+inherit cmake
+
+FILES_${PN}-dev += "${libdir}/cmake/*"

Signature · 1 line

2.4.0