diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-07-12 23:37:31 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-07-12 23:37:31 +0000 |
| commit | 5ad03d4e5d9594bd8d8ef30128087f55a7c786b4 (patch) | |
| tree | 968ea7fef1e08e0221260e884d684b6aa5412712 /dev-lisp | |
| parent | Version bump thanks to Alec M. (bug #327967). (diff) | |
| download | gentoo-2-5ad03d4e5d9594bd8d8ef30128087f55a7c786b4.tar.gz gentoo-2-5ad03d4e5d9594bd8d8ef30128087f55a7c786b4.tar.bz2 gentoo-2-5ad03d4e5d9594bd8d8ef30128087f55a7c786b4.zip | |
Respect environment CC, CFLAGS and LDFLAGS. Fix installation with multilib-strict.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'dev-lisp')
| -rw-r--r-- | dev-lisp/cl-ssl/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-lisp/cl-ssl/cl-ssl-0.2.2004.01.04.ebuild | 21 | ||||
| -rw-r--r-- | dev-lisp/cl-ssl/files/cl-ssl-0.2.2004.01.04-Makefile.patch | 11 |
3 files changed, 32 insertions, 9 deletions
diff --git a/dev-lisp/cl-ssl/ChangeLog b/dev-lisp/cl-ssl/ChangeLog index 0ccdd6eba1b4..7447ea1f5b7e 100644 --- a/dev-lisp/cl-ssl/ChangeLog +++ b/dev-lisp/cl-ssl/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-lisp/cl-ssl -# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-ssl/ChangeLog,v 1.7 2008/03/27 16:27:41 armin76 Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-ssl/ChangeLog,v 1.8 2010/07/12 23:37:30 ssuominen Exp $ + + 12 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> + cl-ssl-0.2.2004.01.04.ebuild, +files/cl-ssl-0.2.2004.01.04-Makefile.patch: + Respect environment CC, CFLAGS and LDFLAGS. Fix installation with + multilib-strict. 27 Mar 2008; Raúl Porcel <armin76@gentoo.org> cl-ssl-0.2.2004.01.04.ebuild: diff --git a/dev-lisp/cl-ssl/cl-ssl-0.2.2004.01.04.ebuild b/dev-lisp/cl-ssl/cl-ssl-0.2.2004.01.04.ebuild index 0ac2ccb4a425..4e97971aeb30 100644 --- a/dev-lisp/cl-ssl/cl-ssl-0.2.2004.01.04.ebuild +++ b/dev-lisp/cl-ssl/cl-ssl-0.2.2004.01.04.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-ssl/cl-ssl-0.2.2004.01.04.ebuild,v 1.8 2008/03/27 16:27:41 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-ssl/cl-ssl-0.2.2004.01.04.ebuild,v 1.9 2010/07/12 23:37:30 ssuominen Exp $ -inherit common-lisp +inherit common-lisp eutils multilib toolchain-funcs DEB_PV= @@ -11,7 +11,7 @@ HOMEPAGE="http://packages.debian.org/unstable/devel/cl-ssl" SRC_URI="mirror://gentoo/cl-ssl_${PV/.2004/+cvs.2004}.tar.gz" LICENSE="LLGPL-2.1" SLOT="0" -KEYWORDS="x86 ~amd64 ~ppc" +KEYWORDS="~amd64 ~ppc x86" IUSE="" DEPEND="dev-libs/openssl dev-lisp/cl-uffi" @@ -20,15 +20,22 @@ CLPACKAGE=cl-ssl S=${WORKDIR}/${PN}-${PV/.2004/+cvs.2004} +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-Makefile.patch +} + src_compile() { - make -C cl-ssl linux || die + tc-export CC + emake -C cl-ssl linux || die } src_install() { common-lisp-install cl-ssl/*.asd cl-ssl/*.lisp common-lisp-system-symlink dodoc COPYING README preamble.html - exeinto /usr/lib/cl-ssl - doexe cl-ssl/ssl.so + exeinto /usr/$(get_libdir)/cl-ssl + doexe cl-ssl/ssl.so || die do-debian-credits } diff --git a/dev-lisp/cl-ssl/files/cl-ssl-0.2.2004.01.04-Makefile.patch b/dev-lisp/cl-ssl/files/cl-ssl-0.2.2004.01.04-Makefile.patch new file mode 100644 index 000000000000..20facb1bbf86 --- /dev/null +++ b/dev-lisp/cl-ssl/files/cl-ssl-0.2.2004.01.04-Makefile.patch @@ -0,0 +1,11 @@ +--- cl-ssl/Makefile ++++ cl-ssl/Makefile +@@ -24,7 +24,7 @@ + all: $(shared_lib) + + linux: $(source) Makefile +- gcc -shared /usr/lib/libcrypto.so /usr/lib/libssl.so -o $(shared_lib) ++ $(CC) $(LDFLAGS) $(CFLAGS) -shared -lcrypto -lssl -o $(shared_lib) + + mac: + ld -bundle /usr/lib/bundle1.o /usr/lib/libcrypto.dylib /usr/lib/libssl.dylib -flat_namespace -undefined suppress -o $(base).dylib |