@@ -4,7 +4,7 @@
"Cairo Perl Team <gtk-perl-list at gnome dot org>"
],
"dynamic_config" : 1,
- "generated_by" : "ExtUtils::MakeMaker version 6.66, CPAN::Meta::Converter version 2.120921",
+ "generated_by" : "ExtUtils::MakeMaker version 6.98, CPAN::Meta::Converter version 2.141520",
"license" : [
"lgpl_2_1"
],
@@ -23,9 +23,21 @@
]
},
"prereqs" : {
+ "build" : {
+ "requires" : {
+ "ExtUtils::MakeMaker" : "0"
+ }
+ },
"configure" : {
"requires" : {
"ExtUtils::Depends" : "0.2",
+ "ExtUtils::MakeMaker" : "0",
+ "ExtUtils::PkgConfig" : "1"
+ }
+ },
+ "runtime" : {
+ "requires" : {
+ "ExtUtils::Depends" : "0.2",
"ExtUtils::PkgConfig" : "1"
}
},
@@ -52,5 +64,5 @@
},
"x_MailingList" : "https://mail.gnome.org/mailman/listinfo/gtk-perl-list"
},
- "version" : "1.104"
+ "version" : "1.105"
}
@@ -2,16 +2,18 @@
abstract: 'Perl interface to the cairo 2d vector graphics library'
author:
- 'Cairo Perl Team <gtk-perl-list at gnome dot org>'
-build_requires: {}
+build_requires:
+ ExtUtils::MakeMaker: '0'
configure_requires:
- ExtUtils::Depends: 0.2
- ExtUtils::PkgConfig: 1
+ ExtUtils::Depends: '0.2'
+ ExtUtils::MakeMaker: '0'
+ ExtUtils::PkgConfig: '1'
dynamic_config: 1
-generated_by: 'ExtUtils::MakeMaker version 6.66, CPAN::Meta::Converter version 2.120921'
+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: Cairo
no_index:
directory:
@@ -19,10 +21,13 @@ no_index:
- inc
file:
- inc/MakeHelper.pm
+requires:
+ ExtUtils::Depends: '0.2'
+ ExtUtils::PkgConfig: '1'
resources:
+ MailingList: https://mail.gnome.org/mailman/listinfo/gtk-perl-list
bugtracker: http://rt.cpan.org/Public/Dist/Display.html?Name=Cairo
homepage: http://gtk2-perl.sourceforge.net
license: http://www.gnu.org/licenses/lgpl-2.1.html
repository: git://git.gnome.org/perl-Cairo
- x_MailingList: https://mail.gnome.org/mailman/listinfo/gtk-perl-list
-version: 1.104
+version: '1.105'
@@ -571,6 +571,20 @@ $dep->install (qw(cairo-perl.h
build/cairo-perl-auto.typemap));
$dep->save_config ('build/IFiles.pm');
+# 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 => 'Cairo',
#AUTHOR, LICENSE are now part of %meta_merge
@@ -582,6 +596,7 @@ WriteMakefile (
DL_FUNCS => { Cairo=> [] },
META_MERGE => \%meta_merge,
$dep->get_makefile_vars,
+ @openbsd_compat_flags,
);
sub MY::postamble
@@ -1,3 +1,8 @@
+Overview of changes in Cairo 1.105
+==================================
+
+* Fix libpthread-related building issues on OpenBSD
+
Overview of changes in Cairo 1.104
==================================
@@ -14,7 +14,7 @@ use DynaLoader;
our @ISA = qw/DynaLoader/;
-our $VERSION = '1.104';
+our $VERSION = '1.105';
sub dl_load_flags { $^O eq 'darwin' ? 0x00 : 0x01 }