rpms/perl-PDL/devel perl-PDL-2.4.3-noDISPLAY.patch, NONE, 1.1 perl-PDL.spec, 1.41, 1.42
Tom Callaway (spot)
fedora-extras-commits at redhat.com
Sun Mar 9 04:38:44 UTC 2008
Author: spot
Update of /cvs/pkgs/rpms/perl-PDL/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11466
Modified Files:
perl-PDL.spec
Added Files:
perl-PDL-2.4.3-noDISPLAY.patch
Log Message:
fix the broken GL test case
perl-PDL-2.4.3-noDISPLAY.patch:
--- NEW FILE perl-PDL-2.4.3-noDISPLAY.patch ---
diff -up PDL-2.4.3/Graphics/TriD/OpenGL/test.pl.BAD PDL-2.4.3/Graphics/TriD/OpenGL/test.pl
--- PDL-2.4.3/Graphics/TriD/OpenGL/test.pl.BAD 2008-03-08 23:17:13.000000000 -0500
+++ PDL-2.4.3/Graphics/TriD/OpenGL/test.pl 2008-03-08 23:19:34.000000000 -0500
@@ -11,6 +11,14 @@ $SIG{__DIE__} = sub {print Carp::longmes
STDOUT->autoflush(1);
STDERR->autoflush(1);
+sub hasDISPLAY {
+ return defined $ENV{DISPLAY} && $ENV{DISPLAY} !~ /^\s*$/;
+}
+
+if ( ! hasDISPLAY()) {
+ exit;
+}
+
use PDL::Graphics::OpenGL;
my $numwins = shift;
Index: perl-PDL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PDL/devel/perl-PDL.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- perl-PDL.spec 9 Mar 2008 03:02:44 -0000 1.41
+++ perl-PDL.spec 9 Mar 2008 04:38:02 -0000 1.42
@@ -18,6 +18,7 @@
Patch8: perl-PDL-2.4.3-test_hdf.patch
Patch9: perl-PDL-2.4.3-gsl.patch
Patch10: PDL-2.4.3-perl510.patch
+Patch11: perl-PDL-2.4.3-noDISPLAY.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: perl >= 1:5.6.1
@@ -63,6 +64,7 @@
%patch8 -p1 -b .patch_hdf
%patch9 -p1 -b .gsl
%patch10 -p1 -b .perl510
+%patch11 -p1 -b .noDISPLAY
# Provides: explicitly filter perl(Inline)
cat <<__EOF__ > %{name}-findperlprovides
@@ -126,6 +128,10 @@
%check
unset DISPLAY
export PERL5LIB=`pwd`/blib/lib
+# set PERL_DL_NONLAZY=0
+# The default behavior causes some problems because opengl.pd builds an interface for all functions
+# defined in gl.h and glu.h even though they might not actually be in the opengl libraries.
+sed -i 's|PERL_DL_NONLAZY=1 $(FULLPERLRUN)|PERL_DL_NONLAZY=0 $(FULLPERLRUN)|g' Graphics/TriD/OpenGL/Makefile
make test
%clean
@@ -145,7 +151,8 @@
%changelog
* Sat Mar 08 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.4.3-10
-- actually commit patch to cvs
+- PERL_DL_NONLAZY=0 for all the GL tests
+- don't run GL tests if DISPLAY is unset
* Sat Mar 08 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.4.3-9
- patch to fix build against perl 5.10, get useful random numbers
More information about the fedora-extras-commits
mailing list