[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-341-g7c1a980
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-341-g7c1a980
|
From: jscheer <js...@us...> - 2014-07-28 13:51:55
|
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 7c1a9800752e4320ba556f3e89d5367e7edcbf22 (commit)
from 1195fd803eb715aeacd780dd56b76016aa83396f (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 7c1a9800752e4320ba556f3e89d5367e7edcbf22
Author: Jeremie Scheer <jer...@ar...>
Date: Mon Jul 28 15:51:09 2014 +0200
[BUILDROOT] Add package Shiboken.
-----------------------------------------------------------------------
Summary of changes:
.../2013.11/219-shiboken-add_package.patch | 207 ++++++++++++++++++++
patches/buildroot/2013.11/cleanup_buildroot.sh | 1 +
2 files changed, 208 insertions(+), 0 deletions(-)
create mode 100644 patches/buildroot/2013.11/219-shiboken-add_package.patch
diff --git a/patches/buildroot/2013.11/219-shiboken-add_package.patch b/patches/buildroot/2013.11/219-shiboken-add_package.patch
new file mode 100644
index 0000000..ec3e418
--- /dev/null
+++ b/patches/buildroot/2013.11/219-shiboken-add_package.patch
@@ -0,0 +1,207 @@
+Add package Shiboken to Buildroot. This package is needed to compile PySide.
+
+Signed-off-by: Jérémie Scheer <jer...@ar...>
+
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2014-07-16 11:19:11.000000000 +0200
++++ buildroot/package/Config.in 2014-07-16 14:01:14.000000000 +0200
+@@ -434,6 +434,7 @@
+ source "package/python-setuptools/Config.in"
+ source "package/python-thrift/Config.in"
+ endmenu
++source "package/shiboken/Config.in"
+ endif
+ source "package/python3/Config.in"
+ source "package/ruby/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-16 13:59:35.000000000 +0200
+@@ -0,0 +1,10 @@
++config BR2_PACKAGE_SHIBOKEN
++ bool "Shiboken"
++ depends on BR2_PACKAGE_PYTHON
++ select BR2_PACKAGE_QT
++ select BR2_PACKAGE_LIBXML2
++ select BR2_PACKAGE_LIBXSLT
++ help
++ Shiboken generates bindings for C++ libraries using CPython source code.
++
++ https://pypi.python.org/pypi/Shiboken
+Index: buildroot/package/shiboken/shiboken.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/shiboken/shiboken.mk 2014-07-28 15:20:26.000000000 +0200
+@@ -0,0 +1,65 @@
++#############################################################
++#
++# Shiboken
++#
++#############################################################
++SHIBOKEN_VERSION = 1.2.2
++SHIBOKEN_SOURCE = shiboken-$(SHIBOKEN_VERSION).tar.bz2
++SHIBOKEN_SITE = download.qt-project.org/official_releases/pyside
++
++SHIBOKEN_DEPENDENCIES = python qt libxml2 libxslt host-shiboken
++HOST_SHIBOKEN_DEPENDENCIES = python qt libxml2 libxslt
++
++SHIBOKEN_INSTALL_STAGING = YES
++
++define HOST_SHIBOKEN_CONFIGURE_CMDS
++ (mkdir -p $(@D)/build && \
++ cd $(@D)/build && \
++ rm -f CMakeCache.txt && \
++ $(HOST_DIR)/usr/bin/cmake .. \
++ )
++endef
++
++define SHIBOKEN_CONFIGURE_CMDS
++ (mkdir -p $(@D)/build && \
++ cd $(@D)/build && \
++ mkdir -p $(@D)/build/generator && \
++ cp $(HOST_DIR)/usr/bin/shiboken $(@D)/build/generator/shiboken-x86 && \
++ rm -f CMakeCache.txt && \
++ $(SHIBOKEN_CONF_ENV) $(HOST_DIR)/usr/bin/cmake .. \
++ -DCMAKE_TOOLCHAIN_FILE="$(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake" \
++ -DCMAKE_INSTALL_PREFIX="/usr" \
++ $(SHIBOKEN_CONF_OPT) \
++ )
++endef
++
++define HOST_SHIBOKEN_BUILD_CMDS
++ (cd $(@D)/build && \
++ $(SHIBOKEN_MAKE) \
++ )
++endef
++
++define SHIBOKEN_BUILD_CMDS
++ (cd $(@D)/build && \
++ $(TARGET_MAKE_ENV) $(SHIBOKEN_MAKE_ENV) $(SHIBOKEN_MAKE) $(SHIBOKEN_MAKE_OPT) \
++ )
++endef
++
++define HOST_SHIBOKEN_INSTALL_CMDS
++ cp $(@D)/build/generator/shiboken $(HOST_DIR)/usr/bin
++endef
++
++define SHIBOKEN_INSTALL_STAGING_CMDS
++ (cd $(@D)/build && \
++ $(TARGET_MAKE_ENV) $(SHIBOKEN_MAKE_ENV) $(SHIBOKEN_MAKE) $(SHIBOKEN_MAKE_OPT) $(SHIBOKEN_INSTALL_STAGING_OPT) \
++ )
++endef
++
++define SHIBOKEN_INSTALL_TARGET_CMDS
++ (cd $(@D)/build && \
++ $(TARGET_MAKE_ENV) $(SHIBOKEN_MAKE_ENV) $(SHIBOKEN_MAKE) $(SHIBOKEN_MAKE_OPT) $(SHIBOKEN_INSTALL_TARGET_OPT) \
++ )
++endef
++
++$(eval $(autotools-package))
++$(eval $(host-autotools-package))
+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 15:21:13.000000000 +0200
+@@ -0,0 +1,40 @@
++Compile shiboken module with previously generated x86 generator
++
++Signed-off-by: Jérémie Scheer <jer...@ar...>
++---
++Index: shiboken-1.2.2/shibokenmodule/CMakeLists.txt
++===================================================================
++--- shiboken-1.2.2.orig/shibokenmodule/CMakeLists.txt
+++++ shiboken-1.2.2/shibokenmodule/CMakeLists.txt
++@@ -8,11 +8,19 @@
++ ${CMAKE_CURRENT_BINARY_DIR}/shiboken/shiboken_module_wrapper.cpp
++ )
++
++-add_custom_command(OUTPUT ${sample_SRC}
++-COMMAND ${shibokengenerator_BINARY_DIR}/shiboken --project-file=${CMAKE_CURRENT_BINARY_DIR}/shibokenmodule.txt ${GENERATOR_EXTRA_FLAGS}
++-WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
++-COMMENT "Running generator for 'shiboken'..."
++-)
+++if(EXISTS "${shibokengenerator_BINARY_DIR}/shiboken-x86")
+++ add_custom_command(OUTPUT ${sample_SRC}
+++ COMMAND ${shibokengenerator_BINARY_DIR}/shiboken-x86 --project-file=${CMAKE_CURRENT_BINARY_DIR}/shibokenmodule.txt ${GENERATOR_EXTRA_FLAGS}
+++ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+++ COMMENT "Running generator for 'shiboken'..."
+++ )
+++else()
+++ add_custom_command(OUTPUT ${sample_SRC}
+++ COMMAND ${shibokengenerator_BINARY_DIR}/shiboken --project-file=${CMAKE_CURRENT_BINARY_DIR}/shibokenmodule.txt ${GENERATOR_EXTRA_FLAGS}
+++ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+++ COMMENT "Running generator for 'shiboken'..."
+++ )
+++endif()
++
++ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
++ ${CMAKE_SOURCE_DIR}
++@@ -31,4 +39,4 @@
++
++ add_dependencies(shibokenmodule shiboken)
++
++-install(TARGETS shibokenmodule DESTINATION ${PYTHON_SITE_PACKAGES})
++\ No newline at end of file
+++install(TARGETS shibokenmodule DESTINATION ${PYTHON_SITE_PACKAGES})
+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 14:39:46.000000000 +0200
+@@ -0,0 +1,56 @@
++Find pthread_cancel method when compiling ApiExtractor and generator
++
++Signed-off-by: Jérémie Scheer <jer...@ar...>
++---
++Index: shiboken-1.2.2/ApiExtractor/CMakeLists.txt
++===================================================================
++--- shiboken-1.2.2.orig/ApiExtractor/CMakeLists.txt
+++++ shiboken-1.2.2/ApiExtractor/CMakeLists.txt
++@@ -91,7 +91,8 @@
++ )
++
++ add_library(apiextractor STATIC ${apiextractor_SRC} ${apiextractor_RCCS_SRC})
++-target_link_libraries(apiextractor ${APIEXTRACTOR_EXTRA_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTXMLPATTERNS_LIBRARY} ${QT_QTXML_LIBRARY})
+++find_package (Threads)
+++target_link_libraries(apiextractor ${APIEXTRACTOR_EXTRA_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTXMLPATTERNS_LIBRARY} ${QT_QTXML_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
++
++ if (BUILD_TESTS)
++ enable_testing()
++
++Index: shiboken-1.2.2/generator/CMakeLists.txt
++===================================================================
++--- shiboken-1.2.2.orig/generator/CMakeLists.txt
+++++ shiboken-1.2.2/generator/CMakeLists.txt
++@@ -27,10 +27,12 @@
++ add_executable(shiboken ${shiboken_SRC})
++ add_dependencies(shiboken apiextractor)
++ set_target_properties(shiboken PROPERTIES OUTPUT_NAME shiboken${shiboken_SUFFIX})
+++find_package (Threads)
++ target_link_libraries(shiboken
++ apiextractor
++ ${QT_QTCORE_LIBRARY}
++- ${QT_QTXML_LIBRARY})
+++ ${QT_QTXML_LIBRARY}
+++ ${CMAKE_THREAD_LIBS_INIT})
++
++ configure_file(shibokenconfig.h.in "${CMAKE_CURRENT_BINARY_DIR}/shibokenconfig.h" @ONLY)
++
++
++Index: shiboken-1.2.2/generator/shiboken/CMakeLists.txt
++===================================================================
++--- shiboken-1.2.2.orig/generator/shiboken/CMakeLists.txt
+++++ shiboken-1.2.2/generator/shiboken/CMakeLists.txt
++@@ -20,10 +20,12 @@
++
++ add_executable(shiboken ${shiboken_SRC})
++ set_target_properties(shiboken PROPERTIES OUTPUT_NAME shiboken${shiboken_SUFFIX})
+++find_package (Threads)
++ target_link_libraries(shiboken
++ ${APIEXTRACTOR_LIBRARY}
++ ${QT_QTCORE_LIBRARY}
++- ${QT_QTXML_LIBRARY})
+++ ${QT_QTXML_LIBRARY}
+++ ${CMAKE_THREAD_LIBS_INIT})
++
++ configure_file(shibokenconfig.h.in "${CMAKE_CURRENT_BINARY_DIR}/shibokenconfig.h" @ONLY)
++
diff --git a/patches/buildroot/2013.11/cleanup_buildroot.sh b/patches/buildroot/2013.11/cleanup_buildroot.sh
index 71ad2d9..b30ebe6 100755
--- a/patches/buildroot/2013.11/cleanup_buildroot.sh
+++ b/patches/buildroot/2013.11/cleanup_buildroot.sh
@@ -89,3 +89,4 @@ rm -rf buildroot/package/xc3sprog/
rm -rf buildroot/package/sam7-pgm-ng/
rm -rf buildroot/package/tk/
rm -rf buildroot/package/libhid/
+rm -rf buildroot/package/shiboken/
hooks/post-receive
--
armadeus
|
