summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2023-05-24 09:52:42 +0200
committerKhem Raj <raj.khem@gmail.com>2023-05-24 07:23:55 -0700
commit18e44b3c6e96b7094d588735d043a8f5f313ffce (patch)
treec8d809b1ff39ef56e98c7db9093e8cd0ab10874d
parent8c8943590c9f7b820c8117e1bbf8036e97572065 (diff)
downloadmeta-openembedded-18e44b3c6e96b7094d588735d043a8f5f313ffce.tar.gz
soci: remove unused soci_libdir.patch
* it was removed from SRC_URI in: https://git.openembedded.org/meta-openembedded/commit/?id=01cd7fcae16edde709d24f905a222dcaea8fb0a1 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-dbs/soci/soci/soci_libdir.patch28
1 files changed, 0 insertions, 28 deletions
diff --git a/meta-oe/recipes-dbs/soci/soci/soci_libdir.patch b/meta-oe/recipes-dbs/soci/soci/soci_libdir.patch
deleted file mode 100644
index 00a1a5c862..0000000000
--- a/meta-oe/recipes-dbs/soci/soci/soci_libdir.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1Define SOCI_LIBDIR only if its not passed via environemnt. In OE we
2want to set it per our choice since we use 'lib' for 64bit unless we
3are using multilib
4
5-Khem
6
7Index: soci-3.2.2/CMakeLists.txt
8===================================================================
9--- soci-3.2.2.orig/CMakeLists.txt
10+++ soci-3.2.2/CMakeLists.txt
11@@ -69,11 +69,12 @@ include(SociDependencies)
12 ###############################################################################
13 # Installation
14 ###############################################################################
15-
16-if(APPLE OR CMAKE_SIZEOF_VOID_P EQUAL 4)
17- set(SOCI_LIBDIR "lib")
18-else()
19- set(SOCI_LIBDIR "lib64")
20+if(NOT DEFINED SOCI_LIBDIR)
21+ if(APPLE OR CMAKE_SIZEOF_VOID_P EQUAL 4)
22+ set(SOCI_LIBDIR "lib")
23+ else()
24+ set(SOCI_LIBDIR "lib")
25+ endif()
26 endif()
27
28 set(BINDIR "bin" CACHE PATH "The directory to install binaries into.")