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 ) id 1QZV9O-000774-Pk for garchives@archives.gentoo.org; Wed, 22 Jun 2011 21:39:55 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A36D81C038; Wed, 22 Jun 2011 21:39:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 659C31C038 for ; Wed, 22 Jun 2011 21:39:47 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E686C2AC01B for ; Wed, 22 Jun 2011 21:39:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 30E008003C for ; Wed, 22 Jun 2011 21:39:46 +0000 (UTC) From: "Stelian Ionescu" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Stelian Ionescu" Message-ID: Subject: [gentoo-commits] proj/lisp:master commit in: dev-lisp/clsql/ X-VCS-Repository: proj/lisp X-VCS-Files: dev-lisp/clsql/clsql-5.3.2.ebuild dev-lisp/clsql/clsql-5.3.4.ebuild X-VCS-Directories: dev-lisp/clsql/ X-VCS-Committer: fenlix X-VCS-Committer-Name: Stelian Ionescu X-VCS-Revision: e592bcc4dbbea7eb98ae8931565b858645f9f4de Date: Wed, 22 Jun 2011 21:39:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: d5ce8a46cea94c0c5eb448c4540c4d86 commit: e592bcc4dbbea7eb98ae8931565b858645f9f4de Author: Stelian Ionescu cddr org> AuthorDate: Wed Jun 22 21:27:17 2011 +0000 Commit: Stelian Ionescu cddr org> CommitDate: Wed Jun 22 21:27:17 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/lisp.git;a=3D= commit;h=3De592bcc4 dev-lisp/clsql: bump to 5.3.4 --- .../{clsql-5.3.2.ebuild =3D> clsql-5.3.4.ebuild} | 26 ++++++++++++= ++----- 1 files changed, 19 insertions(+), 7 deletions(-) diff --git a/dev-lisp/clsql/clsql-5.3.2.ebuild b/dev-lisp/clsql/clsql-5.3= .4.ebuild similarity index 74% rename from dev-lisp/clsql/clsql-5.3.2.ebuild rename to dev-lisp/clsql/clsql-5.3.4.ebuild index aa1f9c2..a8a8aff 100644 --- a/dev-lisp/clsql/clsql-5.3.2.ebuild +++ b/dev-lisp/clsql/clsql-5.3.4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ =20 EAPI=3D3 -inherit common-lisp-3 eutils multilib +inherit common-lisp-3 eutils toolchain-funcs flag-o-matic multilib =20 DESCRIPTION=3D"A multi-platform SQL interface for Common Lisp" HOMEPAGE=3D"http://clsql.b9.com/ @@ -20,8 +20,7 @@ DEPEND=3D"mysql? ( virtual/mysql )" RDEPEND=3D"${DEPEND} !dev-lisp/cl-sql dev-lisp/md5 - >=3Ddev-lisp/uffi-1.5.7 - >=3Ddev-lisp/uffi-0.10.5 + >=3Ddev-lisp/uffi-2.0.0 oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:0 ) @@ -33,10 +32,23 @@ src_prepare() { sed -i 's,"usr" "lib","usr" "'$(get_libdir)'",g' "${S}"/${PN}-{mysql,uf= fi}.asd } =20 +@cc() { + local cc=3D$(tc-getCC) + echo "${cc}" "${@}" + "${cc}" "${@}" +} + src_compile() { - make -C uffi || die "Cannot build UFFI helper library" + strip-flags + @cc uffi/clsql_uffi.c \ + ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -rdynamic \ + -fPIC -DPIC -shared -Wl,-soname=3Dclsql_uffi -o uffi/clsql_uffi.so \ + || die "Cannot build UFFI helper library" if use mysql; then - make -C db-mysql || die "Cannot build foreign glue to libmysql" + @cc db-mysql/clsql_mysql.c \ + ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} $(mysql_config --cflags) -rdynamic \ + -fPIC -DPIC -shared -Wl,-soname=3Dclsql_mysql -o db-mysql/clsql_mysql= .so \ + || die "Cannot build foreign glue to libmysqlclient" fi } =20 @@ -55,7 +67,7 @@ src_install() { =20 common-lisp-install-sources uffi/*.lisp common-lisp-install-asdf ${PN}-{uffi,cffi} - exeinto /usr/$(get_libdir)/${PN} ; doexe uffi/${PN}_uffi*.so + exeinto /usr/$(get_libdir)/${PN} ; doexe uffi/${PN}_uffi.so =20 install_clsql_pkg postgresql-socket use postgres && install_clsql_pkg postgresql