Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

FreeBSD and OpenBSD: make hints display better when verbose output ha…

…s been selected (along same lines as Darwin and Linux).
  • Loading branch information...
commit b6bf3d3273db0960d81da518f87f1186f4baca85 1 parent 4fe04fa
@jkeenan jkeenan authored
Showing with 35 additions and 19 deletions.
  1. +12 −4 config/init/hints/freebsd.pm
  2. +23 −15 config/init/hints/openbsd.pm
View
16 config/init/hints/freebsd.pm
@@ -29,10 +29,10 @@ sub runstep {
$libs .= ' -pthread';
- $conf->data->set(
- libs => $libs,
- link => 'g++',
- rpath => '-Wl,-R',
+ my %freebsd_selections = (
+ libs => $libs,
+ link => 'g++',
+ rpath => '-Wl,-R',
has_dynamic_linking => 1,
parrot_is_shared => 1,
libparrot_shared => "libparrot$share_ext.$version",
@@ -40,6 +40,14 @@ sub runstep {
libparrot_soname => "-Wl,-soname=libparrot$share_ext.$version",
osvers => $osvers,
);
+ my $freebsd_hints = "FreeBSD hints settings:\n";
+ for my $k (sort keys %freebsd_selections) {
+ $freebsd_hints .= sprintf(" %-24s => %s\n" => (
+ $k, qq|'$freebsd_selections{$k}'|,
+ ) );
+ }
+ $conf->debug($freebsd_hints);
+ $conf->data->set( %freebsd_selections );
}
1;
View
38 config/init/hints/openbsd.pm
@@ -26,24 +26,32 @@ sub runstep {
$ldflags .= ' -L/usr/local/lib';
}
- $conf->data->set(
- ldflags => $ldflags,
- 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",
+ my %openbsd_selections = (
+ ldflags => $ldflags,
+ 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",
+ clock_best => '-D_POSIX_TIMERS -DCLOCK_BEST=CLOCK_MONOTONIC',
);
- if ( ( split( m/-/, $conf->data->get('archname_provisional'), 2 ) )[0] eq 'powerpc' ) {
- $conf->data->set( as => 'as -mregnames' );
+ if ( ( split( m/-/, $conf->data->get('archname_provisional'), 2 ) )[0]
+ eq 'powerpc' ) {
+ $openbsd_selections{as} = 'as -mregnames';
}
-
- $conf->data->set( clock_best => '-D_POSIX_TIMERS -DCLOCK_BEST=CLOCK_MONOTONIC' );
+ my $openbsd_hints = "OpenBSD hints settings:\n";
+ for my $k (sort keys %openbsd_selections) {
+ $openbsd_hints .= sprintf(" %-24s => %s\n" => (
+ $k, qq|'$openbsd_selections{$k}'|,
+ ) );
+ }
+ $conf->debug($openbsd_hints);
+ $conf->data->set( %openbsd_selections );
}
1;
Please sign in to comment.
Something went wrong with that request. Please try again.