OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 23-Mar-2005 12:09:50
Branch: HEAD Handle: 2005032311095000
Added files:
openpkg-src/parrot parrot.patch
Modified files:
openpkg-src/parrot parrot.spec
Log:
upgrading package: parrot 0.1.1 -> 0.1.2
Summary:
Revision Changes Path
1.1 +38 -0 openpkg-src/parrot/parrot.patch
1.5 +17 -14 openpkg-src/parrot/parrot.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/parrot/parrot.patch
============================================================================
$ cvs diff -u -r0 -r1.1 parrot.patch
--- /dev/null 2005-03-23 12:00:13 +0100
+++ parrot.patch 2005-03-23 12:09:50 +0100
@@ -0,0 +1,38 @@
+Index: config/gen/makefiles/CFLAGS.in
+--- config/gen/makefiles/CFLAGS.in.orig 2004-07-08 19:22:05 +0200
++++ config/gen/makefiles/CFLAGS.in 2005-03-08 21:06:28 +0100
+@@ -5,6 +5,8 @@
+ #
+ # Note, empty regex/options are just ignored.
+ #
++ops/core_ops_switch.c -{-O2} # workaround GCC 3.4.3 optimizer problems
++ops/core_ops_cgp.c -{-O2} # workaround GCC 3.4.3 optimizer problems
+ src/spf_render.c -{-Wformat-nonliteral} # noisy
+ src/tsq.c -{${optimize}} # never optimize tsq.c!
+ ops/core_ops_cg.c -{${optimize}} # takes too long
+Index: src/packdump.c
+--- src/packdump.c.orig 2004-07-30 09:08:59 +0200
++++ src/packdump.c 2005-03-08 21:14:25 +0100
+@@ -85,8 +85,10 @@
+ PIO_printf(interpreter, " [ 'PFC_STRING', {\n");
+ PIO_printf(interpreter, " FLAGS => 0x%04lx,\n",
+ (long)PObj_get_FLAGS(self->u.string));
++#if 0
+ PIO_printf(interpreter, " REPRESENTATION => %ld,\n",
+ self->u.string->representation);
++#endif
+ PIO_printf(interpreter, " SIZE => %ld,\n",
+ (long)self->u.string->bufused);
+ /* TODO: Won't do anything reasonable for most encodings */
+Index: config/gen/icu.pl
+--- config/gen/icu.pl.orig 2004-10-11 12:09:26 +0200
++++ config/gen/icu.pl 2005-03-16 22:57:11 +0100
+@@ -81,7 +81,7 @@
+ # location of header files
+ $icuheaders = `$icuconfig --prefix`;
+ chomp $icuheaders;
+- $icuheaders .= "${slash}include";
++ $icuheaders .= "${slash}include/icu";
+
+ # icu data dir
+ $icudatadir = `$icuconfig --icudatadir`;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/parrot/parrot.spec
============================================================================
$ cvs diff -u -r1.4 -r1.5 parrot.spec
--- openpkg-src/parrot/parrot.spec 1 Jan 2005 10:53:17 -0000 1.4
+++ openpkg-src/parrot/parrot.spec 23 Mar 2005 11:09:50 -0000 1.5
@@ -33,17 +33,20 @@
Class: EVAL
Group: Language
License: Artistic/GPL
-Version: 0.1.1
-Release: 20041011
+Version: 0.1.2
+Release: 20050323
# list of sources
Source0:
ftp://ftp.cpan.org/pub/CPAN/authors/id/L/LT/LTOETSCH/parrot-%{version}.tar.gz
+Patch0: parrot.patch
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, gmp, perl, gcc, flex, bison
-PreReq: OpenPKG, openpkg >= 20040130, gmp
+BuildPreReq: OpenPKG, openpkg >= 20040130, perl, gcc, flex, bison
+PreReq: OpenPKG, openpkg >= 20040130
+BuildPreReq: gmp, icu
+PreReq: gmp, icu
AutoReq: no
AutoReqProv: no
@@ -61,15 +64,17 @@
%prep
%setup -q
+ %patch -p0
%build
# configure program
%{l_prefix}/bin/perl Configure.pl \
+ --icu-config=%{l_prefix}/bin/icu-config \
--debugging=0 \
--optimize \
--cc="%{l_cc}" \
--cxx="%{l_cxx}" \
- --ccflags="%{l_cflags -O} %{l_cppflags}" \
+ --ccflags="%{l_cflags -O} %{l_cppflags icu .}" \
--link="%{l_cxx}" \
--linkflags="%{l_ldflags}" \
--ld="%{l_cc}" \
@@ -87,11 +92,11 @@
rm -rf $RPM_BUILD_ROOT
%{l_make} %{l_mflags} install \
BUILDPREFIX=$RPM_BUILD_ROOT \
- PREFIX=%{l_prefix} \
- EXEC_PREFIX=%{l_prefix} \
- BINDIR=%{l_prefix}/bin \
- LIBDIR=%{l_prefix}/lib \
- INCLUDEDIR=%{l_prefix}/include
+ PREFIX=%{l_prefix}/share/parrot \
+ EXEC_PREFIX=%{l_prefix}/share/parrot \
+ BIN_DIR=%{l_prefix}/bin \
+ LIB_DIR=%{l_prefix}/lib \
+ INCLUDE_DIR=%{l_prefix}/include
# install headers (are not installed by default)
%{l_shtool} mkdir -f -p -m 755 \
@@ -100,12 +105,10 @@
cp -rp include/parrot/* $RPM_BUILD_ROOT%{l_prefix}/include/parrot/
# strip down and adjust installation
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/parrot/blib
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
- rm -rf $RPM_BUILD_ROOT%{l_prefix}/bin/languages
%{l_shtool} install -c -m 644 \
- blib/lib/libparrot.a \
- $RPM_BUILD_ROOT%{l_prefix}/lib/
- rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib/blib
+ blib/lib/libparrot.a $RPM_BUILD_ROOT%{l_prefix}/lib/
# determine installation files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
