| 1 |
patrick 12/08/22 07:50:20 |
| 2 |
|
| 3 |
Modified: opendylan-2011.1-r1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Adding x86, with lots of buildsystem hackery to make mps integration work |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha121/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.3 dev-lang/opendylan/opendylan-2011.1-r1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/opendylan/opendylan-2011.1-r1.ebuild?rev=1.3&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/opendylan/opendylan-2011.1-r1.ebuild?rev=1.3&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/opendylan/opendylan-2011.1-r1.ebuild?r1=1.2&r2=1.3 |
| 15 |
|
| 16 |
Index: opendylan-2011.1-r1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/opendylan/opendylan-2011.1-r1.ebuild,v |
| 19 |
retrieving revision 1.2 |
| 20 |
retrieving revision 1.3 |
| 21 |
diff -u -r1.2 -r1.3 |
| 22 |
--- opendylan-2011.1-r1.ebuild 21 Aug 2012 08:30:04 -0000 1.2 |
| 23 |
+++ opendylan-2011.1-r1.ebuild 22 Aug 2012 07:50:20 -0000 1.3 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2012 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/opendylan/opendylan-2011.1-r1.ebuild,v 1.2 2012/08/21 08:30:04 patrick Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/opendylan/opendylan-2011.1-r1.ebuild,v 1.3 2012/08/22 07:50:20 patrick Exp $ |
| 29 |
EAPI=4 |
| 30 |
|
| 31 |
inherit autotools |
| 32 |
@@ -19,21 +19,48 @@ |
| 33 |
SLOT="0" |
| 34 |
|
| 35 |
# not tested on x86 |
| 36 |
-KEYWORDS="~amd64" |
| 37 |
+KEYWORDS="~amd64 ~x86" |
| 38 |
|
| 39 |
IUSE="" |
| 40 |
|
| 41 |
-DEPEND="dev-libs/boehm-gc |
| 42 |
+DEPEND="app-arch/unzip |
| 43 |
+ dev-libs/boehm-gc |
| 44 |
dev-lang/perl |
| 45 |
dev-perl/XML-Parser |
| 46 |
- || ( dev-lang/opendylan-bin dev-lang/opendylan )" |
| 47 |
+ || ( dev-lang/opendylan-bin dev-lang/opendylan ) |
| 48 |
+ x86? ( dev-libs/mps )" |
| 49 |
RDEPEND="${DEPEND}" |
| 50 |
|
| 51 |
+# on x86 there's a dependency on mps, but the build system is a bit ... hmm ... |
| 52 |
+# let's give it more of a chance to survive then |
| 53 |
+NAUGHTY_FILES=( |
| 54 |
+ sources/lib/run-time/collector.c.malloc |
| 55 |
+ sources/lib/run-time/collector.c |
| 56 |
+ sources/lib/run-time/pentium-win32/buffalo-collector.c |
| 57 |
+ sources/lib/run-time/pentium-win32/heap-stats.c |
| 58 |
+ sources/lib/run-time/heap-utils.h |
| 59 |
+ ) |
| 60 |
+ |
| 61 |
+NAUGHTY_HEADERS=( |
| 62 |
+ mps.h |
| 63 |
+ mpscmv.h |
| 64 |
+ mpscamc.h |
| 65 |
+ mpsavm.h |
| 66 |
+ ) |
| 67 |
+ |
| 68 |
src_prepare() { |
| 69 |
mkdir -p build-aux |
| 70 |
elibtoolize && eaclocal || die "Fail" |
| 71 |
automake --foreign --add-missing # this one dies wrongfully |
| 72 |
eautoconf || die "Fail" |
| 73 |
+ # mps headers, included wrong |
| 74 |
+ if use x86; then |
| 75 |
+ for i in ${NAUGHTY_FILES[@]}; do |
| 76 |
+ for header in ${NAUGHTY_HEADERS[@]}; do |
| 77 |
+ sed -i -e "s:\"${header}\":<${header}>:" $i |
| 78 |
+ done |
| 79 |
+ done |
| 80 |
+ fi |
| 81 |
} |
| 82 |
|
| 83 |
src_configure() { |
| 84 |
@@ -42,7 +69,19 @@ |
| 85 |
else |
| 86 |
PATH=/opt/opendylan/bin:$PATH |
| 87 |
fi |
| 88 |
- econf --prefix=/opt/opendylan || die |
| 89 |
+ if use amd64; then |
| 90 |
+ econf --prefix=/opt/opendylan || die |
| 91 |
+ else |
| 92 |
+ econf --prefix=/opt/opendylan --with-mps=/usr/include/mps/ || die |
| 93 |
+ fi |
| 94 |
+ if use x86; then |
| 95 |
+ # Includedir, pointing at something wrong |
| 96 |
+ sed -i -e 's:-I$(MPS)/code:-I$(MPS):' sources/lib/run-time/pentium-linux/Makefile || die "Couldn't fix mps path" |
| 97 |
+ sed -i -e 's~(cd $(MPS)/code; make -f lii4gc.gmk mmdw.a)~:;~' sources/lib/run-time/pentium-linux/Makefile || die "Couldn't fix mps building" |
| 98 |
+ sed -i -e 's~(cd $(MPS)/code; make -f lii4gc.gmk mpsplan.a)~:;~' sources/lib/run-time/pentium-linux/Makefile || die "Couldn't fix mps building" |
| 99 |
+ sed -i -e 's~$(MPS_LIB)/mpsplan.a~/usr/lib/mpsplan.a~' sources/lib/run-time/pentium-linux/Makefile || die "Couldn't fix mps clone" |
| 100 |
+ sed -i -e 's~$(MPS_LIB)/mmdw.a~/usr/lib/mmdw.a~' sources/lib/run-time/pentium-linux/Makefile || die "Couldn't fix mps clone" |
| 101 |
+ fi |
| 102 |
} |
| 103 |
|
| 104 |
src_compile() { |
| 105 |
|
| 106 |
|
| 107 |
|
| 108 |
1.5 dev-lang/opendylan/ChangeLog |
| 109 |
|
| 110 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/opendylan/ChangeLog?rev=1.5&view=markup |
| 111 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/opendylan/ChangeLog?rev=1.5&content-type=text/plain |
| 112 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/opendylan/ChangeLog?r1=1.4&r2=1.5 |
| 113 |
|
| 114 |
Index: ChangeLog |
| 115 |
=================================================================== |
| 116 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/opendylan/ChangeLog,v |
| 117 |
retrieving revision 1.4 |
| 118 |
retrieving revision 1.5 |
| 119 |
diff -u -r1.4 -r1.5 |
| 120 |
--- ChangeLog 22 Aug 2012 03:42:00 -0000 1.4 |
| 121 |
+++ ChangeLog 22 Aug 2012 07:50:20 -0000 1.5 |
| 122 |
@@ -1,6 +1,9 @@ |
| 123 |
# ChangeLog for dev-lang/opendylan |
| 124 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 125 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/opendylan/ChangeLog,v 1.4 2012/08/22 03:42:00 patrick Exp $ |
| 126 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/opendylan/ChangeLog,v 1.5 2012/08/22 07:50:20 patrick Exp $ |
| 127 |
+ |
| 128 |
+ 22 Aug 2012; Patrick Lauer <patrick@g.o> opendylan-2011.1-r1.ebuild: |
| 129 |
+ Adding x86, with lots of buildsystem hackery to make mps integration work |
| 130 |
|
| 131 |
22 Aug 2012; Patrick Lauer <patrick@g.o> opendylan-9999.ebuild: |
| 132 |
Remove keywords from live ebuild |
Archives