Hello community,
here is the log from the commit of package extra-cmake-modules for
openSUSE:Factory checked in at 2018-03-20 21:43:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/extra-cmake-modules (Old)
and /work/SRC/openSUSE:Factory/.extra-cmake-modules.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "extra-cmake-modules"
Tue Mar 20 21:43:02 2018 rev:51 rq:586799 version:5.44.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/extra-cmake-modules/extra-cmake-modules.changes
2018-02-16 21:28:54.877212085 +0100
+++
/work/SRC/openSUSE:Factory/.extra-cmake-modules.new/extra-cmake-modules.changes
2018-03-20 21:44:40.063582758 +0100
@@ -1,0 +2,16 @@
+Mon Mar 12 23:29:40 CET 2018 - lbeltr...@kde.org
+
+- Update to 5.44.0
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/kde-frameworks-5.44.0.php
+- Changes since 5.43.0:
+ * Define __ANDROID_API__
+ * Fix readelf command name on x86
+ * Remove obsolete policy settings
+ * Extend search path for NDK dependencies
+ * Set ANDROID in the Android toolchain file
+ * Fix include path for x86 targets
+ * Android toolchain: add ANDROID_COMPILER_PREFIX variable.
+
+-------------------------------------------------------------------
Old:
----
extra-cmake-modules-5.43.0.tar.xz
New:
----
extra-cmake-modules-5.44.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ extra-cmake-modules.spec ++++++
--- /var/tmp/diff_new_pack.NXreku/_old 2018-03-20 21:44:41.515530500 +0100
+++ /var/tmp/diff_new_pack.NXreku/_new 2018-03-20 21:44:41.519530356 +0100
@@ -16,7 +16,7 @@
#
-%define _tar_path 5.43
+%define _tar_path 5.44
# Full KF5 version (e.g. 5.33.0)
%{!?_kf5_version: %global _kf5_version %{version}}
# Last major and minor KF5 version (e.g. 5.33)
@@ -27,7 +27,7 @@
%bcond_with doc
%endif
Name: extra-cmake-modules
-Version: 5.43.0
+Version: 5.44.0
Release: 0
Summary: CMake modules
License: BSD-3-Clause
++++++ extra-cmake-modules-5.43.0.tar.xz -> extra-cmake-modules-5.44.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.43.0/CMakeLists.txt
new/extra-cmake-modules-5.44.0/CMakeLists.txt
--- old/extra-cmake-modules-5.43.0/CMakeLists.txt 2018-02-03
13:21:06.000000000 +0100
+++ new/extra-cmake-modules-5.44.0/CMakeLists.txt 2018-03-03
10:48:12.000000000 +0100
@@ -32,7 +32,7 @@
# Preliminary setup
#
-set(VERSION "5.43.0") # handled by release scripts
+set(VERSION "5.44.0") # handled by release scripts
if (POLICY CMP0048)
cmake_policy(SET CMP0048 NEW)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.43.0/toolchain/Android.cmake
new/extra-cmake-modules-5.44.0/toolchain/Android.cmake
--- old/extra-cmake-modules-5.43.0/toolchain/Android.cmake 2018-02-03
13:21:06.000000000 +0100
+++ new/extra-cmake-modules-5.44.0/toolchain/Android.cmake 2018-03-03
10:48:12.000000000 +0100
@@ -39,6 +39,9 @@
# ``ANDROID_TOOLCHAIN``
# The toolchain to use. See the ``toolchains`` directory of the NDK.
# Default: ``arm-linux-androideabi``.
+# ``ANDROID_COMPILER_PREFIX``
+# The prefix for the gcc and g++ executables. See the
``toolchains/$ANDROID_TOOLCHAIN/prebuilt/*/bin/*-gcc`` in the NDK.
+# Default: ``arm-linux-androideabi``.
# ``ANDROID_ABI``
# The ABI to use. See the ``sources/cxx-stl/gnu-libstdc++/*/libs``
# directories in the NDK. Default: ``armeabi-v7a``.
@@ -137,6 +140,7 @@
set(ANDROID_SDK_ROOT "$ENV{ANDROID_SDK_ROOT}" CACHE path "Android SDK path")
set(ANDROID_ARCHITECTURE "arm" CACHE string "Used Architecture, related to the
ABI and TOOLCHAIN")
set(ANDROID_TOOLCHAIN "arm-linux-androideabi" CACHE string "Used SDK")
+set(ANDROID_COMPILER_PREFIX "arm-linux-androideabi" CACHE string "Prefix for
gcc/g++/etc")
set(ANDROID_ABI "armeabi-v7a" CACHE string "Used ABI")
set(ANDROID_GCC_VERSION "4.9" CACHE string "Used GCC version" )
set(ANDROID_API_LEVEL "14" CACHE string "Android API Level")
@@ -147,9 +151,6 @@
get_filename_component(_CMAKE_ANDROID_DIR "${CMAKE_TOOLCHAIN_FILE}" PATH)
-cmake_policy(SET CMP0011 OLD)
-cmake_policy(SET CMP0017 OLD)
-
set(CMAKE_SYSROOT
"${ANDROID_NDK}/platforms/android-${ANDROID_API_LEVEL}/arch-${ANDROID_ARCHITECTURE}")
if(NOT EXISTS ${CMAKE_SYSROOT})
@@ -159,11 +160,12 @@
#actual code
SET(CMAKE_SYSTEM_NAME Android)
SET(CMAKE_SYSTEM_VERSION 1)
+SET(ANDROID TRUE)
if (NOT DEFINED ECM_ADDITIONAL_FIND_ROOT_PATH)
SET(ECM_ADDITIONAL_FIND_ROOT_PATH ${CMAKE_PREFIX_PATH})
endif()
-SET(CMAKE_FIND_ROOT_PATH ${ANDROID_NDK} ${ECM_ADDITIONAL_FIND_ROOT_PATH})
+SET(CMAKE_FIND_ROOT_PATH ${ANDROID_NDK} ${ANDROID_NDK}/sysroot
${CMAKE_SYSROOT} ${ECM_ADDITIONAL_FIND_ROOT_PATH})
SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
@@ -178,7 +180,7 @@
"${ANDROID_LIBS_ROOT}/include/"
"${ANDROID_LIBS_ROOT}/libs/${ANDROID_ABI}/include"
"${ANDROID_NDK}/sysroot/usr/include"
- "${ANDROID_NDK}/sysroot/usr/include/${ANDROID_TOOLCHAIN}"
+ "${ANDROID_NDK}/sysroot/usr/include/${ANDROID_COMPILER_PREFIX}"
)
# libraries
@@ -203,8 +205,8 @@
link_directories(${CMAKE_SYSTEM_LIBRARY_PATH})
-set(CMAKE_C_COMPILER "${ANDROID_TOOLCHAIN_ROOT}/${ANDROID_TOOLCHAIN}-gcc")
-set(CMAKE_CXX_COMPILER "${ANDROID_TOOLCHAIN_ROOT}/${ANDROID_TOOLCHAIN}-g++")
+set(CMAKE_C_COMPILER
"${ANDROID_TOOLCHAIN_ROOT}/${ANDROID_COMPILER_PREFIX}-gcc")
+set(CMAKE_CXX_COMPILER
"${ANDROID_TOOLCHAIN_ROOT}/${ANDROID_COMPILER_PREFIX}-g++")
set(CMAKE_EXE_LINKER_FLAGS "${GNUSTL_SHARED}
-Wl,-rpath-link,${ANDROID_LIBRARIES_PATH} -llog -lz -lm -ldl -lc -lgcc" CACHE
STRING "")
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}" CACHE STRING "")
@@ -215,8 +217,8 @@
"<CMAKE_CXX_COMPILER> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LINK_FLAGS>
<CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <SONAME_FLAG><TARGET_SONAME> -o
<TARGET> <OBJECTS> <LINK_LIBRARIES>"
)
-# needed for Qt to define Q_OS_ANDROID
-add_definitions(-DANDROID)
+# ANDROID is needed for Qt to define Q_OS_ANDROID, __ANDROID_API__ is expected
by the Android NDK
+add_definitions(-DANDROID -D__ANDROID_API__=${ANDROID_API_LEVEL})
set(ECM_DIR "${CMAKE_CURRENT_LIST_DIR}/../cmake" CACHE STRING "")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.43.0/toolchain/deployment-file.json.in
new/extra-cmake-modules-5.44.0/toolchain/deployment-file.json.in
--- old/extra-cmake-modules-5.43.0/toolchain/deployment-file.json.in
2018-02-03 13:21:06.000000000 +0100
+++ new/extra-cmake-modules-5.44.0/toolchain/deployment-file.json.in
2018-03-03 10:48:12.000000000 +0100
@@ -3,7 +3,7 @@
"sdk": "@ANDROID_SDK_ROOT@",
"ndk": "@ANDROID_NDK@",
"toolchain-prefix": "@ANDROID_TOOLCHAIN@",
- "tool-prefix": "@ANDROID_TOOLCHAIN@",
+ "tool-prefix": "@ANDROID_COMPILER_PREFIX@",
"toolchain-version": "@ANDROID_GCC_VERSION@",
"ndk-host": "@_HOST@",
"target-architecture": "@ANDROID_ABI@",
