diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-07-13 11:20:19 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-07-13 11:20:19 +0000 |
| commit | 43f2d6afca897bb5ad202accbc5785d0521dd929 (patch) | |
| tree | a5dd2c066b6de5676397c6f6b2717a5cfd78ece3 /dev-lisp | |
| parent | Version bump. (diff) | |
| download | gentoo-2-43f2d6afca897bb5ad202accbc5785d0521dd929.tar.gz gentoo-2-43f2d6afca897bb5ad202accbc5785d0521dd929.tar.bz2 gentoo-2-43f2d6afca897bb5ad202accbc5785d0521dd929.zip | |
Fix dodoc from ChangeLog to Changelog. Fix installation with multilib-strict. Respect CC and LDFLAGS.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'dev-lisp')
| -rw-r--r-- | dev-lisp/cl-tclink/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-lisp/cl-tclink/cl-tclink-3.3.1-r1.ebuild | 19 | ||||
| -rw-r--r-- | dev-lisp/cl-tclink/files/3.3.1-Makefile.patch | 13 |
3 files changed, 30 insertions, 11 deletions
diff --git a/dev-lisp/cl-tclink/ChangeLog b/dev-lisp/cl-tclink/ChangeLog index 2e9bfc47fea8..31fe5405af8a 100644 --- a/dev-lisp/cl-tclink/ChangeLog +++ b/dev-lisp/cl-tclink/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-lisp/cl-tclink -# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-tclink/ChangeLog,v 1.10 2008/09/03 20:58:09 opfer Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-tclink/ChangeLog,v 1.11 2010/07/13 11:20:18 ssuominen Exp $ + + 13 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> + +files/3.3.1-Makefile.patch, cl-tclink-3.3.1-r1.ebuild: + Fix dodoc from ChangeLog to Changelog. Fix installation with + multilib-strict. Respect CC and LDFLAGS. 03 Sep 2008; Christian Faulhammer <opfer@gentoo.org> cl-tclink-3.3.1-r1.ebuild: diff --git a/dev-lisp/cl-tclink/cl-tclink-3.3.1-r1.ebuild b/dev-lisp/cl-tclink/cl-tclink-3.3.1-r1.ebuild index 10854c3eda32..e3666884b2f4 100644 --- a/dev-lisp/cl-tclink/cl-tclink-3.3.1-r1.ebuild +++ b/dev-lisp/cl-tclink/cl-tclink-3.3.1-r1.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-tclink/cl-tclink-3.3.1-r1.ebuild,v 1.9 2008/09/03 20:58:09 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-tclink/cl-tclink-3.3.1-r1.ebuild,v 1.10 2010/07/13 11:20:18 ssuominen Exp $ -inherit common-lisp eutils +inherit common-lisp eutils multilib toolchain-funcs DEB_PV=3 @@ -26,20 +26,21 @@ CLPACKAGE=tclink src_unpack() { unpack ${A} epatch ${PN}_${PV}-${DEB_PV}.diff - epatch "${FILESDIR}/${PV}-gentoo.patch" + cd "${S}" + epatch "${FILESDIR}"/${PV}-{gentoo,Makefile}.patch } src_compile() { - make -C libtclink CFLAGS="-fPIC ${CFLAGS}" || die + tc-export CC + emake -C libtclink || die # use doc && make -C doc || die } src_install() { common-lisp-install *.asd *.lisp common-lisp-system-symlink - dodoc ChangeLog - dodoc doc/cl-tclink.txt - exeinto /usr/lib/cl-tclink - doexe libtclink/libtclink.so + dodoc Changelog doc/cl-tclink.txt + exeinto /usr/$(get_libdir)/cl-tclink + doexe libtclink/libtclink.so || die do-debian-credits } diff --git a/dev-lisp/cl-tclink/files/3.3.1-Makefile.patch b/dev-lisp/cl-tclink/files/3.3.1-Makefile.patch new file mode 100644 index 000000000000..2bf4963df214 --- /dev/null +++ b/dev-lisp/cl-tclink/files/3.3.1-Makefile.patch @@ -0,0 +1,13 @@ +--- libtclink/Makefile ++++ libtclink/Makefile +@@ -1,7 +1,7 @@ +-LDFLAGS=-lssl +-CFLAGS=-fPIC ++LIBS=-lssl ++CFLAGS+=-fPIC + + libtclink.so: tclinkc.o +- $(CC) $(LDFLAGS) -shared -o $@ $< ++ $(CC) $(LDFLAGS) $(CFLAGS) -shared -o $@ $< $(LIBS) + + tclinkc.o: tclinkc.c |