OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 18-Mar-2009 21:26:28
Branch: HEAD Handle: 2009031820262800
Modified files:
openpkg-src/parrot parrot.patch parrot.spec
Log:
modifying package: parrot-1.0.0 20090318 again
Summary:
Revision Changes Path
1.10 +45 -10 openpkg-src/parrot/parrot.patch
1.46 +36 -10 openpkg-src/parrot/parrot.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/parrot/parrot.patch
============================================================================
$ cvs diff -u -r1.9 -r1.10 parrot.patch
--- openpkg-src/parrot/parrot.patch 19 Aug 2008 21:21:36 -0000 1.9
+++ openpkg-src/parrot/parrot.patch 18 Mar 2009 20:26:28 -0000 1.10
@@ -1,7 +1,7 @@
Index: compilers/imcc/imcc.l
---- compilers/imcc/imcc.l.orig 2008-08-19 15:17:14 +0200
-+++ compilers/imcc/imcc.l 2008-08-19 22:08:27 +0200
-@@ -125,6 +125,7 @@
+--- compilers/imcc/imcc.l.orig 2009-03-08 21:32:46 +0100
++++ compilers/imcc/imcc.l 2009-03-18 21:15:47 +0100
+@@ -114,6 +114,7 @@
%option reentrant
%option never-interactive
%option stack
@@ -10,8 +10,8 @@
LETTER [a-za...@]
DIGIT [0-9]
Index: config/auto/icu.pm
---- config/auto/icu.pm.orig 2008-08-19 15:17:25 +0200
-+++ config/auto/icu.pm 2008-08-19 22:09:59 +0200
+--- config/auto/icu.pm.orig 2009-03-08 21:32:47 +0100
++++ config/auto/icu.pm 2009-03-18 21:15:47 +0100
@@ -332,7 +332,7 @@
$without = 1;
}
@@ -21,9 +21,22 @@
if (! -d $icuheaders) {
$without = 1;
}
+Index: config/auto/readline.pm
+--- config/auto/readline.pm.orig 2009-02-17 21:10:46 +0100
++++ config/auto/readline.pm 2009-03-18 21:15:47 +0100
+@@ -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_p5('OSNAME');
Index: config/init/hints/freebsd.pm
---- config/init/hints/freebsd.pm.orig 2008-08-19 15:17:23 +0200
-+++ config/init/hints/freebsd.pm 2008-08-19 22:08:27 +0200
+--- config/init/hints/freebsd.pm.orig 2009-03-08 21:32:47 +0100
++++ config/init/hints/freebsd.pm 2009-03-18 21:15:47 +0100
@@ -34,7 +34,7 @@
rpath => '-Wl,-R',
@@ -34,9 +47,9 @@
libparrot_shared_alias => 'libparrot$(SHARE_EXT)',
libparrot_soname =>
'-Wl,-soname=libparrot$(SHARE_EXT).$(SOVERSION)',
Index: config/init/hints/linux.pm
---- config/init/hints/linux.pm.orig 2008-08-19 15:17:23 +0200
-+++ config/init/hints/linux.pm 2008-08-19 22:08:27 +0200
-@@ -137,7 +137,7 @@
+--- config/init/hints/linux.pm.orig 2009-03-08 21:32:47 +0100
++++ config/init/hints/linux.pm 2009-03-18 21:15:47 +0100
+@@ -141,7 +141,7 @@
rpath => '-Wl,-rpath=',
has_dynamic_linking => 1,
@@ -45,3 +58,25 @@
libparrot_shared => 'libparrot$(SHARE_EXT).$(SOVERSION)',
libparrot_shared_alias => 'libparrot$(SHARE_EXT)',
libparrot_soname =>
'-Wl,-soname=libparrot$(SHARE_EXT).$(SOVERSION)',
+Index: lib/Parrot/Configure/Options/Conf.pm
+--- lib/Parrot/Configure/Options/Conf.pm.orig 2009-02-17 21:10:48
+0100
++++ lib/Parrot/Configure/Options/Conf.pm 2009-03-18 21:15:47 +0100
+@@ -102,6 +102,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 2009-02-17 21:10:51
+0100
++++ lib/Parrot/Configure/Options/Conf/Shared.pm 2009-03-18 21:15:47
+0100
+@@ -72,6 +72,7 @@
+ without-gettext
+ without-gmp
+ without-opengl
++ without-readline
+ without-pcre
+ without-icu
+ yacc
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/parrot/parrot.spec
============================================================================
$ cvs diff -u -r1.45 -r1.46 parrot.spec
--- openpkg-src/parrot/parrot.spec 18 Mar 2009 18:56:24 -0000 1.45
+++ openpkg-src/parrot/parrot.spec 18 Mar 2009 20:26:28 -0000 1.46
@@ -35,7 +35,10 @@
Release: 20090318
# package options
-%option with_icu no
+%option with_gmp yes
+%option with_pcre yes
+%option with_crypto no
+%option with_icu no
# list of sources
Source0:
ftp://ftp.parrot.org/pub/parrot/releases/stable/%{version}/parrot-%{version}.tar.gz
@@ -46,8 +49,18 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130, perl, gcc, flex, bison, make
PreReq: OpenPKG, openpkg >= 20040130
+%if "%{with_gmp}" == "yes"
BuildPreReq: gmp
PreReq: gmp
+%endif
+%if "%{with_pcre}" == "yes"
+BuildPreReq: pcre
+PreReq: pcre
+%endif
+%if "%{with_crypto}" == "yes"
+BuildPreReq: openssl
+PreReq: openssl
+%endif
%if "%{with_icu}" == "yes"
BuildPreReq: icu
PreReq: icu
@@ -78,11 +91,6 @@
-e 's;parrot_is_shared *=> *1;parrot_is_shared => 0;g' \
config/init/hints/*.pm
%{l_prefix}/bin/perl Configure.pl \
-%if "%{with_icu}" == "yes"
- --icu-config=%{l_prefix}/bin/icu-config \
-%else
- --without-icu \
-%endif
--debugging=0 \
--optimize \
--cc="%{l_cc}" \
@@ -94,7 +102,25 @@
--ldflags="%{l_ldflags}" \
--lex="flex" \
--yacc="bison -y" \
- --libs=""
+ --libs="" \
+%if "%{with_gmp}" != "yes"
+ --without-gmp \
+%endif
+%if "%{with_pcre}" != "yes"
+ --without-pcre \
+%endif
+%if "%{with_crypto}" != "yes"
+ --without-crypto \
+%endif
+%if "%{with_icu}" == "yes"
+ --icu-config=%{l_prefix}/bin/icu-config \
+%else
+ --without-icu \
+%endif
+ --without-gdbm \
+ --without-gettext \
+ --without-readline \
+ --without-opengl
# build program
%{l_make} %{l_mflags}
@@ -120,9 +146,9 @@
# strip down and adjust installation
rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/parrot/blib
rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/parrot/doc
- mv $RPM_BUILD_ROOT%{l_prefix}/pkgconfig/parrot/*/parrot.pc \
- $RPM_BUILD_ROOT%{l_prefix}/pkgconfig/parrot.pc
- rm -rf $RPM_BUILD_ROOT%{l_prefix}/pkgconfig/parrot
+ mv $RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig/parrot/*/parrot.pc \
+ $RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig/parrot.pc
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig/parrot
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
%{l_shtool} install -c -m 644 \
blib/lib/libparrot.a $RPM_BUILD_ROOT%{l_prefix}/lib/
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
