diff options
| -rw-r--r-- | meta-oe/recipes-dbs/soci/soci/soci_libdir.patch | 28 |
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 @@ | |||
| 1 | Define SOCI_LIBDIR only if its not passed via environemnt. In OE we | ||
| 2 | want to set it per our choice since we use 'lib' for 64bit unless we | ||
| 3 | are using multilib | ||
| 4 | |||
| 5 | -Khem | ||
| 6 | |||
| 7 | Index: 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.") | ||