From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A7F7C1388B6 for ; Sat, 25 Oct 2014 02:42:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C26D4E07E6; Sat, 25 Oct 2014 02:42:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6704CE07E6 for ; Sat, 25 Oct 2014 02:42:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ED386340340 for ; Sat, 25 Oct 2014 02:42:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 32EA18ADE for ; Sat, 25 Oct 2014 02:42:30 +0000 (UTC) From: "Brian Evans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Evans" Message-ID: <1414204941.98ba1e33ae957b70ac94eca60a5721db16268bcc.grknight@gentoo> Subject: [gentoo-commits] proj/mysql-extras:master commit in: / X-VCS-Repository: proj/mysql-extras X-VCS-Files: 00000_index.txt 20015_all_mariadb-pkgconfig-location.patch X-VCS-Directories: / X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 98ba1e33ae957b70ac94eca60a5721db16268bcc X-VCS-Branch: master Date: Sat, 25 Oct 2014 02:42:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e93d1c2d-0adc-4f1b-b31e-aab2321ffb0b X-Archives-Hash: 973dd3e6e6911d25114863fb3fc3e343 commit: 98ba1e33ae957b70ac94eca60a5721db16268bcc Author: Brian Evans tuffmail com> AuthorDate: Sat Oct 25 02:42:21 2014 +0000 Commit: Brian Evans gentoo org> CommitDate: Sat Oct 25 02:42:21 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=98ba1e33 Fix mariadb 10.1 pkgconfig location --- 00000_index.txt | 5 +++++ 20015_all_mariadb-pkgconfig-location.patch | 12 ++++++++++++ 2 files changed, 17 insertions(+) diff --git a/00000_index.txt b/00000_index.txt index f4811aa..92da09a 100644 --- a/00000_index.txt +++ b/00000_index.txt @@ -1766,3 +1766,8 @@ @ver 10.01.01.00 to 10.99.99.99 @pn mariadb @@ Remove magic dependencies on lz4 and lzo + +@patch 20015_all_mariadb-pkgconfig-location.patch +@ver 10.01.01.00 to 10.99.99.99 +@pn mariadb +@@ Allow mariadb.pc to be installed in libdir instead of sharedir diff --git a/20015_all_mariadb-pkgconfig-location.patch b/20015_all_mariadb-pkgconfig-location.patch new file mode 100644 index 0000000..24e391e --- /dev/null +++ b/20015_all_mariadb-pkgconfig-location.patch @@ -0,0 +1,12 @@ +diff -aruN mysql.orig/support-files/CMakeLists.txt mysql/support-files/CMakeLists.txt +--- mysql.orig/support-files/CMakeLists.txt 2014-10-24 22:18:52.144297645 -0400 ++++ mysql/support-files/CMakeLists.txt 2014-10-24 22:37:51.303410675 -0400 +@@ -62,7 +62,7 @@ + ENDIF() + + CONFIGURE_FILE(mariadb.pc.in ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc @ONLY) +- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc DESTINATION ${INSTALL_SHAREDIR}/pkgconfig COMPONENT Development) ++ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc DESTINATION ${INSTALL_LIBDIR}/pkgconfig COMPONENT Development) + + INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development) +