From 2a7c73522986f4f7ed89416a6855703770751e35 Mon Sep 17 00:00:00 2001 From: Mahdi Mokhtari Date: Sun, 22 Apr 2018 16:24:08 +0000 Subject: [PATCH] databases/mysql57-client: Fix build with 10.x default compiler/linker The upstream seems merged our local-patches but added a -R flag to its `c++` [actually ld] command. The -R $DIR is like -rpath on 11.x and CURRENT bases but not on 10.x We then use -rpath to make sure it works on all supported bases. Reported by: John W. O'Brien Sponsored by: Netzkommune GmbH --- databases/mysql57-client/Makefile | 2 +- ...patch-libmysql_authentication__ldap_CMakeLists.txt | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 databases/mysql57-client/files/patch-libmysql_authentication__ldap_CMakeLists.txt diff --git a/databases/mysql57-client/Makefile b/databases/mysql57-client/Makefile index a2553e6dc223..75a0e5c3557e 100644 --- a/databases/mysql57-client/Makefile +++ b/databases/mysql57-client/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mysql -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= 57-client COMMENT= Multithreaded SQL database (client) diff --git a/databases/mysql57-client/files/patch-libmysql_authentication__ldap_CMakeLists.txt b/databases/mysql57-client/files/patch-libmysql_authentication__ldap_CMakeLists.txt new file mode 100644 index 000000000000..843885b37cc7 --- /dev/null +++ b/databases/mysql57-client/files/patch-libmysql_authentication__ldap_CMakeLists.txt @@ -0,0 +1,11 @@ +--- libmysql/authentication_ldap/CMakeLists.txt.orig 2018-03-04 13:40:40 UTC ++++ libmysql/authentication_ldap/CMakeLists.txt +@@ -54,7 +54,7 @@ ENDIF() + IF (CMAKE_SYSTEM_NAME MATCHES "SunOS") + SET(SASL_LIBRARY "sasl") + ELSEIF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") +- SET(SASL_LIBRARY "-L/usr/local/lib -R/usr/local/lib -lsasl2") ++ SET(SASL_LIBRARY "-L/usr/local/lib -rpath /usr/local/lib -lsasl2") + ELSE() + SET(SASL_LIBRARY "sasl2") + ENDIF ()