[csw-devel] SF.net SVN: gar:[8686] csw/mgar/pkg/cpan/PDL/trunk

bensons at users.sourceforge.net bensons at users.sourceforge.net
Fri Feb 19 16:30:08 CET 2010


Revision: 8686
          http://gar.svn.sourceforge.net/gar/?rev=8686&view=rev
Author:   bensons
Date:     2010-02-19 15:30:07 +0000 (Fri, 19 Feb 2010)

Log Message:
-----------
cpan PDL: fixed build, added patches for nan

Modified Paths:
--------------
    csw/mgar/pkg/cpan/PDL/trunk/Makefile
    csw/mgar/pkg/cpan/PDL/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/cpan/PDL/trunk/files/patch-perldl.conf
    csw/mgar/pkg/cpan/PDL/trunk/files/patch-quiet_nan.c

Modified: csw/mgar/pkg/cpan/PDL/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/PDL/trunk/Makefile	2010-02-19 15:08:48 UTC (rev 8685)
+++ csw/mgar/pkg/cpan/PDL/trunk/Makefile	2010-02-19 15:30:07 UTC (rev 8686)
@@ -14,7 +14,14 @@
 PACKAGES = CSWpmpdl
 CATALOGNAME = pm_pdl
 
-RUNTIME_DEP_PKGS = CSWpmextutilsf77 CSWpminline
-#BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS)
+PATCHFILES += patch-quiet_nan.c
+PATCHFILES += patch-perldl.conf
 
+RUNTIME_DEP_PKGS = CSWpmextutilsf77 CSWpminline CSWgd
+BUILD_DEP_PKGS = CSWpminline CSWgd
+
 include gar/category.mk
+
+post-configure-modulated:
+	gfind $(WORKSRC) -name Makefile | xargs \
+		perl -pi -e 's,-L/opt/csw/lib/libperl.so,-R/opt/csw/lib -lperl,'

Modified: csw/mgar/pkg/cpan/PDL/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/PDL/trunk/checksums	2010-02-19 15:08:48 UTC (rev 8685)
+++ csw/mgar/pkg/cpan/PDL/trunk/checksums	2010-02-19 15:30:07 UTC (rev 8686)
@@ -1 +1,3 @@
 a4aa5f3fd7363824e8f555d0245c4ac7  PDL-2.4.6.tar.gz
+89384edb64eac7dc3533b7ec93aecc09  patch-perldl.conf
+7b5f68c9a691b94cd8ec5f19f2d0ee61  patch-quiet_nan.c

Added: csw/mgar/pkg/cpan/PDL/trunk/files/patch-perldl.conf
===================================================================
--- csw/mgar/pkg/cpan/PDL/trunk/files/patch-perldl.conf	                        (rev 0)
+++ csw/mgar/pkg/cpan/PDL/trunk/files/patch-perldl.conf	2010-02-19 15:30:07 UTC (rev 8686)
@@ -0,0 +1,30 @@
+--- PDL-2.4.6.orig/perldl.conf	2009-12-27 18:20:50.000000000 +0100
++++ PDL-2.4.6/perldl.conf	2010-02-18 09:33:20.288047152 +0100
+@@ -150,12 +150,12 @@
+ # 0 -> don't use
+ # true -> force use
+ 
+-        WITH_SLATEC => undef,    # Leave it up to PDL to decide
++        WITH_SLATEC => 0,    # Leave it up to PDL to decide
+         
+ # Whether or not to build the PDL::Minuit module
+ # 0 -> don't use
+ 
+-       WITH_MINUIT => undef,     # Leave it up to PDL to decide
++       WITH_MINUIT => 0,     # Leave it up to PDL to decide
+ 
+ # If MINUIT_LIB is undef a standalone version of Minuit will be compiled 
+ # and PDL::Minuit will link to this library (fortran code can be found 
+@@ -201,9 +201,9 @@
+ # Whether or not to build the PDL::IO::GD module
+ # 0 -> don't use
+ # true -> force use
+-        WITH_GD => undef,
+-        GD_LIBS => undef,
+-        GD_INC => undef,
++        WITH_GD => undef,
++        GD_LIBS => ['/opt/csw/lib'],
++        GD_INC => ['/opt/csw/include'],
+ 
+ # Whether or not to build the PDL::GIS::Proj module
+ # 0 -> don't use

Added: csw/mgar/pkg/cpan/PDL/trunk/files/patch-quiet_nan.c
===================================================================
--- csw/mgar/pkg/cpan/PDL/trunk/files/patch-quiet_nan.c	                        (rev 0)
+++ csw/mgar/pkg/cpan/PDL/trunk/files/patch-quiet_nan.c	2010-02-19 15:30:07 UTC (rev 8686)
@@ -0,0 +1,10 @@
+--- PDL-2.4.6.orig/Basic/Math/quiet_nan.c	2009-10-17 23:37:41.000000000 +0200
++++ PDL-2.4.6/Basic/Math/quiet_nan.c	2010-02-17 22:03:09.788528006 +0100
+@@ -1,6 +1,6 @@
+ #include "mconf.h"
+ /* Patch NaN function where no system NaN is available */
+-double quiet_nan(void)
++double quiet_nan(long unused)
+ {
+ #ifdef NaN
+   double a;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


More information about the devel mailing list