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 3F7F81381F3 for ; Wed, 24 Jul 2013 17:01:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1CDA2E0A52; Wed, 24 Jul 2013 17:01:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A5FC9E0A52 for ; Wed, 24 Jul 2013 17:01:00 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 85A0833E974 for ; Wed, 24 Jul 2013 17:00:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 06587E5458 for ; Wed, 24 Jul 2013 17:00:58 +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: <1374685242.84ce35afa95d41d6a0edbc4b1402b62b849a9790.grknight.pub@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: dev-db/myodbc/ X-VCS-Repository: proj/mysql X-VCS-Files: dev-db/myodbc/ChangeLog dev-db/myodbc/myodbc-5.2.5.ebuild X-VCS-Directories: dev-db/myodbc/ X-VCS-Committer: grknight.pub X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 84ce35afa95d41d6a0edbc4b1402b62b849a9790 X-VCS-Branch: master Date: Wed, 24 Jul 2013 17:00:58 +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: 70a51d0b-5b51-4b04-a65d-2c79923ddcd5 X-Archives-Hash: fd5891dced068b829d55461ee385a923 commit: 84ce35afa95d41d6a0edbc4b1402b62b849a9790 Author: Brian Evans lavabit com> AuthorDate: Wed Jul 24 17:00:42 2013 +0000 Commit: Brian Evans lavabit 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 myodbc-5.2.5.ebuild: + [myodbc] Remove as-needed hack by adding a library to installer/CMakeLists.txt + 10 May 2013; Patrick Lauer 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" }