| 1 |
grobian 11/11/30 14:51:15 |
| 2 |
|
| 3 |
Modified: tinyscheme-1.40.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Fix build for Darwin, fix for Prefix, marked ~ppc-macos and ~x64-macos, bug #388231 |
| 6 |
|
| 7 |
(Portage version: 2.2.01.19572-prefix/cvs/Darwin i386) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 dev-scheme/tinyscheme/tinyscheme-1.40.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-scheme/tinyscheme/tinyscheme-1.40.ebuild?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-scheme/tinyscheme/tinyscheme-1.40.ebuild?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-scheme/tinyscheme/tinyscheme-1.40.ebuild?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: tinyscheme-1.40.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-scheme/tinyscheme/tinyscheme-1.40.ebuild,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- tinyscheme-1.40.ebuild 28 Feb 2011 16:45:17 -0000 1.1 |
| 23 |
+++ tinyscheme-1.40.ebuild 30 Nov 2011 14:51:15 -0000 1.2 |
| 24 |
@@ -1,16 +1,18 @@ |
| 25 |
# Copyright 1999-2011 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/tinyscheme/tinyscheme-1.40.ebuild,v 1.1 2011/02/28 16:45:17 hkbst Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/tinyscheme/tinyscheme-1.40.ebuild,v 1.2 2011/11/30 14:51:15 grobian Exp $ |
| 29 |
|
| 30 |
EAPI="3" |
| 31 |
|
| 32 |
+inherit flag-o-matic multilib |
| 33 |
+ |
| 34 |
DESCRIPTION="Lightweight scheme interpreter" |
| 35 |
HOMEPAGE="http://tinyscheme.sourceforge.net" |
| 36 |
SRC_URI="mirror://sourceforge/tinyscheme/${P}.tar.gz" |
| 37 |
|
| 38 |
LICENSE="BSD" |
| 39 |
SLOT="0" |
| 40 |
-KEYWORDS="~amd64 ~ppc ~x86" |
| 41 |
+KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos ~x64-macos" |
| 42 |
IUSE="" |
| 43 |
|
| 44 |
DEPEND="" |
| 45 |
@@ -29,12 +31,28 @@ |
| 46 |
sed 's/DEBUG=-g -Wno-char-subscripts -O/DEBUG=/' -i makefile |
| 47 |
sed "s/LD)/& -Wl,-soname,lib${PN}.so.${PV}/" -i makefile |
| 48 |
|
| 49 |
+ if [[ ${CHOST} == *-darwin* ]] ; then |
| 50 |
+ append-flags -DOSX |
| 51 |
+ sed -i \ |
| 52 |
+ -e 's/SOsuf=so/SOsuf=dylib/' \ |
| 53 |
+ -e "s|\(\$(LD)\)[^\$]\+\(\$(\)|\1 -Wl,-install_name,${EPREFIX}/usr/lib/lib${PN}.${PV}.dylib \2|" \ |
| 54 |
+ makefile || die |
| 55 |
+ fi |
| 56 |
+ |
| 57 |
# diff -u makefile.old makefile |
| 58 |
} |
| 59 |
|
| 60 |
src_install() { |
| 61 |
newbin scheme ${PN} || die "newbin failed" |
| 62 |
- dolib libtinyscheme.a libtinyscheme.so || die "dolib failed" |
| 63 |
+ if [[ ${CHOST} == *-darwin* ]] ; then |
| 64 |
+ # this should be done for ELF (all other systems) as well, but only |
| 65 |
+ # Darwin/MachO is strict in the install_name (soname) actually pointing |
| 66 |
+ # somewhere, so we won't change the ELF scheme here (up to maintainer) |
| 67 |
+ mv libtinyscheme$(get_libname) libtinyscheme$(get_libname ${PV}) || die |
| 68 |
+ ln -s libtinyscheme$(get_libname ${PV}) libtinyscheme$(get_libname) || die |
| 69 |
+ dolib libtinyscheme$(get_libname ${PV}) || die "dolib failed" |
| 70 |
+ fi |
| 71 |
+ dolib libtinyscheme.a libtinyscheme$(get_libname) || die "dolib failed" |
| 72 |
dodoc Manual.txt || die "dodoc failed" |
| 73 |
|
| 74 |
# Bug 328967: dev-scheme/tinyscheme-1.39-r1 doesn't install header file |
| 75 |
@@ -44,5 +62,5 @@ |
| 76 |
local INIT_DIR=/usr/share/${PN}/ |
| 77 |
insinto ${INIT_DIR} |
| 78 |
doins init.scm || die "doins failed" |
| 79 |
- dodir /etc/env.d/ && echo "TINYSCHEMEINIT=\"${INIT_DIR}init.scm\"" > "${D}"/etc/env.d/50tinyscheme |
| 80 |
+ dodir /etc/env.d/ && echo "TINYSCHEMEINIT=\"${EPREFIX}${INIT_DIR}init.scm\"" > "${ED}"/etc/env.d/50tinyscheme |
| 81 |
} |
| 82 |
|
| 83 |
|
| 84 |
|
| 85 |
1.11 dev-scheme/tinyscheme/ChangeLog |
| 86 |
|
| 87 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-scheme/tinyscheme/ChangeLog?rev=1.11&view=markup |
| 88 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-scheme/tinyscheme/ChangeLog?rev=1.11&content-type=text/plain |
| 89 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-scheme/tinyscheme/ChangeLog?r1=1.10&r2=1.11 |
| 90 |
|
| 91 |
Index: ChangeLog |
| 92 |
=================================================================== |
| 93 |
RCS file: /var/cvsroot/gentoo-x86/dev-scheme/tinyscheme/ChangeLog,v |
| 94 |
retrieving revision 1.10 |
| 95 |
retrieving revision 1.11 |
| 96 |
diff -u -r1.10 -r1.11 |
| 97 |
--- ChangeLog 28 Feb 2011 16:45:17 -0000 1.10 |
| 98 |
+++ ChangeLog 30 Nov 2011 14:51:15 -0000 1.11 |
| 99 |
@@ -1,6 +1,10 @@ |
| 100 |
# ChangeLog for dev-scheme/tinyscheme |
| 101 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 102 |
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/tinyscheme/ChangeLog,v 1.10 2011/02/28 16:45:17 hkbst Exp $ |
| 103 |
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/tinyscheme/ChangeLog,v 1.11 2011/11/30 14:51:15 grobian Exp $ |
| 104 |
+ |
| 105 |
+ 30 Nov 2011; Fabian Groffen <grobian@g.o> tinyscheme-1.40.ebuild: |
| 106 |
+ Fix build for Darwin, fix for Prefix, marked ~ppc-macos and ~x64-macos, bug |
| 107 |
+ #388231 |
| 108 |
|
| 109 |
*tinyscheme-1.40 (28 Feb 2011) |
Archives