commit perl-Text-Hunspell for openSUSE:Factory

Hello community, here is the log from the commit of package perl-Text-Hunspell for openSUSE:Factory checked in at 2015-04-15 16:27:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Text-Hunspell (Old) and /work/SRC/openSUSE:Factory/.perl-Text-Hunspell.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Text-Hunspell" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Text-Hunspell/perl-Text-Hunspell.changes 2013-06-06 12:57:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-Text-Hunspell.new/perl-Text-Hunspell.changes 2015-04-15 16:27:50.000000000 +0200 @@ -1,0 +2,24 @@ +Wed Apr 15 11:54:19 UTC 2015 - coolo@suse.com + +- updated to 2.10 + see /usr/share/doc/packages/perl-Text-Hunspell/Changes + + 2.10 2015/03/26 11:24:00 Europe/Oslo (cosimo) + + Fixed GH#5 (http://github.com/cosimo/perl5-text-hunspell/issues/5). + Should make Text::Hunspell installable without pain from CPAN and + cpanminus clients. The problem was in the undeclared use of + ExtUtils::PkgConfig, which needs to be known even before running + the configure (Makefile.PL) step. Thanks to Pavel Shaydo for reporting + the problem. + + 2.09 2014/10/20 07:56:00 Europe/Oslo (cosimo) + + Fixed RT#99548, which should make it easier to install Text::Hunspell + on most systems. Basically replace my broken way of checking for + libhunspell by looking up pkgconfig using ExtUtils::PkgConfig. + Thanks to David Gutteridge for teaching me how to do it! + +- obsolete fix-makefile.diff + +------------------------------------------------------------------- Old: ---- Text-Hunspell-2.08.tar.gz fix-makefile.diff New: ---- Text-Hunspell-2.10.tar.gz cpanspec.yml ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Text-Hunspell.spec ++++++ --- /var/tmp/diff_new_pack.yixUQY/_old 2015-04-15 16:27:50.000000000 +0200 +++ /var/tmp/diff_new_pack.yixUQY/_new 2015-04-15 16:27:50.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package perl-Text-Hunspell # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: perl-Text-Hunspell -Version: 2.08 +Version: 2.10 Release: 0 %define cpan_name Text-Hunspell Summary: Perl interface to the Hunspell library @@ -25,17 +25,16 @@ Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/Text-Hunspell/ Source: http://www.cpan.org/authors/id/C/CO/COSIMO/%{cpan_name}-%{version}.tar.gz -# MANUAL BEGIN -Patch0: fix-makefile.diff -BuildRequires: gcc-c++ -BuildRequires: hunspell-devel -# MANUAL END +Source1: cpanspec.yml BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros -#BuildRequires: perl(Devel::CheckLib) -#BuildRequires: perl(Text::Hunspell) +BuildRequires: perl(ExtUtils::PkgConfig) %{perl_requires} +#MANUAL BEGIN +BuildRequires: gcc-c++ +BuildRequires: hunspell-devel +#MANUAL END %description This module provides a Perl interface to the *Hunspell* library. This @@ -46,11 +45,6 @@ %prep %setup -q -n %{cpan_name}-%{version} -# MANUAL BEGIN -%patch0 -p1 -hunspell=`pkg-config --libs hunspell | sed -e 's,-l,,; s, *,,g'` -sed -i -e "s,hunspell-X,$hunspell," t/00-prereq.t Makefile.PL -# MANUAL END find . -type f -print0 | xargs -0 chmod 644 %build ++++++ Text-Hunspell-2.08.tar.gz -> Text-Hunspell-2.10.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Text-Hunspell-2.08/Changes new/Text-Hunspell-2.10/Changes --- old/Text-Hunspell-2.08/Changes 2013-05-01 23:24:29.000000000 +0200 +++ new/Text-Hunspell-2.10/Changes 2015-03-26 11:27:33.000000000 +0100 @@ -1,5 +1,21 @@ Revision history for Perl extension Text::Hunspell. +2.10 2015/03/26 11:24:00 Europe/Oslo (cosimo) + + Fixed GH#5 (http://github.com/cosimo/perl5-text-hunspell/issues/5). + Should make Text::Hunspell installable without pain from CPAN and + cpanminus clients. The problem was in the undeclared use of + ExtUtils::PkgConfig, which needs to be known even before running + the configure (Makefile.PL) step. Thanks to Pavel Shaydo for reporting + the problem. + +2.09 2014/10/20 07:56:00 Europe/Oslo (cosimo) + + Fixed RT#99548, which should make it easier to install Text::Hunspell + on most systems. Basically replace my broken way of checking for + libhunspell by looking up pkgconfig using ExtUtils::PkgConfig. + Thanks to David Gutteridge for teaching me how to do it! + 2.08 2013/05/01 23:22:35 Europe/Oslo (cosimo) Improved main POD documentation for Hunspell.pm. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Text-Hunspell-2.08/Hunspell.pm new/Text-Hunspell-2.10/Hunspell.pm --- old/Text-Hunspell-2.08/Hunspell.pm 2013-05-01 23:22:19.000000000 +0200 +++ new/Text-Hunspell-2.10/Hunspell.pm 2015-03-26 11:25:12.000000000 +0100 @@ -5,7 +5,7 @@ use vars qw/ @ISA $VERSION /; @ISA = 'DynaLoader'; -$VERSION = '2.08'; +$VERSION = '2.10'; bootstrap Text::Hunspell $VERSION; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Text-Hunspell-2.08/Hunspell.xs new/Text-Hunspell-2.10/Hunspell.xs --- old/Text-Hunspell-2.08/Hunspell.xs 2013-03-26 20:44:44.000000000 +0100 +++ new/Text-Hunspell-2.10/Hunspell.xs 2015-03-26 11:28:00.000000000 +0100 @@ -17,8 +17,6 @@ using namespace std; /*using namespace Hunspell;*/ -/* $Id: Hunspell.xs,v 1.5 2002/08/29 20:28:00 moseley Exp $ */ - static void * get_mortalspace ( size_t nbytes ) { SV * mortal; mortal = sv_2mortal( NEWSV(0, nbytes ) ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Text-Hunspell-2.08/MANIFEST new/Text-Hunspell-2.10/MANIFEST --- old/Text-Hunspell-2.08/MANIFEST 2013-05-01 23:26:09.000000000 +0200 +++ new/Text-Hunspell-2.10/MANIFEST 2015-03-26 11:30:41.000000000 +0100 @@ -3,13 +3,11 @@ hunspell.h Hunspell.pm Hunspell.xs -inc/Devel/CheckLib.pm Makefile.PL MANIFEST META.yml Module meta-data (added by MakeMaker) perlobject.map README -t/00-prereq.t t/01-use.t t/02-pod.t t/05-core.t diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Text-Hunspell-2.08/META.json new/Text-Hunspell-2.10/META.json --- old/Text-Hunspell-2.08/META.json 2013-05-01 23:26:09.000000000 +0200 +++ new/Text-Hunspell-2.10/META.json 2015-03-26 11:30:41.000000000 +0100 @@ -4,7 +4,7 @@ "unknown" ], "dynamic_config" : 1, - "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.120921", + "generated_by" : "ExtUtils::MakeMaker version 6.66, CPAN::Meta::Converter version 2.143240", "keywords" : [ "hunspell", "spelling", @@ -33,7 +33,7 @@ }, "configure" : { "requires" : { - "ExtUtils::MakeMaker" : "0" + "ExtUtils::PkgConfig" : "0" } }, "runtime" : { @@ -46,5 +46,5 @@ "url" : "https://github.com/cosimo/perl5-text-hunspell" } }, - "version" : "2.08" + "version" : "2.10" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Text-Hunspell-2.08/META.yml new/Text-Hunspell-2.10/META.yml --- old/Text-Hunspell-2.08/META.yml 2013-05-01 23:26:09.000000000 +0200 +++ new/Text-Hunspell-2.10/META.yml 2015-03-26 11:30:41.000000000 +0100 @@ -3,11 +3,11 @@ author: - unknown build_requires: - ExtUtils::MakeMaker: 0 + ExtUtils::MakeMaker: '0' configure_requires: - ExtUtils::MakeMaker: 0 + ExtUtils::PkgConfig: '0' dynamic_config: 1 -generated_by: 'ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.120921' +generated_by: 'ExtUtils::MakeMaker version 6.66, CPAN::Meta::Converter version 2.143240' keywords: - hunspell - spelling @@ -16,7 +16,7 @@ license: unknown meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html - version: 1.4 + version: '1.4' name: Text-Hunspell no_index: directory: @@ -25,4 +25,4 @@ requires: {} resources: repository: https://github.com/cosimo/perl5-text-hunspell -version: 2.08 +version: '2.10' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Text-Hunspell-2.08/Makefile.PL new/Text-Hunspell-2.10/Makefile.PL --- old/Text-Hunspell-2.08/Makefile.PL 2013-03-26 20:52:12.000000000 +0100 +++ new/Text-Hunspell-2.10/Makefile.PL 2015-03-26 11:24:30.000000000 +0100 @@ -1,60 +1,38 @@ -use lib qw(inc); -use Config; -use Devel::CheckLib; - -# -# Try to warn the user if linking might fail. -# Some systems seem to not install the unversioned library symlinks. -# -# Probably too platform specific, but seemed an acceptable compromise. -# -my $dlext = $Config{dlext} || 'so'; -my $candidate_lib; -for (split " " => $Config{libpth}) { - my $lib_path = "$_/libhunspell.$dlext"; - #warn "Checking $lib_path\n"; - if (-e $lib_path) { - $candidate_lib++; - warn "Found '$lib_path'. Good.\n"; - } +# Only EU::MM 6.52+ understands CONFIGURE_REQUIRES +use ExtUtils::MakeMaker 6.52; +use ExtUtils::PkgConfig; + +my $CC = $ENV{'CXX'} || 'g++'; + +my $shlib_location = ExtUtils::PkgConfig->libs_only_l('hunspell'); +my $header_location = ExtUtils::PkgConfig->cflags_only_I('hunspell'); + +if ($shlib_location ne '' && $header_location ne '') { + WriteMakefile( + NAME => 'Text::Hunspell', + VERSION_FROM => 'Hunspell.pm', + LIBS => [$shlib_location], + CC => $CC, + LD => '$(CC)', + CONFIGURE_REQUIRES => { + 'ExtUtils::PkgConfig' => 0, + }, + XSOPT => '-C++', + TYPEMAPS => ['perlobject.map', 'typemap'], + META_MERGE => { + resources => { + repository => 'https://github.com/cosimo/perl5-text-hunspell', + }, + keywords => [ qw(hunspell spelling spell-checker text-processing) ], + }, + ); } - -if (0 == $candidate_lib) { - my $def_lib = "/usr/lib/libhunspell"; - my ($possible_candidate) = glob("$def_lib-*.so"); - $possible_candidate ||= "/usr/lib/libhunspell-<ver>.so"; - warn "---------------------------------------------------------------------\n"; - warn "Your system doesn't appear to have a libhunspell.$dlext link.\n"; - warn "Linking might fail. If it does, you might want to try installing\n"; - warn "the libhunspell-dev package (or the equivalent on your OS) or try:\n"; - warn "\n"; - warn " $Config{lns} $possible_candidate $def_lib.so\n"; - warn "---------------------------------------------------------------------\n"; - warn "\n"; +else { + # By default, ExtUtils::PkgConfig provides a verbose warning about + # being unable to locate the pkgconfig file and such. This adds an + # additional comment after that output. + warn "\n=========================================================\n"; + warn "NOTE: You may need to install the libhunspell-dev package\n"; + warn "(or the equivalent on your OS).\n"; + warn "=========================================================\n"; } - -check_lib_or_exit( - lib => 'hunspell', - header => 'hunspell/hunspell.h', -); - -use ExtUtils::MakeMaker; - -my $CC = $ENV{"CXX"} || 'g++'; - -WriteMakefile( - NAME => 'Text::Hunspell', - VERSION_FROM => 'Hunspell.pm', - LIBS => ['-lhunspell'], - CC => $CC, - LD => '$(CC)', - PREREQ_PM => {}, # e.g., Module::Name => 1.1 - XSOPT => '-C++', - TYPEMAPS => ['perlobject.map', 'typemap'], - META_MERGE => { - resources => { - repository => 'https://github.com/cosimo/perl5-text-hunspell', - }, - keywords => [ qw(hunspell spelling spell-checker text-processing) ], - }, -); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Text-Hunspell-2.08/inc/Devel/CheckLib.pm new/Text-Hunspell-2.10/inc/Devel/CheckLib.pm --- old/Text-Hunspell-2.08/inc/Devel/CheckLib.pm 2013-03-26 09:27:31.000000000 +0100 +++ new/Text-Hunspell-2.10/inc/Devel/CheckLib.pm 1970-01-01 01:00:00.000000000 +0100 @@ -1,445 +0,0 @@ -# $Id: CheckLib.pm,v 1.25 2008/10/27 12:16:23 drhyde Exp $ - -package # -Devel::CheckLib; - -use strict; -use vars qw($VERSION @ISA @EXPORT); -$VERSION = '0.7'; -use Config; - -use File::Spec; -use File::Temp; - -require Exporter; -@ISA = qw(Exporter); -@EXPORT = qw(assert_lib check_lib_or_exit check_lib); - -# localising prevents the warningness leaking out of this module -local $^W = 1; # use warnings is a 5.6-ism - -_findcc(); # bomb out early if there's no compiler - -=head1 NAME - -Devel::CheckLib - check that a library is available - -=head1 DESCRIPTION - -Devel::CheckLib is a perl module that checks whether a particular C -library and its headers are available. - -=head1 SYNOPSIS - - use Devel::CheckLib; - - check_lib_or_exit( lib => 'jpeg', header => 'jpeglib.h' ); - check_lib_or_exit( lib => [ 'iconv', 'jpeg' ] ); - - # or prompt for path to library and then do this: - check_lib_or_exit( lib => 'jpeg', libpath => $additional_path ); - -=head1 USING IT IN Makefile.PL or Build.PL - -If you want to use this from Makefile.PL or Build.PL, do -not simply copy the module into your distribution as this may cause -problems when PAUSE and search.cpan.org index the distro. Instead, use -the use-devel-checklib script. - -=head1 HOW IT WORKS - -You pass named parameters to a function, describing to it how to build -and link to the libraries. - -It works by trying to compile some code - which defaults to this: - - int main(void) { return 0; } - -and linking it to the specified libraries. If something pops out the end -which looks executable, it gets executed, and if main() returns 0 we know -that it worked. That tiny program is -built once for each library that you specify, and (without linking) once -for each header file. - -If you want to check for the presence of particular functions in a -library, or even that those functions return particular results, then -you can pass your own function body for main() thus: - - check_lib_or_exit( - function => 'foo();if(libversion() > 5) return 0; else return 1;' - incpath => ... - libpath => ... - lib => ... - header => ... - ); - -In that case, it will fail to build if either foo() or libversion() don't -exist, and main() will return the wrong value if libversion()'s return -value isn't what you want. - -=head1 FUNCTIONS - -All of these take the same named parameters and are exported by default. -To avoid exporting them, C. - -=head2 assert_lib - -This takes several named parameters, all of which are optional, and dies -with an error message if any of the libraries listed can -not be found. B<Note>: dying in a Makefile.PL or Build.PL may provoke -a 'FAIL' report from CPAN Testers' automated smoke testers. Use -C instead. - -The named parameters are: - -=over - -=item lib - -Must be either a string with the name of a single -library or a reference to an array of strings of library names. Depending -on the compiler found, library names will be fed to the compiler either as -C<-l> arguments or as C<.lib> file names. (E.g. C<-ljpeg> or C) - -=item libpath - -a string or an array of strings -representing additional paths to search for libraries. - -=item LIBS - -a CExtUtils::MakeMaker-style space-seperated list of -libraries (each preceded by '-l') and directories (preceded by '-L'). - -This can also be supplied on the command-line. - -=back - -And libraries are no use without header files, so ... - -=over - -=item header - -Must be either a string with the name of a single -header file or a reference to an array of strings of header file names. - -=item incpath - -a string or an array of strings -representing additional paths to search for headers. - -=item INC - -a CExtUtils::MakeMaker-style space-seperated list of -incpaths, each preceded by '-I'. - -This can also be supplied on the command-line. - -=back - -=head2 check_lib_or_exit - -This behaves exactly the same as C except that instead of -dieing, it warns (with exactly the same error message) and exits. -This is intended for use in Makefile.PL / Build.PL -when you might want to prompt the user for various paths and -things before checking that what they've told you is sane. - -If any library or header is missing, it exits with an exit value of 0 to avoid -causing a CPAN Testers 'FAIL' report. CPAN Testers should ignore this -result -- which is what you want if an external library dependency is not -available. - -=head2 check_lib - -This behaves exactly the same as C except that it is silent, -returning false instead of dieing, or true otherwise. - -=cut - -sub check_lib_or_exit { - eval 'assert_lib(@_)'; - if($@) { - warn $@; - exit; - } -} - -sub check_lib { - eval 'assert_lib(@_)'; - return $@ ? 0 : 1; -} - -sub assert_lib { - my %args = @_; - my (@libs, @libpaths, @headers, @incpaths); - - # FIXME: these four just SCREAM "refactor" at me - @libs = (ref($args{lib}) ? @{$args{lib}} : $args{lib}) - if $args{lib}; - @libpaths = (ref($args{libpath}) ? @{$args{libpath}} : $args{libpath}) - if $args{libpath}; - @headers = (ref($args{header}) ? @{$args{header}} : $args{header}) - if $args{header}; - @incpaths = (ref($args{incpath}) ? @{$args{incpath}} : $args{incpath}) - if $args{incpath}; - - # work-a-like for Makefile.PL's LIBS and INC arguments - # if given as command-line argument, append to %args - for my $arg (@ARGV) { - for my $mm_attr_key (qw(LIBS INC)) { - if (my ($mm_attr_value) = $arg =~ /\A $mm_attr_key = (.*)/x) { - # it is tempting to put some \s* into the expression, but the - # MM command-line parser only accepts LIBS etc. followed by =, - # so we should not be any more lenient with whitespace than that - $args{$mm_attr_key} .= " $mm_attr_value"; - } - } - } - - # using special form of split to trim whitespace - if(defined($args{LIBS})) { - foreach my $arg (split(' ', $args{LIBS})) { - die("LIBS argument badly-formed: $arg\n") unless($arg =~ /^-l/i); - push @{$arg =~ /^-l/ ? \@libs : \@libpaths}, substr($arg, 2); - } - } - if(defined($args{INC})) { - foreach my $arg (split(' ', $args{INC})) { - die("INC argument badly-formed: $arg\n") unless($arg =~ /^-I/); - push @incpaths, substr($arg, 2); - } - } - - my @cc = _findcc(); - my @missing; - my @wrongresult; - - # first figure out which headers we can't find ... - for my $header (@headers) { - my($ch, $cfile) = File::Temp::tempfile( - 'assertlibXXXXXXXX', SUFFIX => '.c' - ); - print $ch qq{#include <$header>\nint main(void) { return 0; }\n}; - close($ch); - my $exefile = File::Temp::mktemp( 'assertlibXXXXXXXX' ) . $Config{_exe}; - my @sys_cmd; - # FIXME: re-factor - almost identical code later when linking - if ( $Config{cc} eq 'cl' ) { # Microsoft compiler - require Win32; - @sys_cmd = ( - @cc, - $cfile, - "/Fe$exefile", - (map { '/I'.Win32::GetShortPathName($_) } @incpaths) - ); - } elsif($Config{cc} =~ /bcc32(\.exe)?/) { # Borland - @sys_cmd = ( - @cc, - (map { "-I$_" } @incpaths), - "-o$exefile", - $cfile - ); - } else { # Unix-ish: gcc, Sun, AIX (gcc, cc), ... - @sys_cmd = ( - @cc, - $cfile, - (map { "-I$_" } @incpaths), - "-o", "$exefile" - ); - } - warn "# @sys_cmd\n" if $args{debug}; - my $rv = $args{debug} ? system(@sys_cmd) : _quiet_system(@sys_cmd); - push @missing, $header if $rv != 0 || ! -x $exefile; - _cleanup_exe($exefile); - unlink $cfile; - } - - # now do each library in turn with headers - my($ch, $cfile) = File::Temp::tempfile( - 'assertlibXXXXXXXX', SUFFIX => '.c' - ); - print $ch qq{#include <$_>\n} foreach (@headers); - print $ch "int main(void) { ".($args{function} || 'return 0;')." }\n"; - close($ch); - for my $lib ( @libs ) { - my $exefile = File::Temp::mktemp( 'assertlibXXXXXXXX' ) . $Config{_exe}; - my @sys_cmd; - if ( $Config{cc} eq 'cl' ) { # Microsoft compiler - require Win32; - my @libpath = map { - q{/libpath:} . Win32::GetShortPathName($_) - } @libpaths; - # this is horribly sensitive to the order of arguments - @sys_cmd = ( - @cc, - $cfile, - "${lib}.lib", - "/Fe$exefile", - (map { '/I'.Win32::GetShortPathName($_) } @incpaths), - "/link", - (map {'/libpath:'.Win32::GetShortPathName($_)} @libpaths), - ); - } elsif($Config{cc} eq 'CC/DECC') { # VMS - } elsif($Config{cc} =~ /bcc32(\.exe)?/) { # Borland - @sys_cmd = ( - @cc, - "-o$exefile", - "-l$lib", - (map { "-I$_" } @incpaths), - (map { "-L$_" } @libpaths), - $cfile); - } else { # Unix-ish - # gcc, Sun, AIX (gcc, cc) - @sys_cmd = ( - @cc, - $cfile, - "-o", "$exefile", - "-l$lib", - (map { "-I$_" } @incpaths), - (map { "-L$_" } @libpaths) - ); - } - warn "# @sys_cmd\n" if $args{debug}; - my $rv = $args{debug} ? system(@sys_cmd) : _quiet_system(@sys_cmd); - push @missing, $lib if $rv != 0 || ! -x $exefile; - push @wrongresult, $lib if $rv == 0 && -x $exefile && system(File::Spec->rel2abs($exefile)) != 0; - _cleanup_exe($exefile); - } - unlink $cfile; - - my $miss_string = join( q{, }, map { qq{'$_'} } @missing ); - die("Can't link/include $miss_string\n") if @missing; - my $wrong_string = join( q{, }, map { qq{'$_'} } @wrongresult); - die("wrong result: $wrong_string\n") if @wrongresult; -} - -sub _cleanup_exe { - my ($exefile) = @_; - my $ofile = $exefile; - $ofile =~ s/$Config{_exe}$/$Config{_o}/; - unlink $exefile if -f $exefile; - unlink $ofile if -f $ofile; - unlink "$exefile\.manifest" if -f "$exefile\.manifest"; - return -} - -sub _findcc { - my @paths = split(/$Config{path_sep}/, $ENV{PATH}); - my @cc = split(/\s+/, $Config{cc}); - return @cc if -x $cc[0]; - foreach my $path (@paths) { - my $compiler = File::Spec->catfile($path, $cc[0]) . $Config{_exe}; - return ($compiler, @cc[1 .. $#cc]) if -x $compiler; - } - die("Couldn't find your C compiler\n"); -} - -# code substantially borrowed from IPC::Run3 -sub _quiet_system { - my (@cmd) = @_; - - # save handles - local *STDOUT_SAVE; - local *STDERR_SAVE; - open STDOUT_SAVE, ">&STDOUT" or die "CheckLib: $! saving STDOUT"; - open STDERR_SAVE, ">&STDERR" or die "CheckLib: $! saving STDERR"; - - # redirect to nowhere - local *DEV_NULL; - open DEV_NULL, ">" . File::Spec->devnull - or die "CheckLib: $! opening handle to null device"; - open STDOUT, ">&" . fileno DEV_NULL - or die "CheckLib: $! redirecting STDOUT to null handle"; - open STDERR, ">&" . fileno DEV_NULL - or die "CheckLib: $! redirecting STDERR to null handle"; - - # run system command - my $rv = system(@cmd); - - # restore handles - open STDOUT, ">&" . fileno STDOUT_SAVE - or die "CheckLib: $! restoring STDOUT handle"; - open STDERR, ">&" . fileno STDERR_SAVE - or die "CheckLib: $! restoring STDERR handle"; - - return $rv; -} - -=head1 PLATFORMS SUPPORTED - -You must have a C compiler installed. We check for C<$Config{cc}>, -both literally as it is in Config.pm and also in the $PATH. - -It has been tested with varying degrees on rigourousness on: - -=over - -=item gcc (on Linux, *BSD, Mac OS X, Solaris, Cygwin) - -=item Sun's compiler tools on Solaris - -=item IBM's tools on AIX - -=item SGI's tools on Irix 6.5 - -=item Microsoft's tools on Windows - -=item MinGW on Windows (with Strawberry Perl) - -=item Borland's tools on Windows - -=item QNX - -=back - -=head1 WARNINGS, BUGS and FEEDBACK - -This is a very early release intended primarily for feedback from -people who have discussed it. The interface may change and it has -not been adequately tested. - -Feedback is most welcome, including constructive criticism. -Bug reports should be made using Lhttp://rt.cpan.org/ or by email. - -When submitting a bug report, please include the output from running: - - perl -V - perl -MDevel::CheckLib -e0 - -=head1 SEE ALSO - -LDevel::CheckOS - -LProbe::Perl - -=head1 AUTHORS - -David Cantrell E<lt>david@cantrell.org.ukE<gt> - -David Golden E<lt>dagolden@cpan.orgE<gt> - -Yasuhiro Matsumoto E<lt>mattn@cpan.orgE<gt> - -Thanks to the cpan-testers-discuss mailing list for prompting us to write it -in the first place; - -to Chris Williams for help with Borland support; - -to Tony Cook for help with Microsoft compiler command-line options - -=head1 COPYRIGHT and LICENCE - -Copyright 2007 David Cantrell. Portions copyright 2007 David Golden. - -This module is free-as-in-speech software, and may be used, distributed, -and modified under the same conditions as perl itself. - -=head1 CONSPIRACY - -This module is also free-as-in-mason software. - -=cut - -1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Text-Hunspell-2.08/t/00-prereq.t new/Text-Hunspell-2.10/t/00-prereq.t --- old/Text-Hunspell-2.08/t/00-prereq.t 2013-03-26 09:27:31.000000000 +0100 +++ new/Text-Hunspell-2.10/t/00-prereq.t 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -use Test::More tests => 1; - -use lib qw(inc ../inc); -use Devel::CheckLib; - -check_lib_or_exit( - lib => 'hunspell', - header => 'hunspell/hunspell.h', -); - -ok(1, 'Prerequisite hunspell library found'); - ++++++ cpanspec.yml ++++++ --- preamble: |- BuildRequires: gcc-c++ BuildRequires: hunspell-devel