From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-958183-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id D0FCA139694
for <garchives@archives.gentoo.org>; Wed, 28 Jun 2017 17:41:07 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 04D8DE0BF6;
Wed, 28 Jun 2017 17:40:59 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id D3277E0BF6
for <gentoo-commits@lists.gentoo.org>; Wed, 28 Jun 2017 17:40:58 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 63FD63417C3
for <gentoo-commits@lists.gentoo.org>; Wed, 28 Jun 2017 17:40:57 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id CD78E7466
for <gentoo-commits@lists.gentoo.org>; Wed, 28 Jun 2017 17:40:55 +0000 (UTC)
From: "Brian Evans" <grknight@gentoo.org>
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" <grknight@gentoo.org>
Message-ID: <1498671647.7a0a7707d4f44865a4f33dfbecf37eb0195c8676.grknight@gentoo>
Subject: [gentoo-commits] proj/mysql-extras:master commit in: /
X-VCS-Repository: proj/mysql-extras
X-VCS-Files: 20018_all_mariadb-10.2.6-without-clientlibs-tools.patch
X-VCS-Directories: /
X-VCS-Committer: grknight
X-VCS-Committer-Name: Brian Evans
X-VCS-Revision: 7a0a7707d4f44865a4f33dfbecf37eb0195c8676
X-VCS-Branch: master
Date: Wed, 28 Jun 2017 17:40:55 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 41cc2d3a-63ea-49e5-a24f-d9fb4318ddeb
X-Archives-Hash: 4358cb799fa5507e6cd9ef43b9e2e1b4
commit: 7a0a7707d4f44865a4f33dfbecf37eb0195c8676
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 28 17:40:47 2017 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Jun 28 17:40:47 2017 +0000
URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=7a0a7707
Enable static-lib building for 10.2.6-without-libs-tools when tools are built
20018_all_mariadb-10.2.6-without-clientlibs-tools.patch | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/20018_all_mariadb-10.2.6-without-clientlibs-tools.patch b/20018_all_mariadb-10.2.6-without-clientlibs-tools.patch
index 0ddf031..c063b76 100644
--- a/20018_all_mariadb-10.2.6-without-clientlibs-tools.patch
+++ b/20018_all_mariadb-10.2.6-without-clientlibs-tools.patch
@@ -86,10 +86,10 @@ diff -aurN a/libmariadb/libmariadb/CMakeLists.txt b/libmariadb/libmariadb/CMakeL
-ADD_LIBRARY(mariadbclient STATIC ${mariadbclient_RC} ${MARIADB_OBJECTS} ${EMPTY_FILE} mariadbclient.def)
-TARGET_LINK_LIBRARIES(mariadbclient ${SYSTEM_LIBS})
-+IF(ENABLE_STATIC_LIBS)
++IF(ENABLE_STATIC_LIBS OR NOT WITHOUT_TOOLS)
+ ADD_LIBRARY(mariadbclient STATIC ${mariadbclient_RC} ${MARIADB_OBJECTS} ${EMPTY_FILE} mariadbclient.def)
+ TARGET_LINK_LIBRARIES(mariadbclient ${SYSTEM_LIBS})
-+ENDIF(ENABLE_STATIC_LIBS)
++ENDIF(ENABLE_STATIC_LIBS OR NOT WITHOUT_TOOLS)
ADD_LIBRARY(libmariadb SHARED ${libmariadb_RC} ${MARIADB_OBJECTS} ${EMPTY_FILE} mariadbclient.def)
TARGET_LINK_LIBRARIES(libmariadb ${SYSTEM_LIBS})
@@ -97,9 +97,9 @@ diff -aurN a/libmariadb/libmariadb/CMakeLists.txt b/libmariadb/libmariadb/CMakeL
TARGET_LINK_LIBRARIES (libmariadb "-Wl,--version-script=${CC_BINARY_DIR}/libmariadb/mariadbclient.def")
ENDIF()
-+IF(ENABLE_STATIC_LIBS)
++IF(ENABLE_STATIC_LIBS OR NOT WITHOUT_TOOLS)
SET_TARGET_PROPERTIES(mariadbclient PROPERTIES IMPORTED_INTERFACE_LINK_LIBRARIES "${SYSTEM_LIBS}")
-+ENDIF(ENABLE_STATIC_LIBS)
++ENDIF(ENABLE_STATIC_LIBS OR NOT WITHOUT_TOOLS)
SET_TARGET_PROPERTIES(libmariadb PROPERTIES IMPORTED_INTERFACE_LINK_LIBRARIES "${SYSTEM_LIBS}")
SET_TARGET_PROPERTIES(libmariadb PROPERTIES PREFIX "")