From mboxrd@z Thu Jan 1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
by finch.gentoo.org with esmtp (Exim 4.60)
(envelope-from <gentoo-commits+bounces-327326-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1Q1Umt-0007lu-5C
for garchives@archives.gentoo.org; Mon, 21 Mar 2011 02:24:07 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 731021C044;
Mon, 21 Mar 2011 02:23:58 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 2EF491C044
for <gentoo-commits@lists.gentoo.org>; Mon, 21 Mar 2011 02:23:58 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
(using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id A91A91B4119
for <gentoo-commits@lists.gentoo.org>; Mon, 21 Mar 2011 02:23:57 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id 1AF898006A
for <gentoo-commits@lists.gentoo.org>; Mon, 21 Mar 2011 02:23:57 +0000 (UTC)
From: "Jorge Manuel B. S. Vicetto" <jmbsvicetto@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Jorge Manuel B. S. Vicetto" <jmbsvicetto@gentoo.org>
Message-ID: <f9463d3a4f099e50de509b56ed6aba3c776073d9.jmbsvicetto@gentoo>
Subject: [gentoo-commits] proj/mysql-extras:master commit in: /
X-VCS-Repository: proj/mysql-extras
X-VCS-Files: 00000_index.txt 02040_all_embedded-library-shared-5.5.10.patch
X-VCS-Directories: /
X-VCS-Committer: jmbsvicetto
X-VCS-Committer-Name: Jorge Manuel B. S. Vicetto
X-VCS-Revision: f9463d3a4f099e50de509b56ed6aba3c776073d9
Date: Mon, 21 Mar 2011 02:23:57 +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
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt:
X-Archives-Hash: 687c7498b249d361106802e1693ef548
commit: f9463d3a4f099e50de509b56ed6aba3c776073d9
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> ge=
ntoo <DOT> org>
AuthorDate: Mon Mar 21 02:22:05 2011 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org=
>
CommitDate: Mon Mar 21 02:22:05 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/mysql-extras.=
git;a=3Dcommit;h=3Df9463d3a
Added a revised patch from upstream ( http://lists.mysql.com/commits/1023=
73 ) to get a shared libmysqld.
This is still not fixed on upstream's tree.
---
00000_index.txt | 5 +++
02040_all_embedded-library-shared-5.5.10.patch | 45 ++++++++++++++++++=
++++++
2 files changed, 50 insertions(+), 0 deletions(-)
diff --git a/00000_index.txt b/00000_index.txt
index 1940250..83cb229 100644
--- a/00000_index.txt
+++ b/00000_index.txt
@@ -286,6 +286,11 @@
@pn mysql
@@ Take libmysqld to be a proper shared library.
=20
+@patch 02040_all_embedded-library-shared-5.5.10.patch
+@ver 5.05.10.00 to 5.05.99.99
+@pn mysql
+@@ Take libmysqld to be a proper shared library.
+
@patch 02040_all_embedded-library-shared-maria-5.1.50.patch
@ver 5.01.50.00 to 5.01.52.99
@pn mariadb
diff --git a/02040_all_embedded-library-shared-5.5.10.patch b/02040_all_e=
mbedded-library-shared-5.5.10.patch
new file mode 100644
index 0000000..df4a55d
--- /dev/null
+++ b/02040_all_embedded-library-shared-5.5.10.patch
@@ -0,0 +1,45 @@
+=3D=3D=3D modified file 'cmake/libutils.cmake'
+--- a/cmake/libutils.cmake 2010-01-26 12:47:34 +0000
++++ b/cmake/libutils.cmake 2010-03-04 21:19:38 +0000
+@@ -268,6 +268,16 @@ MACRO(MERGE_LIBRARIES)
+ MYSQL_INSTALL_TARGETS(${TARGET} DESTINATION "${INSTALL_LIBDIR}" ${C=
OMP})
+ ENDIF()
+ SET_TARGET_PROPERTIES(${TARGET} PROPERTIES LINK_INTERFACE_LIBRARIES "=
")
++
++ IF(ARG_SHARED AND LINK_FLAG_NO_UNDEFINED)
++ # Do not allow undefined symbols in shared libraries
++ GET_TARGET_PROPERTY(TARGET_LINK_FLAGS ${TARGET} LINK_FLAGS)
++ IF(NOT TARGET_LINK_FLAGS)
++ SET(TARGET_LINK_FLAGS)
++ ENDIF()
++ SET_TARGET_PROPERTIES(${TARGET} PROPERTIES LINK_FLAGS=20
++ "${TARGET_LINK_FLAGS} ${LINK_FLAG_NO_UNDEFINED}")
++ ENDIF()=20
+ ENDMACRO()
+=20
+ FUNCTION(GET_DEPENDEND_OS_LIBS target result)
+
+=3D=3D=3D modified file 'libmysqld/CMakeLists.txt'
+--- a/libmysqld/CMakeLists.txt 2010-02-20 19:40:03 +0000
++++ b/libmysqld/CMakeLists.txt 2010-03-04 21:19:38 +0000
+@@ -138,7 +138,17 @@ IF(MSVC)
+ ${CMAKE_STATIC_LIBRARY_PREFIX}mysqld-debug)
+ ENDIF()
+=20
+-IF(MSVC AND NOT DISABLE_SHARED)
+- MERGE_LIBRARIES(libmysqld SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIO=
NS}
+- COMPONENT Embedded)
++IF(NOT DISABLE_SHARED)
++ MERGE_LIBRARIES(libmysqld SHARED mysqlserver EXPORTS ${CLIENT_API_FUN=
CTIONS})
++ IF(UNIX)
++ # Name the shared library, handle versioning (provides same api as =
client library
++ # hence the same version)
++ SET_TARGET_PROPERTIES(libmysqld PROPERTIES=20
++ OUTPUT_NAME mysqld=20
++ VERSION "${SHARED_LIB_MAJOR_VERSION}.0.0"=20
++ SOVERSION "${SHARED_LIB_MAJOR_VERSION}")
++ # Clean direct output flags, as 2 targets have the same base name (=
libmysqld)
++ SET_TARGET_PROPERTIES(libmysqld PROPERTIES CLEAN_DIRECT_OUTPUT 1)
++ SET_TARGET_PROPERTIES(mysqlserver PROPERTIES CLEAN_DIRECT_OUTPUT 1)
++ ENDIF()
+ ENDIF()