[gentoo-commits] proj/mysql:master commit in: dev-db/myodbc/

["Brian Evans" <grknight@lavabit.com>]

commit:     84ce35afa95d41d6a0edbc4b1402b62b849a9790
Author:     Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Wed Jul 24 17:00:42 2013 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Wed Jul 24 17:00:42 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=84ce35af

[myodbc] Remove as-needed hack by adding a library to installer/CMakeLists.txt

Package-Manager: portage-2.1.12.2

---
 dev-db/myodbc/ChangeLog           | 3 +++
 dev-db/myodbc/myodbc-5.2.5.ebuild | 8 +++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/dev-db/myodbc/ChangeLog b/dev-db/myodbc/ChangeLog
index 5fd9f8c..0bc92e4 100644
--- a/dev-db/myodbc/ChangeLog
+++ b/dev-db/myodbc/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/dev-db/myodbc/ChangeLog,v 1.33 2013/05/10 08:17:39 patrick Exp $
 
+  24 Jul 2013; Brian Evans <grknight@lavabit.com> myodbc-5.2.5.ebuild:
+  [myodbc] Remove as-needed hack by adding a library to installer/CMakeLists.txt
+
   10 May 2013; Patrick Lauer <patrick@gentoo.org> myodbc-5.1.6.ebuild:
   Fix src_prepare
 

diff --git a/dev-db/myodbc/myodbc-5.2.5.ebuild b/dev-db/myodbc/myodbc-5.2.5.ebuild
index e31444e..7b16467 100644
--- a/dev-db/myodbc/myodbc-5.2.5.ebuild
+++ b/dev-db/myodbc/myodbc-5.2.5.ebuild
@@ -24,15 +24,13 @@ S=${WORKDIR}/${MY_P}
 # Careful!
 DRIVER_NAME="${PN}-${SLOT}"
 
-pkg_setup() {
-	# TODO: find out how to not have this and fix the CMake build
-	append-ldflags $(no-as-needed)
-}
-
 src_prepare() {
 	# Remove Tests
 	sed -i -e "s/ADD_SUBDIRECTORY(test)//" \
 		"${S}/CMakeLists.txt"
+	# Fix as-needed on the installer binary
+	echo "TARGET_LINK_LIBRARIES(myodbc-installer odbc)" >> "${S}/installer/CMakeLists.txt"
+	# Patch document path so it doesn't install files to /usr
 	epatch "${FILESDIR}/cmake-doc-path.patch"
 }