Update of /cvsroot/fink/experimental/dmacks/finkinfo In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26900/experimental/dmacks/finkinfo
Modified Files: locale-textdomain-pm.info locale-textdomain-pm.patch Log Message: new version (fails selftests) Index: locale-textdomain-pm.patch =================================================================== RCS file: /cvsroot/fink/experimental/dmacks/finkinfo/locale-textdomain-pm.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- locale-textdomain-pm.patch 7 Jul 2013 18:02:41 -0000 1.1 +++ locale-textdomain-pm.patch 7 Jul 2013 18:03:41 -0000 1.2 @@ -1,25 +1,42 @@ -diff -ru libintl-perl-1.20.orig/Makefile.PL libintl-perl-1.20/Makefile.PL ---- libintl-perl-1.20.orig/Makefile.PL 2009-06-24 06:53:30.000000000 -0400 -+++ libintl-perl-1.20/Makefile.PL 2012-02-02 17:23:54.000000000 -0500 -@@ -87,7 +87,7 @@ +diff -Nurd -x'*~' libintl-perl-1.23.orig/Makefile.PL libintl-perl-1.23/Makefile.PL +--- libintl-perl-1.23.orig/Makefile.PL 2013-01-14 11:50:32.000000000 -0500 ++++ libintl-perl-1.23/Makefile.PL 2013-07-05 07:01:44.000000000 -0400 +@@ -95,12 +95,15 @@ + my $build_gettext_xs = ac_try_link $c, "Checking whether we can compile the XS version"; + unless ($build_gettext_xs) { + $build_gettext_xs = ac_try_link $c, " Trying again with -lintl", "-lintl"; ++ $ENV{LDFLAGS} .= " -lintl" if $build_gettext_xs; + } + unless ($build_gettext_xs) { + $build_gettext_xs = ac_try_link $c, " Trying again with -lintl -liconv", "-lintl", "-liconv"; ++ $ENV{LDFLAGS} .= " -lintl -liconv" if $build_gettext_xs; + } + unless ($build_gettext_xs) { + $build_gettext_xs = ac_try_link $c, " Trying again with -liconv", "-liconv"; ++ $ENV{LDFLAGS} .= " -liconv" if $build_gettext_xs; } - EOF --my $cc = $Config{cc}; -+my $cc = 'gcc -IFINKPATH/include -LFINKPATH/lib'; + unless ($build_gettext_xs) { +@@ -124,7 +127,9 @@ + close HANDLE or die "cannot close file 'gettest.c': $!\n"; - print STDERR "Checking whether we can compile the XS version ... "; - local *HANDLE; -diff -ru libintl-perl-1.20.orig/gettext_xs/Makefile.PL libintl-perl-1.20/gettext_xs/Makefile.PL ---- libintl-perl-1.20.orig/gettext_xs/Makefile.PL 2009-06-23 03:04:48.000000000 -0400 -+++ libintl-perl-1.20/gettext_xs/Makefile.PL 2012-02-02 17:22:15.000000000 -0500 -@@ -38,7 +38,8 @@ + my @cmd = $Config{cc}; ++ push @cmd, $ENV{CPPFLAGS} if exists $ENV{CPPFLAGS}; + push @cmd, $Config{ccflags}; ++ push @cmd, $ENV{LDFLAGS} if exists $ENV{LDFLAGS}; + push @cmd, $Config{ldflags}; + push @cmd, $Config{perllibs}; + push @cmd, @options; +diff -Nurd -x'*~' libintl-perl-1.23.orig/gettext_xs/Makefile.PL libintl-perl-1.23/gettext_xs/Makefile.PL +--- libintl-perl-1.23.orig/gettext_xs/Makefile.PL 2013-01-14 11:50:32.000000000 -0500 ++++ libintl-perl-1.23/gettext_xs/Makefile.PL 2013-07-05 06:58:05.000000000 -0400 +@@ -37,7 +37,8 @@ ), PREREQ_PM => { File::Spec => 0 }, PL_FILES => {}, - LIBS => ['-lintl -liconv'], -+ LIBS => ['-LFINKPATH/lib -lintl -liconv'], -+ INC => '-IFINKPATH/include', ++ LIBS => [(exists $ENV{LDFLAGS} && $ENV{LDFLAGS})], ++ INC => (exists $ENV{CPPFLAGS} && $ENV{CPPFLAGS}), ); __END__ Index: locale-textdomain-pm.info =================================================================== RCS file: /cvsroot/fink/experimental/dmacks/finkinfo/locale-textdomain-pm.info,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- locale-textdomain-pm.info 7 Jul 2013 18:02:41 -0000 1.1 +++ locale-textdomain-pm.info 7 Jul 2013 18:03:41 -0000 1.2 @@ -1,23 +1,30 @@ Info2: << Package: locale-textdomain-pm%type_pkg[perl] -Version: 1.20 -Revision: 3 +Version: 1.23 +Revision: 1 Depends: perl%type_pkg[perl]-core, libgettext8-shlibs, libiconv Builddepends: fink (>= 0.24.12), libgettext8-dev, libiconv-dev Replaces: libintl-pm%type_pkg[perl] Source: mirror:cpan:authors/id/G/GU/GUIDO/libintl-perl-%v.tar.gz -Source-MD5: cb36f58a7d2e15974f25b35381548b1b +Source-MD5: 2e79dc842af1c9efc14fbe6664dc89bf Type: perl (5.12.3 5.12.4) PatchFile: %{ni}.patch -PatchFile-MD5: 81cabb1a3814d51dc64a7cdd286fe130 -PatchScript: sed "s|FINKPATH|%p|g" < %{PatchFile} | patch -p1 +PatchFile-MD5: 693f500ac1d335c7d5c6a116ae967e25 + +CompileScript: << +#!/bin/sh -ev + %{default_script} + + # make sure we built the xs version + test -e blib/arch/auto/Locale/gettext_xs/gettext_xs.bundle +<< InstallScript: << %{default_script} mv %i/share/man %i/lib/perl5/%type_raw[perl] << -DocFiles: README FAQ +DocFiles: COPYING.LESSER ChangeLog Credits FAQ NEWS README THANKS TODO UpdatePOD: true Description: Perl module for string internationalization DescDetail: << @@ -32,8 +39,11 @@ DescPackaging: << Former maintainer: Matthias Ringwald <frec...@users.sourceforge.net> -libintl not found during linking so gettext_xs not build properly -Added FINKPATH/lib to LIBS in gettext_xs/Makefile.PL + Propagate standard env-vars for compiler. And also propagate + the ones that that were auto-detected as needed. + + Test failures. See: + https://rt.cpan.org/Public/Bug/Display.html?id=83980 << License: Artistic ------------------------------------------------------------------------------ This SF.net email is sponsored by Windows: Build for Windows Store. http://p.sf.net/sfu/windows-dev2dev _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs