From owner-svn-ports-head@freebsd.org Sun Apr 22 16:24:09 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A0AFFFAC150; Sun, 22 Apr 2018 16:24:09 +0000 (UTC) (envelope-from mmokhi@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 524E17BBE1; Sun, 22 Apr 2018 16:24:09 +0000 (UTC) (envelope-from mmokhi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4D1FA18272; Sun, 22 Apr 2018 16:24:09 +0000 (UTC) (envelope-from mmokhi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3MGO9Gr061504; Sun, 22 Apr 2018 16:24:09 GMT (envelope-from mmokhi@FreeBSD.org) Received: (from mmokhi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3MGO9gn061500; Sun, 22 Apr 2018 16:24:09 GMT (envelope-from mmokhi@FreeBSD.org) Message-Id: <201804221624.w3MGO9gn061500@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mmokhi set sender to mmokhi@FreeBSD.org using -f From: Mahdi Mokhtari Date: Sun, 22 Apr 2018 16:24:09 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: mmokhi X-SVN-Commit-Paths: in head/databases/mysql57-client: . files X-SVN-Commit-Revision: 468035 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Apr 2018 16:24:09 -0000 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 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 ()