| Brad Bishop | 0f291cc | 2019-09-01 15:16:57 -0400 | [diff] [blame] | 1 | From fb9164bbca5b425f1cf1bb3cac51d06afe81938a Mon Sep 17 00:00:00 2001 |
| 2 | From: Piotr Tworek <tworaz@tworaz.net> |
| 3 | Date: Wed, 14 Aug 2019 00:47:59 +0200 |
| 4 | Subject: [PATCH 6/7] Dont add /usr/lib to LDFLAGS when linking libphonenumber. |
| 5 | |
| 6 | This will refer to host lib dir which is not what we want. |
| 7 | |
| 8 | Upstream-Status: Inappropriate [configuration] |
| 9 | |
| 10 | Signed-off-by: Piotr Tworek <tworaz@tworaz.net> |
| 11 | --- |
| 12 | cmake/modules/FindPhonenumber.cmake | 6 ++---- |
| 13 | 1 file changed, 2 insertions(+), 4 deletions(-) |
| 14 | |
| 15 | diff --git a/cmake/modules/FindPhonenumber.cmake b/cmake/modules/FindPhonenumber.cmake |
| 16 | index 04d1056..70c0c41 100644 |
| 17 | --- a/cmake/modules/FindPhonenumber.cmake |
| 18 | +++ b/cmake/modules/FindPhonenumber.cmake |
| 19 | @@ -37,12 +37,10 @@ string(TOUPPER "${WITH_PHONENUMBER}" optupper) |
| 20 | if(("${optupper}" STREQUAL "ON") OR ("${substr}" STREQUAL "${CMAKE_BINARY_DIR}")) |
| 21 | set(WITH_PHONENUMBER "ON") |
| 22 | set(PHONENUMBER_INCLUDE_DIRS "${INCLUDE_INSTALL_DIR}") |
| 23 | - set(PHONENUMBER_LIB_DIRS ${LIB_INSTALL_DIR}) |
| 24 | - set(PHONENUMBER_LDFLAGS -L${PHONENUMBER_LIB_DIRS} ${PHONENUMBER_LDFLAGS}) |
| 25 | + set(PHONENUMBER_LDFLAGS ${PHONENUMBER_LDFLAGS}) |
| 26 | else(("${optupper}" STREQUAL "ON") OR ("${substr}" STREQUAL "${CMAKE_BINARY_DIR}")) |
| 27 | set(PHONENUMBER_INCLUDE_DIRS "${WITH_PHONENUMBER}/include") |
| 28 | - set(PHONENUMBER_LIB_DIRS ${WITH_PHONENUMBER}/lib${LIB_SUFFIX}) |
| 29 | - set(PHONENUMBER_LDFLAGS -L${PHONENUMBER_LIB_DIRS} ${PHONENUMBER_LDFLAGS}) |
| 30 | + set(PHONENUMBER_LDFLAGS ${PHONENUMBER_LDFLAGS}) |
| 31 | endif(("${optupper}" STREQUAL "ON") OR ("${substr}" STREQUAL "${CMAKE_BINARY_DIR}")) |
| 32 | |
| 33 | unset(bindirlen) |
| 34 | -- |
| 35 | 2.21.0 |
| 36 | |