|
|
|
|
@ -1,18 +1,18 @@
|
|
|
|
|
Index: compilers/imcc/imcc.l
|
|
|
|
|
--- compilers/imcc/imcc.l.orig 2010-03-16 06:15:39.000000000 +0100
|
|
|
|
|
+++ compilers/imcc/imcc.l 2010-03-28 20:42:12.000000000 +0200
|
|
|
|
|
@@ -111,6 +111,7 @@
|
|
|
|
|
%option reentrant
|
|
|
|
|
--- compilers/imcc/imcc.l.orig 2010-09-21 09:48:54.000000000 +0200
|
|
|
|
|
+++ compilers/imcc/imcc.l 2010-09-24 10:07:42.000000000 +0200
|
|
|
|
|
@@ -115,6 +115,7 @@
|
|
|
|
|
%option never-interactive
|
|
|
|
|
%option stack
|
|
|
|
|
%option yylineno
|
|
|
|
|
+%option array
|
|
|
|
|
|
|
|
|
|
LETTER [a-zA-Z_@]
|
|
|
|
|
DIGIT [0-9]
|
|
|
|
|
Index: config/auto/icu.pm
|
|
|
|
|
--- config/auto/icu.pm.orig 2010-03-16 06:15:40.000000000 +0100
|
|
|
|
|
+++ config/auto/icu.pm 2010-03-28 21:30:03.000000000 +0200
|
|
|
|
|
@@ -339,7 +339,7 @@
|
|
|
|
|
--- config/auto/icu.pm.orig 2010-09-21 09:48:56.000000000 +0200
|
|
|
|
|
+++ config/auto/icu.pm 2010-09-24 10:07:42.000000000 +0200
|
|
|
|
|
@@ -328,7 +328,7 @@
|
|
|
|
|
if (! -d $icuheaders) {
|
|
|
|
|
$without = 1;
|
|
|
|
|
}
|
|
|
|
|
@ -21,46 +21,9 @@ Index: config/auto/icu.pm
|
|
|
|
|
if (! -d $icuheaders) {
|
|
|
|
|
$without = 1;
|
|
|
|
|
}
|
|
|
|
|
Index: config/auto/readline.pm
|
|
|
|
|
--- config/auto/readline.pm.orig 2009-12-07 10:47:18.000000000 +0100
|
|
|
|
|
+++ config/auto/readline.pm 2010-03-28 20:42:12.000000000 +0200
|
|
|
|
|
@@ -36,7 +36,8 @@
|
|
|
|
|
sub runstep {
|
|
|
|
|
my ( $self, $conf ) = @_;
|
|
|
|
|
|
|
|
|
|
- my $verbose = $conf->options->get('verbose');
|
|
|
|
|
+ my ($verbose, $without) = $conf->options->get('verbose', 'without-readline');
|
|
|
|
|
+ return 1 if ($without);
|
|
|
|
|
|
|
|
|
|
my $cc = $conf->data->get('cc');
|
|
|
|
|
my $osname = $conf->data->get('osname');
|
|
|
|
|
Index: config/init/hints/freebsd.pm
|
|
|
|
|
--- config/init/hints/freebsd.pm.orig 2009-07-07 07:13:00.000000000 +0200
|
|
|
|
|
+++ config/init/hints/freebsd.pm 2010-03-28 20:42:12.000000000 +0200
|
|
|
|
|
@@ -36,7 +36,7 @@
|
|
|
|
|
rpath => '-Wl,-R',
|
|
|
|
|
|
|
|
|
|
has_dynamic_linking => 1,
|
|
|
|
|
- parrot_is_shared => 1,
|
|
|
|
|
+ parrot_is_shared => 0,
|
|
|
|
|
libparrot_shared => "libparrot$share_ext.$version",
|
|
|
|
|
libparrot_shared_alias => "libparrot$share_ext",
|
|
|
|
|
libparrot_soname => "-Wl,-soname=libparrot$share_ext.$version",
|
|
|
|
|
Index: config/init/hints/linux.pm
|
|
|
|
|
--- config/init/hints/linux.pm.orig 2010-03-16 06:15:40.000000000 +0100
|
|
|
|
|
+++ config/init/hints/linux.pm 2010-03-28 20:42:12.000000000 +0200
|
|
|
|
|
@@ -82,7 +82,7 @@
|
|
|
|
|
rpath => '-Wl,-rpath=',
|
|
|
|
|
|
|
|
|
|
has_dynamic_linking => 1,
|
|
|
|
|
- parrot_is_shared => 1,
|
|
|
|
|
+ parrot_is_shared => 0,
|
|
|
|
|
libparrot_shared => "libparrot$share_ext.$version",
|
|
|
|
|
libparrot_shared_alias => "libparrot$share_ext",
|
|
|
|
|
libparrot_soname => "-Wl,-soname=libparrot$share_ext.$version",
|
|
|
|
|
Index: config/init/install.pm
|
|
|
|
|
--- config/init/install.pm.orig 2009-06-22 21:24:15.000000000 +0200
|
|
|
|
|
+++ config/init/install.pm 2010-03-28 20:42:12.000000000 +0200
|
|
|
|
|
--- config/init/install.pm.orig 2010-09-21 09:48:56.000000000 +0200
|
|
|
|
|
+++ config/init/install.pm 2010-09-24 10:07:42.000000000 +0200
|
|
|
|
|
@@ -85,7 +85,7 @@
|
|
|
|
|
my $mandir = assign_dir( $conf, 'mandir', $prefix, '/man' );
|
|
|
|
|
|
|
|
|
|
@ -70,25 +33,3 @@ Index: config/init/install.pm
|
|
|
|
|
|
|
|
|
|
$conf->data->set(
|
|
|
|
|
prefix => $prefix,
|
|
|
|
|
Index: lib/Parrot/Configure/Options/Conf.pm
|
|
|
|
|
--- lib/Parrot/Configure/Options/Conf.pm.orig 2009-12-07 10:47:00.000000000 +0100
|
|
|
|
|
+++ lib/Parrot/Configure/Options/Conf.pm 2010-03-28 20:42:12.000000000 +0200
|
|
|
|
|
@@ -104,6 +104,7 @@
|
|
|
|
|
--without-gettext Build parrot without gettext support
|
|
|
|
|
--without-gmp Build parrot without GMP support
|
|
|
|
|
--without-opengl Build parrot without OpenGL support (GL/GLU/GLUT)
|
|
|
|
|
+ --without-readline Build parrot without Readline support
|
|
|
|
|
--without-pcre Build parrot without pcre support
|
|
|
|
|
|
|
|
|
|
ICU Options:
|
|
|
|
|
Index: lib/Parrot/Configure/Options/Conf/Shared.pm
|
|
|
|
|
--- lib/Parrot/Configure/Options/Conf/Shared.pm.orig 2010-03-04 09:10:51.000000000 +0100
|
|
|
|
|
+++ lib/Parrot/Configure/Options/Conf/Shared.pm 2010-03-28 20:42:12.000000000 +0200
|
|
|
|
|
@@ -77,6 +77,7 @@
|
|
|
|
|
without-gmp
|
|
|
|
|
without-icu
|
|
|
|
|
without-opengl
|
|
|
|
|
+ without-readline
|
|
|
|
|
without-pcre
|
|
|
|
|
without-threads
|
|
|
|
|
yacc
|
|
|
|
|
|