Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Sync branch with trunc.

Conflicts:
	config/auto/icu.pm
	src/pmc/imageio.pmc

git-svn-id: https://svn.parrot.org/parrot/branches/gc_encapsulate@43753 d31e2699-5ff4-0310-a27c-f18f2fbe73fe
  • Loading branch information...
commit 012bfb1f3ebe856a12a4078eed8853191797b8e9 1 parent 92dbd4b
bacek authored
View
5 config/auto/icu.pm
@@ -321,6 +321,11 @@ sub _handle_icushared {
if (length $icushared == 0) {
$without = 1;
}
+ else {
+ # on MacOS X there's sometimes an errornous \c at the end of the
+ # output line. Remove it.
+ $icushared =~ s/\s\\c$//;
+ }
}
# on MacOS X there's sometimes an errornous \c at the end of the
View
1  config/gen/makefiles/root.in
@@ -2353,6 +2353,7 @@ install-doc:
--buildprefix=$(BUILDPREFIX) \
--prefix=$(PREFIX) \
--docdir=$(DOC_DIR) \
+ --destdir=$(DESTDIR) \
--versiondir=$(VERSION_DIR) \
MANIFEST MANIFEST.generated
View
6 config/init/defaults.pm
@@ -187,7 +187,6 @@ sub runstep {
libparrot_soname => '',
perl => $^X,
- perl_inc => $self->find_perl_headers(),
test_prog => 'parrot',
# some utilities in Makefile
@@ -273,11 +272,6 @@ sub runstep {
return 1;
}
-sub find_perl_headers {
- my $self = shift;
- return File::Spec->catdir( $Config::Config{archlib}, 'CORE' );
-}
-
sub _64_bit_adjustments {
my $conf = shift;
my $m = $conf->options->get('m');
View
5 ports/debian/README.source
@@ -0,0 +1,5 @@
+This package uses quilt to manage all modifications to the upstream source.
+Changes are stored in the source package as diffs in debian/patches and
+applied during the build.
+
+See /usr/share/doc/quilt/README.source for a detailed explanation
View
28 ports/debian/changelog
@@ -1,9 +1,35 @@
+parrot (2.0.0-1) unstable; urgency=low
+ * New upstream release
+ * parrot-devel.install.in
+ - Install parrot-nqp binary and supporting library.
+ * debian/patches:
+ - Added 01_fix_doc_install.patch, from upstream, missing DESTDIR
+ flag to new 'install-doc' target needed for package build.
+ - Added 02_fix_man_whatis.patch, from upstream, resolve parsing
+ errors in pbc_to_exe and parrot_debugger manpages.
+ - Added 03_fix_nqp_man.patch, added manpage for new parrot-nqp
+ binary.
+ * debian/control.in:
+ - Bumped Standards-Version to 3.8.4.
+ - Added quilt as Build-Depends for patches.
+ * debian/rules:
+ - Changed install target from 'install-dev' to 'install', they are
+ now identical.
+ - Added LD_LIBRARY_PATH to 'install' target, needed for the new parrot-nqp
+ binary.
+ - Added quilt support for patches.
+ - Generate and install manpage for parrot-nqp binary.
+ * debian/README.source:
+ - Added for use of quilt patch system.
+
+ -- Allison Randal <allison@parrot.org> Sun, 07 Feb 2010 05:22:29 +0000
+
parrot (1.4.0-1) unstable; urgency=low
* New upstream release
* debian/rules:
- New upstream configuration option --disable-rpath allows packages to
be built without rpath.
- * parrot-devel.install.in
+ * debian/parrot-devel.install.in
- Install pbc_to_exe binary and supporting library.
-- Allison Randal <allison@parrot.org> Fri, 24 Jul 2009 23:54:07 -0700
View
15 ports/debian/control.in
@@ -3,12 +3,12 @@ Section: interpreters
Priority: optional
Maintainer: Debian Parrot Maintainers <pkg-parrot-devel@lists.alioth.debian.org>
Uploaders: Allison Randal <allison@parrot.org>, Nuno Carvalho <mestre.smash@gmail.com>, Patrick Michaud <pmichaud@pobox.com>
-Build-Depends: debhelper (>= 5.0.0), perl, perl-doc, libgdbm-dev, libreadline-dev
-Standards-Version: 3.8.1
+Build-Depends: debhelper (>= 5.0.0), perl, perl-doc, libgdbm-dev, libreadline-dev, quilt
+Standards-Version: 3.8.4
Package: parrot
Architecture: any
-Depends: ${shlibs:Depends}, parrot-minimal (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, parrot-minimal (= ${binary:Version})
Suggests: parrot-doc
Provides: parrot-test, parrot-data-dumper
Description: A virtual machine for dynamic languages
@@ -18,7 +18,7 @@ Description: A virtual machine for dynamic languages
Package: parrot-minimal
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: parrot ( << 1.0.0 )
Replaces: parrot ( << 1.0.0 )
Description: A minimal install of the Parrot VM
@@ -29,7 +29,7 @@ Description: A minimal install of the Parrot VM
Package: libparrot@SOVERSION@
Architecture: any
Section: libs
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Parrot shared library
This package contains the Parrot shared library, used by the Parrot virtual
machine and by programs that embed Parrot.
@@ -37,7 +37,7 @@ Description: Parrot shared library
Package: libparrot-dev
Architecture: any
Section: libdevel
-Depends: libparrot@SOVERSION@ (= ${binary:Version}), parrot
+Depends: ${misc:Depends}, libparrot@SOVERSION@ (= ${binary:Version}), parrot
Description: Parrot shared library development files
This package contains header files and a static library, needed to develop
applications which embed Parrot.
@@ -46,6 +46,7 @@ Package: parrot-doc
Architecture: all
Section: doc
Suggests: perl-doc
+Depends: ${misc:Depends}
Description: Parrot documentation
Parrot manual pages and raw Pod documentation. If you are developing a
compiler or extensions for Parrot, you will need this. If you're only using a
@@ -54,7 +55,7 @@ Description: Parrot documentation
Package: parrot-devel
Architecture: any
Section: devel
-Depends: ${shlibs:Depends}, parrot, libparrot-dev, perl
+Depends: ${shlibs:Depends}, ${misc:Depends}, parrot, libparrot-dev, perl
Provides: parrot-pge, parrot-tge, parrot-pct, parrot-nqp
Conflicts: parrot ( << 1.0.0 ), libparrot-dev ( << 1.0.0 )
Replaces: parrot ( << 1.0.0 ), libparrot-dev ( << 1.0.0 )
View
2  ports/debian/copyright
@@ -8,7 +8,7 @@ It was downloaded from http://parrot.org/
Copyright for most of the code is held by:
-Copyright (C) 2001-2009, Parrot Foundation.
+Copyright (C) 2001-2010, Parrot Foundation.
Some files have a different copyright:
View
4 ports/debian/parrot-devel.install.in
@@ -4,9 +4,13 @@ usr/bin/pbc_dump
usr/bin/pbc_merge
usr/bin/pbc_to_exe
usr/bin/parrot_config
+usr/bin/parrot-nqp
usr/lib/parrot/@VERSION@/tools/*
usr/lib/parrot/@VERSION@/languages/nqp/*
usr/lib/parrot/@VERSION@/languages/pct/*
+usr/lib/parrot/@VERSION@/library/HLL.pbc
+usr/lib/parrot/@VERSION@/library/Regex.pbc
+usr/lib/parrot/@VERSION@/library/P6Regex.pbc
usr/lib/parrot/@VERSION@/library/PCT.pbc
usr/lib/parrot/@VERSION@/library/PCT/*
usr/lib/parrot/@VERSION@/library/P6object.pbc
View
11 ports/debian/patches/01_fix_doc_install.patch
@@ -0,0 +1,11 @@
+--- parrot-2.0.0.orig/config/gen/makefiles/root.in
++++ parrot-2.0.0/config/gen/makefiles/root.in
+@@ -2664,6 +2664,7 @@
+ --buildprefix=$(BUILDPREFIX) \
+ --prefix=$(PREFIX) \
+ --docdir=$(DOC_DIR) \
++ --destdir=$(DESTDIR) \
+ --versiondir=$(VERSION_DIR) \
+ MANIFEST MANIFEST.generated
+
+
View
22 ports/debian/patches/02_fix_man_whatis.patch
@@ -0,0 +1,22 @@
+--- parrot-2.0.0.orig/tools/dev/pbc_to_exe.pir
++++ parrot-2.0.0/tools/dev/pbc_to_exe.pir
+@@ -4,7 +4,7 @@
+
+ =head1 NAME
+
+-pbc_to_exe
++pbc_to_exe - Generate executables from Parrot bytecode
+
+ =head1 DESCRIPTION
+
+--- parrot-2.0.0.orig/src/parrot_debugger.c
++++ parrot-2.0.0/src/parrot_debugger.c
+@@ -4,7 +4,7 @@
+
+ =head1 NAME
+
+-parrot_debugger
++parrot_debugger - The Parrot Debugger
+
+ =head1 DESCRIPTION
+
View
45 ports/debian/patches/03_fix_nqp_man.patch
@@ -0,0 +1,45 @@
+--- parrot-2.0.0.orig/ext/nqp-rx/parrot-nqp.pod
++++ parrot-2.0.0/ext/nqp-rx/parrot-nqp.pod
+@@ -0,0 +1,42 @@
++# Copyright (C) 2010, The Perl Foundation.
++# $Id: running.pod 42150 2009-10-28 01:24:50Z coke $
++
++=head1 NAME
++
++parrot-nqp - A Not Quite Perl compiler for Parrot
++
++=head1 DESCRIPTION
++
++"Not Quite Perl" (NQP) is a compiler for quickly generating PIR
++routines from Perl6-like code. The key feature of NQP is that it's
++designed to be a very small compiler and is focused on being a
++high-level way to create transformers for Parrot (especially hll
++compilers).
++
++=head1 SYNOPSIS
++
++ parrot-nqp [-options] <file>
++
++=head1 OPTIONS
++
++=over 4
++
++=item --encoding
++
++Specify the encoding of the input file.
++
++=item -h, --help
++
++Print a summary of command-line options.
++
++=item -o outputfile, --output=outputfile
++
++Specify a filename for the resulting compiled code.
++
++=item -v, --version
++
++Display the version of Parrot used to build the compiler.
++
++=back
++
++=cut
View
3  ports/debian/patches/series
@@ -0,0 +1,3 @@
+01_fix_doc_install.patch
+02_fix_man_whatis.patch
+03_fix_nqp_man.patch
View
12 ports/debian/rules
@@ -1,5 +1,7 @@
#!/usr/bin/make -f
+include /usr/share/quilt/quilt.make
+
CFLAGS = -Wall -g
VERSION = $(shell cat VERSION)
SOVERSION = $(VERSION)
@@ -29,7 +31,7 @@ debian-control-stamp: $(CONTROL_FILES) VERSION
touch $@
configure: configure-stamp
-configure-stamp: debian-control-stamp
+configure-stamp: debian-control-stamp $(QUILT_STAMPFN)
dh_testdir
perl Configure.pl --prefix=/usr --disable-rpath
touch configure-stamp
@@ -46,9 +48,10 @@ build-stamp: configure-stamp
pod2man --section=1 --release="Debian Project" --center="Debian GNU/Linux manual" src/parrot_debugger.c debian/parrot_debugger.1
pod2man --section=1 --release="Debian Project" --center="Debian GNU/Linux manual" src/pbc_merge.c debian/pbc_merge.1
pod2man --section=1 --release="Debian Project" --center="Debian GNU/Linux manual" tools/dev/pbc_to_exe.pir debian/pbc_to_exe.1
+ pod2man --section=1 --release="Debian Project" --center="Debian GNU/Linux manual" ext/nqp-rx/parrot-nqp.pod debian/parrot-nqp.1
touch build-stamp
-clean: debian-control-stamp
+clean: debian-control-stamp unpatch
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp debian-control-stamp debian/parrot.1 debian/parrot_config.1 debian/pbc_dump.1 debian/pbc_disassemble.1 debian/parrot-debugger.1 debian/pbc_merge.1 debian/libparrot$(SOVERSION).install src/main.o installable_pbc_to_exe ext/Parrot-Embed/Makefile.PL test.c test.ldo
@@ -62,7 +65,8 @@ install: build debian/libparrot$(SOVERSION).install
dh_testdir
dh_testroot
dh_clean -k
- $(MAKE) install-dev DESTDIR=$(CURDIR)/debian/tmp
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}`pwd`/blib/lib
+ $(MAKE) install-doc DESTDIR=$(CURDIR)/debian/tmp
dh_installdirs
find $(CURDIR)/debian/tmp -type f
dh_install --sourcedir=$(CURDIR)/debian/tmp --list-missing
@@ -89,7 +93,7 @@ binary-arch: build install
dh_testroot -a
dh_installchangelogs -a ChangeLog
dh_installman -pparrot-minimal debian/parrot.1
- dh_installman -pparrot-devel debian/parrot_debugger.1 debian/pbc_disassemble.1 debian/pbc_dump.1 debian/pbc_merge.1 debian/parrot_config.1 debian/pbc_to_exe.1
+ dh_installman -pparrot-devel debian/parrot_debugger.1 debian/pbc_disassemble.1 debian/pbc_dump.1 debian/pbc_merge.1 debian/parrot_config.1 debian/pbc_to_exe.1 debian/parrot-nqp.1
dh_installdocs -a
dh_strip -a
dh_compress -a
View
5 src/pmc/imageio.pmc
@@ -14,11 +14,6 @@ Freezes and thaws other PMCs.
#define GROW_TO_16_BYTE_BOUNDARY(size) ((size) + ((size) % 16 ? 16 - (size) % 16 : 0))
-/* when thawing a string longer then this size, we first do a GC run and then
- * block GC - the system can't give us more headers */
-
-#define THAW_BLOCK_GC_SIZE 100000
-
/* preallocate freeze image for aggregates with this estimation */
#define FREEZE_BYTES_PER_ITEM 9
Please sign in to comment.
Something went wrong with that request. Please try again.