@@ -4,7 +4,7 @@
"gtk2-perl Team <gtk-perl-list at gnome dot org>"
],
"dynamic_config" : 1,
- "generated_by" : "ExtUtils::MakeMaker version 6.86, CPAN::Meta::Converter version 2.133380",
+ "generated_by" : "ExtUtils::MakeMaker version 6.98, CPAN::Meta::Converter version 2.141520",
"license" : [
"lgpl_2_1"
],
@@ -80,5 +80,5 @@
},
"x_MailingList" : "https://mail.gnome.org/mailman/listinfo/gtk-perl-list"
},
- "version" : "1.305"
+ "version" : "1.306"
}
@@ -3,17 +3,17 @@ abstract: 'Perl wrappers for the GLib utility and Object libraries'
author:
- 'gtk2-perl Team <gtk-perl-list at gnome dot org>'
build_requires:
- ExtUtils::MakeMaker: 0
+ ExtUtils::MakeMaker: '0'
configure_requires:
- ExtUtils::Depends: 0.300
- ExtUtils::MakeMaker: 0
- ExtUtils::PkgConfig: 1.000
+ ExtUtils::Depends: '0.300'
+ ExtUtils::MakeMaker: '0'
+ ExtUtils::PkgConfig: '1.000'
dynamic_config: 1
-generated_by: 'ExtUtils::MakeMaker version 6.86, CPAN::Meta::Converter version 2.133380'
+generated_by: 'ExtUtils::MakeMaker version 6.98, CPAN::Meta::Converter version 2.141520'
license: lgpl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
- version: 1.4
+ version: '1.4'
name: Glib
no_index:
directory:
@@ -42,12 +42,12 @@ no_index:
package:
- MY
requires:
- ExtUtils::Depends: 0.300
- ExtUtils::PkgConfig: 1.000
+ ExtUtils::Depends: '0.300'
+ ExtUtils::PkgConfig: '1.000'
resources:
MailingList: https://mail.gnome.org/mailman/listinfo/gtk-perl-list
bugtracker: http://rt.cpan.org/Public/Dist/Display.html?Name=Glib
homepage: http://gtk2-perl.sourceforge.net
license: http://www.gnu.org/licenses/lgpl-2.1.html
repository: git://git.gnome.org/perl-Glib
-version: 1.305
+version: '1.306'
@@ -192,6 +192,20 @@ $glib->save_config ('build/IFiles.pm');
our @exports;
require 'Glib.exports';
+# On OpenBSD, any program that directly or indirectly wants to load
+# libpthread.so must do so from the start. But when perl is built without
+# ithreads, it will also most likely not be compiled with "-pthread". When
+# libglib/libgobject then go and try to load libpthread.so, the loader will
+# error out.
+my @openbsd_compat_flags = ();
+if ($^O eq 'openbsd' && $Config::Config{ldflags} !~ m/-pthread\b/) {
+ warn " ***\n *** on OpenBSD, we either need perl linked with '-pthread',\n",
+ " *** or we need to set LD_PRELOAD=libpthread.so; doing the latter now...\n ***\n";
+ @openbsd_compat_flags = (
+ macro => {FULLPERLRUN => 'LD_PRELOAD=libpthread.so $(FULLPERL)'},
+ );
+}
+
WriteMakefile(
NAME => 'Glib',
VERSION_FROM => 'lib/Glib.pm', # finds $VERSION
@@ -203,6 +217,7 @@ WriteMakefile(
DL_FUNCS => { Glib => [] },
META_MERGE => \%meta_merge,
$glib ? $glib->get_makefile_vars : (),
+ @openbsd_compat_flags,
);
=unstable
@@ -250,7 +265,7 @@ build/podindex :: \$(INST_LIB)/Glib/GenPod.pm
\$(INST_LIB)/\$(FULLEXT)/xsapi.pod :: build/doc.pl apidoc.pl xsapi.pod.head xsapi.pod.foot
\$(NOECHO) \$(ECHO) Creating XS API documentation...
- \$(NOECHO) $^X apidoc.pl xsapi.pod.head xsapi.pod.foot build/doc.pl > \$@
+ \$(NOECHO) \$(FULLPERLRUN) apidoc.pl xsapi.pod.head xsapi.pod.foot build/doc.pl > \$@
"
. Glib::MakeHelper->postamble_precompiled_headers (qw/gperl.h/)
@@ -1,3 +1,8 @@
+Overview of changes in Glib 1.306 (stable)
+==========================================
+
+* Fix libpthread-related building issues on OpenBSD
+
Overview of changes in Glib 1.305 (stable)
==========================================
@@ -5,7 +5,7 @@ use warnings;
use Carp;
use IO::File;
-our $VERSION = '1.305';
+our $VERSION = '1.306';
# type handlers should look like this:
# sub gen_foo_stuff {
@@ -9,7 +9,7 @@
package Glib::GenPod;
-our $VERSION = '1.305';
+our $VERSION = '1.306';
use strict;
use warnings;
@@ -4,7 +4,7 @@
package Glib::MakeHelper;
-our $VERSION = '1.305';
+our $VERSION = '1.306';
=head1 NAME
@@ -422,7 +422,7 @@ build/blib_done_ :: build/blib_done_dynamic
build/doc.pl :: Makefile @xs_files
\$(NOECHO) \$(ECHO) Parsing XS files...
- \$(NOECHO) $^X -I \$(INST_LIB) -I \$(INST_ARCHLIB) -MGlib::ParseXSDoc \\
+ \$(NOECHO) \$(FULLPERLRUN) -I \$(INST_LIB) -I \$(INST_ARCHLIB) -MGlib::ParseXSDoc \\
-e "xsdocparse (qw(@xs_files))" > \$@
# passing all of these files through the single podindex file, which is
@@ -432,18 +432,18 @@ build/doc.pl :: Makefile @xs_files
build/podindex :: \$(BLIB_DONE) Makefile build/doc.pl \$(POD_DEPENDS)
\$(NOECHO) \$(ECHO) Generating POD...
- \$(NOECHO) $^X -I \$(INST_LIB) -I \$(INST_ARCHLIB) -MGlib::GenPod -M\$(NAME) \\
+ \$(NOECHO) \$(FULLPERLRUN) -I \$(INST_LIB) -I \$(INST_ARCHLIB) -MGlib::GenPod -M\$(NAME) \\
-e "$docgen_code"
\$(INST_LIB)/\$(FULLEXT)/:
- $^X -MExtUtils::Command -e mkpath \$@
+ \$(FULLPERLRUN) -MExtUtils::Command -e mkpath \$@
\$(INST_LIB)/\$(FULLEXT)/index.pod :: \$(INST_LIB)/\$(FULLEXT)/ build/podindex
\$(NOECHO) \$(ECHO) Creating POD index...
- \$(NOECHO) $^X -e "print qq(\\n=head1 NAME\\n\\n\$(NAME) - API Reference Pod Index\\n\\n=head1 PAGES\\n\\n=over\\n\\n)" \\
+ \$(NOECHO) \$(FULLPERLRUN) -e "print qq(\\n=head1 NAME\\n\\n\$(NAME) - API Reference Pod Index\\n\\n=head1 PAGES\\n\\n=over\\n\\n)" \\
> \$(INST_LIB)/\$(FULLEXT)/index.pod
- \$(NOECHO) $^X -ne "print q(=item L<) . (split q( ))[1] . qq(>\\n\\n);" < build/podindex >> \$(INST_LIB)/\$(FULLEXT)/index.pod
- \$(NOECHO) $^X -e "print qq(=back\\n\\n);" >> \$(INST_LIB)/\$(FULLEXT)/index.pod
+ \$(NOECHO) \$(FULLPERLRUN) -ne "print q(=item L<) . (split q( ))[1] . qq(>\\n\\n);" < build/podindex >> \$(INST_LIB)/\$(FULLEXT)/index.pod
+ \$(NOECHO) \$(FULLPERLRUN) -e "print qq(=back\\n\\n);" >> \$(INST_LIB)/\$(FULLEXT)/index.pod
__EOM__
}
@@ -20,7 +20,7 @@
package Glib::Object::Subclass;
-our $VERSION = '1.305';
+our $VERSION = '1.306';
use Glib;
@@ -13,7 +13,7 @@ our @EXPORT = qw(
xsdocparse
);
-our $VERSION = '1.305';
+our $VERSION = '1.306';
our $NOISY = $ENV{NOISYDOC};
@@ -27,7 +27,7 @@ use Exporter;
require DynaLoader;
our @ISA = qw(DynaLoader Exporter);
-our $VERSION = '1.305';
+our $VERSION = '1.306';
use constant {
TRUE => 1,