[svn:parrot] r49788 - in trunk: . compilers/data_json compilers/imcc compilers/pct compilers/pge compilers/tge config/auto config/auto/ipv6 config/auto/sizes config/auto/zlib config/init config/init/hints docs/book/draft docs/book/pct docs/dev docs/pdds examples/embed examples/languages/abc examples/languages/squaak examples/pge examples/tools ext/nqp-rx include/parrot lib/Parrot lib/Parrot/Configure/Step ports/cygwin ports/debian runtime/parrot/languages runtime/parrot/library runtime/parrot/library/Math src/call src/gc src/interp src/runcore t/codingstd t/compilers/tge t/examples t/oo t/pmc t/src t/steps/auto t/steps/init/hints tools/build tools/dev tools/release
jkeenan at svn.parrot.org
jkeenan at svn.parrot.org
Sat Nov 6 14:45:32 UTC 2010
Author: jkeenan
Date: Sat Nov 6 14:45:31 2010
New Revision: 49788
URL: https://trac.parrot.org/parrot/changeset/49788
Log:
Merge tt1841_osvers branch into trunk. Adds 'osvers' to configuration data.
Modified:
trunk/ (props changed)
trunk/compilers/data_json/Rules.mak (props changed)
trunk/compilers/imcc/Rules.in (props changed)
trunk/compilers/pct/Rules.mak (props changed)
trunk/compilers/pge/Rules.mak (props changed)
trunk/compilers/tge/Rules.mak (props changed)
trunk/config/auto/arch.pm
trunk/config/auto/ipv6.pm (props changed)
trunk/config/auto/ipv6/test.in (props changed)
trunk/config/auto/sizes/intval_maxmin_c.in (props changed)
trunk/config/auto/zlib/ (props changed)
trunk/config/init/defaults.pm
trunk/config/init/hints/darwin.pm
trunk/config/init/hints/freebsd.pm
trunk/config/init/hints/linux.pm
trunk/docs/book/draft/README (props changed)
trunk/docs/book/draft/appa_glossary.pod (props changed)
trunk/docs/book/draft/appb_patch_submission.pod (props changed)
trunk/docs/book/draft/appc_command_line_options.pod (props changed)
trunk/docs/book/draft/appd_build_options.pod (props changed)
trunk/docs/book/draft/appe_source_code.pod (props changed)
trunk/docs/book/draft/ch01_introduction.pod (props changed)
trunk/docs/book/draft/ch02_getting_started.pod (props changed)
trunk/docs/book/draft/ch07_dynpmcs.pod (props changed)
trunk/docs/book/draft/ch08_dynops.pod (props changed)
trunk/docs/book/draft/ch10_opcode_reference.pod (props changed)
trunk/docs/book/draft/ch11_directive_reference.pod (props changed)
trunk/docs/book/draft/ch12_operator_reference.pod (props changed)
trunk/docs/book/draft/chXX_hlls.pod (props changed)
trunk/docs/book/draft/chXX_library.pod (props changed)
trunk/docs/book/draft/chXX_testing_and_debugging.pod (props changed)
trunk/docs/book/pct/ch01_introduction.pod (props changed)
trunk/docs/book/pct/ch02_getting_started.pod (props changed)
trunk/docs/book/pct/ch03_compiler_tools.pod (props changed)
trunk/docs/book/pct/ch04_pge.pod (props changed)
trunk/docs/book/pct/ch05_nqp.pod (props changed)
trunk/docs/dev/c_functions.pod (props changed)
trunk/docs/pdds/pdd30_install.pod (props changed)
trunk/examples/embed/cotorra.c (props changed)
trunk/examples/languages/abc/ (props changed)
trunk/examples/languages/squaak/ (props changed)
trunk/examples/pge/demo.pir (props changed)
trunk/examples/tools/pgegrep (props changed)
trunk/ext/nqp-rx/Rules.mak (props changed)
trunk/include/parrot/call.h (props changed)
trunk/include/parrot/gc_api.h (props changed)
trunk/include/parrot/runcore_api.h (props changed)
trunk/include/parrot/runcore_profiling.h (props changed)
trunk/include/parrot/runcore_trace.h (props changed)
trunk/lib/Parrot/Configure/Step/Test.pm (props changed)
trunk/lib/Parrot/H2inc.pm (props changed)
trunk/ports/cygwin/parrot-1.0.0-1.cygport (props changed)
trunk/ports/debian/libparrot-dev.install.in (props changed)
trunk/ports/debian/libparrot.install.in (props changed)
trunk/ports/debian/parrot-doc.install.in (props changed)
trunk/ports/debian/parrot.install.in (props changed)
trunk/runtime/parrot/languages/ (props changed)
trunk/runtime/parrot/library/Math/Rand.pir (props changed)
trunk/runtime/parrot/library/Rules.mak (props changed)
trunk/src/call/ops.c (props changed)
trunk/src/call/pcc.c (props changed)
trunk/src/gc/alloc_memory.c (props changed)
trunk/src/gc/alloc_resources.c (props changed)
trunk/src/gc/api.c (props changed)
trunk/src/gc/malloc.c (props changed)
trunk/src/gc/malloc_trace.c (props changed)
trunk/src/gc/mark_sweep.c (props changed)
trunk/src/gc/string_gc.c (props changed)
trunk/src/gc/system.c (props changed)
trunk/src/interp/inter_cb.c (props changed)
trunk/src/interp/inter_create.c (props changed)
trunk/src/interp/inter_misc.c (props changed)
trunk/src/runcore/cores.c (props changed)
trunk/src/runcore/main.c (props changed)
trunk/src/runcore/profiling.c (props changed)
trunk/src/runcore/trace.c (props changed)
trunk/t/codingstd/pmc_docs.t (props changed)
trunk/t/compilers/tge/NoneGrammar.tg (props changed)
trunk/t/examples/pgegrep.t (props changed)
trunk/t/oo/objects.t (props changed)
trunk/t/oo/root_new.t (props changed)
trunk/t/pmc/namespace-old.t (props changed)
trunk/t/src/embed.t (props changed)
trunk/t/steps/auto/ipv6-01.t (props changed)
trunk/t/steps/init/hints/linux-01.t (props changed)
trunk/tools/build/README (props changed)
trunk/tools/build/h2inc.pl (props changed)
trunk/tools/dev/README (props changed)
trunk/tools/dev/addopstags.pl (props changed)
trunk/tools/dev/dump_pbc.pl (props changed)
trunk/tools/dev/fetch_languages.pl (props changed)
trunk/tools/dev/headerizer.pl (props changed)
trunk/tools/dev/mk_gitignore.pl (props changed)
trunk/tools/dev/ncidef2pasm.pl (props changed)
trunk/tools/dev/parrot-config.pir (props changed)
trunk/tools/dev/perlcritic-cage.conf (props changed)
trunk/tools/dev/perlcritic.conf (props changed)
trunk/tools/dev/perltidy.conf (props changed)
trunk/tools/dev/update_copyright.pl (props changed)
trunk/tools/release/crow.pir (props changed)
trunk/tools/release/gen_release_info.pl (props changed)
trunk/tools/release/inc_ver.pir (props changed)
trunk/tools/release/release.json (props changed)
trunk/tools/release/templates.json (props changed)
Modified: trunk/config/auto/arch.pm
==============================================================================
--- trunk/config/auto/arch.pm Fri Nov 5 22:10:02 2010 (r49787)
+++ trunk/config/auto/arch.pm Sat Nov 6 14:45:31 2010 (r49788)
@@ -101,6 +101,8 @@
);
$conf->data->set( 'platform' => $self->_get_platform( $conf ) );
+ $conf->data->set( 'osvers' => $conf->data->get('osvers_provisional') )
+ unless $conf->data->get('osvers');
_report_verbose( $conf );
Modified: trunk/config/init/defaults.pm
==============================================================================
--- trunk/config/init/defaults.pm Fri Nov 5 22:10:02 2010 (r49787)
+++ trunk/config/init/defaults.pm Sat Nov 6 14:45:31 2010 (r49788)
@@ -59,6 +59,7 @@
ccflags
d_socklen_t
optimize
+ osvers
scriptdirexp
sig_name
sPRIgldbl
Modified: trunk/config/init/hints/darwin.pm
==============================================================================
--- trunk/config/init/hints/darwin.pm Fri Nov 5 22:10:02 2010 (r49787)
+++ trunk/config/init/hints/darwin.pm Sat Nov 6 14:45:31 2010 (r49788)
@@ -62,9 +62,13 @@
$flagsref->{$flag} =~ s/^\s+//;
}
+ my $osvers = `/usr/sbin/sysctl -n kern.osreldate`;
+ chomp $osvers;
+
$conf->data->set(
darwin => 1,
osx_version => $ENV{'MACOSX_DEPLOYMENT_TARGET'},
+ osvers => $osvers,
ccflags => $flagsref->{ccflags},
ldflags => $flagsref->{ldflags},
ccwarn => "-Wno-shadow",
Modified: trunk/config/init/hints/freebsd.pm
==============================================================================
--- trunk/config/init/hints/freebsd.pm Fri Nov 5 22:10:02 2010 (r49787)
+++ trunk/config/init/hints/freebsd.pm Sat Nov 6 14:45:31 2010 (r49788)
@@ -19,14 +19,14 @@
# The following test is from FreeBSD's /usr/ports/Mk/bsd.port.mk,
# which must be assumed to do the right thing.
- my $osversion;
+ my $osvers;
if ( -e "/sbin/sysctl" ) {
- $osversion = `/sbin/sysctl -n kern.osreldate`;
+ $osvers = `/sbin/sysctl -n kern.osreldate`;
}
else {
- $osversion = `/usr/sbin/sysctl -n kern.osreldate`;
+ $osvers = `/usr/sbin/sysctl -n kern.osreldate`;
}
- chomp $osversion;
+ chomp $osvers;
$libs .= ' -pthread';
@@ -34,12 +34,12 @@
libs => $libs,
link => 'g++',
rpath => '-Wl,-R',
-
- has_dynamic_linking => 1,
- parrot_is_shared => 1,
- libparrot_shared => "libparrot$share_ext.$version",
- libparrot_shared_alias => "libparrot$share_ext",
- libparrot_soname => "-Wl,-soname=libparrot$share_ext.$version",
+ has_dynamic_linking => 1,
+ parrot_is_shared => 1,
+ libparrot_shared => "libparrot$share_ext.$version",
+ libparrot_shared_alias => "libparrot$share_ext",
+ libparrot_soname => "-Wl,-soname=libparrot$share_ext.$version",
+ osvers => $osvers;
);
}
Modified: trunk/config/init/hints/linux.pm
==============================================================================
--- trunk/config/init/hints/linux.pm Fri Nov 5 22:10:02 2010 (r49787)
+++ trunk/config/init/hints/linux.pm Sat Nov 6 14:45:31 2010 (r49788)
@@ -69,15 +69,19 @@
$ccflags .= ' -D_GNU_SOURCE';
}
+ my $osvers = `/sbin/sysctl -n kernel.osrelease`;
+ chomp $osvers;
+
$conf->data->set(
- ccflags => $ccflags,
- libs => $libs,
- ld_share_flags => $ld_share_flags,
- ld_load_flags => $ld_share_flags,
- linkflags => $linkflags,
- link => $link,
- cc_shared => $cc_shared,
- rpath => '-Wl,-rpath=',
+ ccflags => $ccflags,
+ libs => $libs,
+ ld_share_flags => $ld_share_flags,
+ ld_load_flags => $ld_share_flags,
+ linkflags => $linkflags,
+ link => $link,
+ cc_shared => $cc_shared,
+ rpath => '-Wl,-rpath=',
+ osvers => $osvers,
has_dynamic_linking => 1,
parrot_is_shared => 1,
More information about the parrot-commits
mailing list