aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-dbs/soci/soci
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2017-10-26 13:35:24 -0700
committerArmin Kuster <akuster808@gmail.com>2018-03-01 16:10:35 -0800
commit6aa73bc881b0d52220e5a5869cc911dd974bab1e (patch)
tree72791861c42ab9ae9000524936e10fc7c74ce72b /meta-oe/recipes-dbs/soci/soci
parent3710a1ce7aa4cc30e830a6bf4570c83392fc930e (diff)
downloadmeta-openembedded-6aa73bc881b0d52220e5a5869cc911dd974bab1e.tar.gz
soci: move to recipes-dbs
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe/recipes-dbs/soci/soci')
-rw-r--r--meta-oe/recipes-dbs/soci/soci/soci_libdir.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/meta-oe/recipes-dbs/soci/soci/soci_libdir.patch b/meta-oe/recipes-dbs/soci/soci/soci_libdir.patch
new file mode 100644
index 000000000..00a1a5c86
--- /dev/null
+++ b/meta-oe/recipes-dbs/soci/soci/soci_libdir.patch
@@ -0,0 +1,28 @@
+Define SOCI_LIBDIR only if its not passed via environemnt. In OE we
+want to set it per our choice since we use 'lib' for 64bit unless we
+are using multilib
+
+-Khem
+
+Index: soci-3.2.2/CMakeLists.txt
+===================================================================
+--- soci-3.2.2.orig/CMakeLists.txt
++++ soci-3.2.2/CMakeLists.txt
+@@ -69,11 +69,12 @@ include(SociDependencies)
+ ###############################################################################
+ # Installation
+ ###############################################################################
+-
+-if(APPLE OR CMAKE_SIZEOF_VOID_P EQUAL 4)
+- set(SOCI_LIBDIR "lib")
+-else()
+- set(SOCI_LIBDIR "lib64")
++if(NOT DEFINED SOCI_LIBDIR)
++ if(APPLE OR CMAKE_SIZEOF_VOID_P EQUAL 4)
++ set(SOCI_LIBDIR "lib")
++ else()
++ set(SOCI_LIBDIR "lib")
++ endif()
+ endif()
+
+ set(BINDIR "bin" CACHE PATH "The directory to install binaries into.")