[svn:parrot] r39871 - in trunk/config: gen/makefiles init/hints inter
jkeenan at svn.parrot.org
jkeenan at svn.parrot.org
Fri Jul 3 14:40:21 UTC 2009
Author: jkeenan
Date: Fri Jul 3 14:40:18 2009
New Revision: 39871
URL: https://trac.parrot.org/parrot/changeset/39871
Log:
[config] Modify config/init/hints/*.pm files to eliminate use of $(SHARE_EXT) and
$(SOVERSION). Modify config/inter/libparrot.pm to change 'libparrot' to
'libparrot_for_makefile_only'. Make similar change in
config/gen/makefiles/root.in. This should eliminate $(SHARE_EXT) and
$(SOVERSION) in lib/Parrot/Config/Generated.pm and config_lib.pasm and, hence,
output of parrot_config. See https://trac.parrot.org/parrot/ticket/797.
Modified:
trunk/config/gen/makefiles/root.in
trunk/config/init/hints/darwin.pm
trunk/config/init/hints/dragonfly.pm
trunk/config/init/hints/freebsd.pm
trunk/config/init/hints/linux.pm
trunk/config/init/hints/mswin32.pm
trunk/config/init/hints/openbsd.pm
trunk/config/inter/libparrot.pm
Modified: trunk/config/gen/makefiles/root.in
==============================================================================
--- trunk/config/gen/makefiles/root.in Fri Jul 3 13:41:44 2009 (r39870)
+++ trunk/config/gen/makefiles/root.in Fri Jul 3 14:40:18 2009 (r39871)
@@ -509,7 +509,9 @@
#ELSE:LIBPARROT_SHARED := @blib_dir@/@libparrot_shared@
# This line controls whether a static or shared library is built
-LIBPARROT := @libparrot@
+# by Parrot's make. It is not useful otherwise (e.g., in
+# lib/Parrot/Config/Generated.pm or config_lib.pasm).
+LIBPARROT := @libparrot_for_makefile_only@
#IF(has_icu):ICU_SHARED := @icu_shared@
ALL_PARROT_LIBS := @libparrot_linkflags@ $(ICU_SHARED) $(C_LIBS)
Modified: trunk/config/init/hints/darwin.pm
==============================================================================
--- trunk/config/init/hints/darwin.pm Fri Jul 3 13:41:44 2009 (r39870)
+++ trunk/config/init/hints/darwin.pm Fri Jul 3 14:40:18 2009 (r39871)
@@ -16,6 +16,8 @@
sub runstep {
my ( $self, $conf ) = @_;
+ my $share_ext = $conf->option_or_data('share_ext');
+ my $version = $conf->option_or_data('VERSION');
my $verbose = $conf->options->get('verbose');
# The hash referenced by $flagsref is the list of options that have -arch
@@ -61,8 +63,8 @@
# of the library.
parrot_is_shared => 1,
- libparrot_shared => 'libparrot.$(SOVERSION)$(SHARE_EXT)',
- libparrot_shared_alias => 'libparrot$(SHARE_EXT)',
+ libparrot_shared => "libparrot.$version$share_ext",
+ libparrot_shared_alias => "libparrot$share_ext",
rpath => "-L",
libparrot_soname => "-install_name "
. $lib_dir
Modified: trunk/config/init/hints/dragonfly.pm
==============================================================================
--- trunk/config/init/hints/dragonfly.pm Fri Jul 3 13:41:44 2009 (r39870)
+++ trunk/config/init/hints/dragonfly.pm Fri Jul 3 14:40:18 2009 (r39871)
@@ -9,6 +9,8 @@
sub runstep {
my ( $self, $conf ) = @_;
+ my $share_ext = $conf->option_or_data('share_ext');
+ my $version = $conf->option_or_data('VERSION');
my $libs = $conf->data->get('libs');
$libs .= ' -pthread' unless $libs =~ /pthread/;
@@ -20,9 +22,9 @@
has_dynamic_linking => 1,
parrot_is_shared => 1,
- libparrot_shared => 'libparrot$(SHARE_EXT).$(SOVERSION)',
- libparrot_shared_alias => 'libparrot$(SHARE_EXT)',
- libparrot_soname => '-Wl,-soname=libparrot$(SHARE_EXT).$(SOVERSION)',
+ libparrot_shared => "libparrot$share_ext.$version",
+ libparrot_shared_alias => "libparrot$share_ext",
+ libparrot_soname => "-Wl,-soname=libparrot$share_ext.$version",
);
}
Modified: trunk/config/init/hints/freebsd.pm
==============================================================================
--- trunk/config/init/hints/freebsd.pm Fri Jul 3 13:41:44 2009 (r39870)
+++ trunk/config/init/hints/freebsd.pm Fri Jul 3 14:40:18 2009 (r39871)
@@ -9,6 +9,8 @@
sub runstep {
my ( $self, $conf ) = @_;
+ my $share_ext = $conf->option_or_data('share_ext');
+ my $version = $conf->option_or_data('VERSION');
my $libs = $conf->data->get('libs');
# get rid of old pthread-stuff, if any
@@ -35,9 +37,9 @@
has_dynamic_linking => 1,
parrot_is_shared => 1,
- libparrot_shared => 'libparrot$(SHARE_EXT).$(SOVERSION)',
- libparrot_shared_alias => 'libparrot$(SHARE_EXT)',
- libparrot_soname => '-Wl,-soname=libparrot$(SHARE_EXT).$(SOVERSION)',
+ libparrot_shared => "libparrot$share_ext.$version",
+ libparrot_shared_alias => "libparrot$share_ext",
+ libparrot_soname => "-Wl,-soname=libparrot$share_ext.$version",
);
}
Modified: trunk/config/init/hints/linux.pm
==============================================================================
--- trunk/config/init/hints/linux.pm Fri Jul 3 13:41:44 2009 (r39870)
+++ trunk/config/init/hints/linux.pm Fri Jul 3 14:40:18 2009 (r39871)
@@ -13,6 +13,8 @@
my $ccflags = $conf->option_or_data('ccflags');
my $cc = $conf->option_or_data('cc');
my $linkflags = $conf->option_or_data('linkflags');
+ my $share_ext = $conf->option_or_data('share_ext');
+ my $version = $conf->option_or_data('VERSION');
my $verbose;
$verbose = $conf->options->get('verbose');
@@ -142,9 +144,9 @@
has_dynamic_linking => 1,
parrot_is_shared => 1,
- libparrot_shared => 'libparrot$(SHARE_EXT).$(SOVERSION)',
- libparrot_shared_alias => 'libparrot$(SHARE_EXT)',
- libparrot_soname => '-Wl,-soname=libparrot$(SHARE_EXT).$(SOVERSION)',
+ libparrot_shared => "libparrot$share_ext.$version",
+ libparrot_shared_alias => "libparrot$share_ext",
+ libparrot_soname => "-Wl,-soname=libparrot$share_ext.$version",
);
if ( ( split( m/-/, $conf->data->get_p5('archname'), 2 ) )[0] eq 'ia64' ) {
Modified: trunk/config/init/hints/mswin32.pm
==============================================================================
--- trunk/config/init/hints/mswin32.pm Fri Jul 3 13:41:44 2009 (r39870)
+++ trunk/config/init/hints/mswin32.pm Fri Jul 3 14:40:18 2009 (r39871)
@@ -13,6 +13,8 @@
my $libs = $conf->option_or_data('libs');
my $ccflags = $conf->option_or_data('ccflags');
my $cc = $conf->option_or_data('cc');
+ my $share_ext = $conf->option_or_data('share_ext');
+ my $version = $conf->option_or_data('VERSION');
# Later in the Parrot::Configure::runsteps() process,
# inter::progs will merge the command-line overrides with the defaults.
@@ -93,7 +95,7 @@
ldflags => '-nologo -nodefaultlib',
libs => 'kernel32.lib ws2_32.lib msvcrt.lib oldnames.lib ',
libparrot_static => 'libparrot' . $conf->data->get('a'),
- libparrot_shared => 'libparrot$(SHARE_EXT)',
+ libparrot_shared => "libparrot$share_ext",
ar_flags => '',
ar_out => '-out:',
slash => '\\',
Modified: trunk/config/init/hints/openbsd.pm
==============================================================================
--- trunk/config/init/hints/openbsd.pm Fri Jul 3 13:41:44 2009 (r39870)
+++ trunk/config/init/hints/openbsd.pm Fri Jul 3 14:40:18 2009 (r39871)
@@ -9,6 +9,8 @@
sub runstep {
my ( $self, $conf ) = @_;
+ my $share_ext = $conf->option_or_data('share_ext');
+ my $version = $conf->option_or_data('VERSION');
my $ccflags = $conf->data->get('ccflags');
if ( $ccflags !~ /-pthread/ ) {
$ccflags .= ' -pthread';
@@ -26,9 +28,9 @@
has_dynamic_linking => 1,
parrot_is_shared => 1,
- libparrot_shared => 'libparrot$(SHARE_EXT).$(SOVERSION)',
- libparrot_shared_alias => 'libparrot$(SHARE_EXT)',
- libparrot_soname => '-Wl,-soname=libparrot$(SHARE_EXT).$(SOVERSION)',
+ libparrot_shared => "libparrot$share_ext.$version",
+ libparrot_shared_alias => "libparrot$share_ext",
+ libparrot_soname => "-Wl,-soname=libparrot$share_ext.$version",
);
if ( ( split( m/-/, $conf->data->get_p5('archname'), 2 ) )[0] eq 'powerpc' ) {
Modified: trunk/config/inter/libparrot.pm
==============================================================================
--- trunk/config/inter/libparrot.pm Fri Jul 3 13:41:44 2009 (r39870)
+++ trunk/config/inter/libparrot.pm Fri Jul 3 14:40:18 2009 (r39871)
@@ -91,9 +91,9 @@
$conf->data->set(
parrot_is_shared => $parrot_is_shared,
- libparrot => $parrot_is_shared
- ? '$(LIBPARROT_SHARED)'
- : '$(LIBPARROT_STATIC)',
+ libparrot_for_makefile_only => $parrot_is_shared
+ ? '$(LIBPARROT_SHARED)'
+ : '$(LIBPARROT_STATIC)',
);
# Set -rpath (or equivalent) for executables to find the
More information about the parrot-commits
mailing list