Date: Sun, 22 Apr 2018 16:24:09 +0000 (UTC) From: Mahdi Mokhtari <mmokhi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r468035 - in head/databases/mysql57-client: . files Message-ID: <201804221624.w3MGO9gn061500@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mmokhi Date: Sun Apr 22 16:24:08 2018 New Revision: 468035 URL: https://svnweb.freebsd.org/changeset/ports/468035 Log: 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 <john@saltant.com> Sponsored by: Netzkommune GmbH Added: head/databases/mysql57-client/files/patch-libmysql_authentication__ldap_CMakeLists.txt (contents, props changed) Modified: head/databases/mysql57-client/Makefile Modified: head/databases/mysql57-client/Makefile ============================================================================== --- head/databases/mysql57-client/Makefile Sun Apr 22 15:25:48 2018 (r468034) +++ head/databases/mysql57-client/Makefile Sun Apr 22 16:24:08 2018 (r468035) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mysql -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= 57-client COMMENT= Multithreaded SQL database (client) Added: head/databases/mysql57-client/files/patch-libmysql_authentication__ldap_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysql57-client/files/patch-libmysql_authentication__ldap_CMakeLists.txt Sun Apr 22 16:24:08 2018 (r468035) @@ -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 ()
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804221624.w3MGO9gn061500>