]> git.webhop.me Git - bs-cst-neutrino-hd.git/commitdiff
add forgotten OpenThreads patches
authorMarkham <markham001@gmx.de>
Tue, 23 May 2017 10:44:14 +0000 (12:44 +0200)
committerMarkham <markham001@gmx.de>
Tue, 23 May 2017 10:44:14 +0000 (12:44 +0200)
archive-patches/openthreads-add-cached-settings-for-gccs-atomic-builtins.patch [new file with mode: 0644]
archive-patches/openthreads-replaced-openthreads.pc-with-openthreads.pc.in.patch [new file with mode: 0644]

diff --git a/archive-patches/openthreads-add-cached-settings-for-gccs-atomic-builtins.patch b/archive-patches/openthreads-add-cached-settings-for-gccs-atomic-builtins.patch
new file mode 100644 (file)
index 0000000..c4300ed
--- /dev/null
@@ -0,0 +1,42 @@
+From 5b16f5cfb7dfd1f55bf4530cb02db79bf913da0c Mon Sep 17 00:00:00 2001
+From: "[CST] Bas" <bas@coolstreamtech.com>
+Date: Fri, 8 Nov 2013 00:30:50 +0800
+Subject: [PATCH] openthreads: add cached settings for gccs atomic builtins.
+ add it with -C option when calling cmake.
+
+---
+ cached/TryRunResults.cmake |   22 ++++++++++++++++++++++
+ 1 files changed, 22 insertions(+), 0 deletions(-)
+ create mode 100644 cached/TryRunResults.cmake
+
+diff --git a/cached/TryRunResults.cmake b/cached/TryRunResults.cmake
+new file mode 100644
+index 0000000..aa55d10
+--- /dev/null
++++ b/cached/TryRunResults.cmake
+@@ -0,0 +1,22 @@
++# This file was generated by CMake because it detected TRY_RUN() commands
++# in crosscompiling mode. It will be overwritten by the next CMake run.
++# Copy it to a safe location, set the variables to appropriate values
++# and use it then to preset the CMake cache (using -C).
++
++
++# _OPENTHREADS_ATOMIC_USE_GCC_BUILTINS_EXITCODE
++#    indicates whether the executable would have been able to run on its
++#    target platform. If so, set _OPENTHREADS_ATOMIC_USE_GCC_BUILTINS_EXITCODE to
++#    the exit code (in many cases 0 for success), otherwise enter "FAILED_TO_RUN".
++# The _OPENTHREADS_ATOMIC_USE_GCC_BUILTINS_COMPILED variable holds the build result for this TRY_RUN().
++# 
++# Source file   : /home/bas/coolstream/cst-private-apollo-sdk/open_source_archive/linux/build/uclibc_4.5.2/openthreads-cst/CMakeFiles/CMakeTmp/src.cxx
++# Executable    : /home/bas/coolstream/cst-private-apollo-sdk/open_source_archive/linux/build/uclibc_4.5.2/openthreads-cst/CMakeFiles/cmTryCompileExec-_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS_EXITCODE
++# Run arguments : 
++#    Called from: [2] /home/bas/coolstream/cst-private-apollo-sdk/open_source_archive/linux/build/uclibc_4.5.2/openthreads-cst/CMakeModules/CheckAtomicOps.cmake
++#                 [1] /home/bas/coolstream/cst-private-apollo-sdk/open_source_archive/linux/build/uclibc_4.5.2/openthreads-cst/src/OpenThreads/CMakeLists.txt
++
++SET( _OPENTHREADS_ATOMIC_USE_GCC_BUILTINS_EXITCODE 
++     0
++     CACHE INT 0 FORCE)
++
+-- 
+1.7.6.4
+
diff --git a/archive-patches/openthreads-replaced-openthreads.pc-with-openthreads.pc.in.patch b/archive-patches/openthreads-replaced-openthreads.pc-with-openthreads.pc.in.patch
new file mode 100644 (file)
index 0000000..3c2a879
--- /dev/null
@@ -0,0 +1,50 @@
+This patch is a combination of:
+
+From e48901ccbea766b28762835adb05188384997f85 Mon Sep 17 00:00:00 2001
+From: robert <robert@16af8721-9629-0410-8352-f15c8da7e697>
+Date: Sat, 7 Feb 2009 08:24:36 +0000
+Subject: [PATCH] Replaced openthreads.pc with openthreads.pc.in
+git-svn-id: http://www.openscenegraph.org/svn/osg/OpenThreads/trunk@9700 16af8721-9629-0410-8352-f15c8da7e697
+
+and
+
+From 3fc58bd58d1aabb1aa6ff7d410128eb8c00e622d Mon Sep 17 00:00:00 2001
+From: robert <robert@16af8721-9629-0410-8352-f15c8da7e697>
+Date: Sat, 7 Feb 2009 08:26:41 +0000
+Subject: [PATCH] Renamed pkg_config directory to pkgconfig to keep consistent with core OSG
+
+git-svn-id: http://www.openscenegraph.org/svn/osg/OpenThreads/trunk@9701 16af8721-9629-0410-8352-f15c8da7e697
+
+modified by bellum
+---
+ .../{openthreads.pc => openthreads.pc.in}          |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+ rename packaging/pkg_config/{openthreads.pc => openthreads.pc.in} (70%)
+
+diff --git a/packaging/pkg_config/openthreads.pc b/packaging/pkg_config/openthreads.pc.in
+similarity index 70%
+rename from packaging/pkg_config/openthreads.pc
+rename to packaging/pkgconfig/openthreads.pc.in
+index cdf0309..efe72b7 100644
+--- a/packaging/pkg_config/openthreads.pc
++++ b/packaging/pkgconfig/openthreads.pc.in
+@@ -1,13 +1,13 @@
+ # pkg-config source file
+-prefix=/usr
++prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=${exec_prefix}/lib@LIB_POSTFIX@
+ includedir=${prefix}/include
+ Name: openthreads
+ Description: Object-Oriented (OO) thread interface for C++ programmers
+-Version: 2.3.0
++Version: @OPENTHREADS_VERSION@
+ Requires:
+ Conflicts:
+ Libs: -L${libdir} -lOpenThreads
+-- 
+1.7.6.4
+