[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-347-g0308252
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-347-g0308252
|
From: jscheer <js...@us...> - 2014-07-29 12:42:08
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 0308252ab0e971a59a07f377f8212829434953e3 (commit)
from 9244433cb1f280a6d0ac94155b91c849e644bfdc (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 0308252ab0e971a59a07f377f8212829434953e3
Author: Jeremie Scheer <jer...@ar...>
Date: Tue Jul 29 14:41:17 2014 +0200
[BUILDROOT] Fix shiboken configuration directory in config files.
-----------------------------------------------------------------------
Summary of changes:
.../2013.11/219-shiboken-add_package.patch | 70 ++++++++++++++++++--
1 files changed, 63 insertions(+), 7 deletions(-)
diff --git a/patches/buildroot/2013.11/219-shiboken-add_package.patch b/patches/buildroot/2013.11/219-shiboken-add_package.patch
index 0f6b916..b817ad0 100644
--- a/patches/buildroot/2013.11/219-shiboken-add_package.patch
+++ b/patches/buildroot/2013.11/219-shiboken-add_package.patch
@@ -4,8 +4,8 @@ Signed-off-by: Jérémie Scheer <jer...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2014-07-28 15:48:16.000000000 +0200
-+++ buildroot/package/Config.in 2014-07-28 17:03:50.000000000 +0200
+--- buildroot.orig/package/Config.in 2014-07-28 17:07:50.000000000 +0200
++++ buildroot/package/Config.in 2014-07-29 12:10:49.000000000 +0200
@@ -434,6 +434,7 @@
source "package/python-setuptools/Config.in"
source "package/python-thrift/Config.in"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/shiboken/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/shiboken/Config.in 2014-07-28 17:02:53.000000000 +0200
++++ buildroot/package/shiboken/Config.in 2014-07-28 17:07:50.000000000 +0200
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_SHIBOKEN
+ bool "Shiboken"
@@ -35,8 +35,8 @@ Index: buildroot/package/shiboken/Config.in
Index: buildroot/package/shiboken/shiboken.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/shiboken/shiboken.mk 2014-07-28 16:53:10.000000000 +0200
-@@ -0,0 +1,65 @@
++++ buildroot/package/shiboken/shiboken.mk 2014-07-29 12:11:18.000000000 +0200
+@@ -0,0 +1,73 @@
+#############################################################
+#
+# Shiboken
@@ -51,6 +51,14 @@ Index: buildroot/package/shiboken/shiboken.mk
+
+SHIBOKEN_INSTALL_STAGING = YES
+
++define SHIBOKEN_SET_CONFIG_PATH
++ $(SED) "s:STAGING_DIR:$(STAGING_DIR):" $(@D)/data/ShibokenConfig.cmake.in
++ $(SED) "s:STAGING_DIR:$(STAGING_DIR):g" $(@D)/data/ShibokenConfig-spec.cmake.in
++ $(SED) "s:HOST_DIR:$(HOST_DIR):" $(@D)/data/ShibokenConfig-spec.cmake.in
++endef
++
++SHIBOKEN_POST_PATCH_HOOKS += SHIBOKEN_SET_CONFIG_PATH
++
+define HOST_SHIBOKEN_CONFIGURE_CMDS
+ (mkdir -p $(@D)/build && \
+ cd $(@D)/build && \
@@ -105,7 +113,7 @@ Index: buildroot/package/shiboken/shiboken.mk
Index: buildroot/package/shiboken/shiboken-1.2.2-compile_module_with_host_shiboken_generator.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/shiboken/shiboken-1.2.2-compile_module_with_host_shiboken_generator.patch 2014-07-28 16:53:10.000000000 +0200
++++ buildroot/package/shiboken/shiboken-1.2.2-compile_module_with_host_shiboken_generator.patch 2014-07-28 17:07:50.000000000 +0200
@@ -0,0 +1,40 @@
+Compile shiboken module with previously generated x86 generator
+
@@ -150,7 +158,7 @@ Index: buildroot/package/shiboken/shiboken-1.2.2-compile_module_with_host_shibok
Index: buildroot/package/shiboken/shiboken-1.2.2-fix_pthread_cancel_compile.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/shiboken/shiboken-1.2.2-fix_pthread_cancel_compile.patch 2014-07-28 16:53:10.000000000 +0200
++++ buildroot/package/shiboken/shiboken-1.2.2-fix_pthread_cancel_compile.patch 2014-07-28 17:07:50.000000000 +0200
@@ -0,0 +1,56 @@
+Find pthread_cancel method when compiling ApiExtractor and generator
+
@@ -208,3 +216,51 @@ Index: buildroot/package/shiboken/shiboken-1.2.2-fix_pthread_cancel_compile.patc
+
+ configure_file(shibokenconfig.h.in "${CMAKE_CURRENT_BINARY_DIR}/shibokenconfig.h" @ONLY)
+
+Index: buildroot/package/shiboken/shiboken-1.2.2-fix_shiboken_config_dir.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/shiboken/shiboken-1.2.2-fix_shiboken_config_dir.patch 2014-07-29 12:10:36.000000000 +0200
+@@ -0,0 +1,43 @@
++Fix directory where shiboken searches configuration.
++
++Signed-off-by: Jérémie Scheer <jer...@ar...>
++---
++Index: shiboken-1.2.2/data/ShibokenConfig.cmake.in
++===================================================================
++--- shiboken-1.2.2.orig/data/ShibokenConfig.cmake.in
+++++ shiboken-1.2.2/data/ShibokenConfig.cmake.in
++@@ -2,4 +2,4 @@
++ message(STATUS "Using default python: @PYTHON_SUFFIX@")
++ SET(PYTHON_SUFFIX @PYTHON_SUFFIX@)
++ endif()
++-include(@LIB_INSTALL_DIR@/cmake/Shiboken-@shiboken_VERSION@/ShibokenConfig${PYTHON_SUFFIX}.cmake)
+++include(STAGING_DIR/@LIB_INSTALL_DIR@/cmake/Shiboken-@shiboken_VERSION@/ShibokenConfig${PYTHON_SUFFIX}.cmake)
++
++Index: shiboken-1.2.2/data/ShibokenConfig-spec.cmake.in
++===================================================================
++--- shiboken-1.2.2.orig/data/ShibokenConfig-spec.cmake.in
+++++ shiboken-1.2.2/data/ShibokenConfig-spec.cmake.in
++@@ -5,7 +5,7 @@
++ # SHIBOKEN_PYTHON_INTERPRETER - Python interpreter (regular or debug) to be used with the bindings.
++ # SHIBOKEN_PYTHON_LIBRARIES - Python libraries (regular or debug) Shiboken is linked against.
++
++-SET(SHIBOKEN_INCLUDE_DIR "@CMAKE_INSTALL_PREFIX@/include/shiboken@shiboken_SUFFIX@")
+++SET(SHIBOKEN_INCLUDE_DIR "STAGING_DIR/@CMAKE_INSTALL_PREFIX@/include/shiboken@shiboken_SUFFIX@")
++ if(MSVC)
++ SET(SHIBOKEN_LIBRARY "@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX@shiboken@shiboken_SUFFIX@@PYTHON_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@.lib")
++ elseif(CYGWIN)
++@@ -13,7 +13,7 @@
++ elseif(WIN32)
++ SET(SHIBOKEN_LIBRARY "@CMAKE_INSTALL_PREFIX@/bin/@CMAKE_SHARED_LIBRARY_PREFIX@shiboken@shiboken_SUFFIX@@PYTHON_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@")
++ else()
++- SET(SHIBOKEN_LIBRARY "@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX@shiboken@shiboken_SUFFIX@@PYTHON_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@")
+++ SET(SHIBOKEN_LIBRARY "STAGING_DIR/@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX@shiboken@shiboken_SUFFIX@@PYTHON_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@")
++ endif()
++ SET(SHIBOKEN_PYTHON_INCLUDE_DIR "@SBK_PYTHON_INCLUDE_DIR@")
++ SET(SHIBOKEN_PYTHON_INCLUDE_DIR "@SBK_PYTHON_INCLUDE_DIR@")
++@@ -23,4 +23,4 @@
++ message(STATUS "libshiboken built for @SHIBOKEN_BUILD_TYPE@")
++ @SBK_ADD_PY_DEBUG_DEFINITION@
++
++-set(SHIBOKEN_BINARY "@CMAKE_INSTALL_PREFIX@/bin/@SHIBOKEN_GENERATOR@")
+++set(SHIBOKEN_BINARY "HOST_DIR/@CMAKE_INSTALL_PREFIX@/bin/@SHIBOKEN_GENERATOR@")
hooks/post-receive
--
armadeus
|
