all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
blob 2f5afd95f8f9e104d132cfe0ed2a59d532f5660d 1360 bytes (raw)
name: gnu/packages/patches/perl-opengl-makefile.patch 	 # note: path name is non-authoritative(*)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
 
This patch substitutes the harcoded library Paths from Makefile.PL to make it
easier to insert the store paths.
It also removes the generation of utils/glversion.txt , because it gets
statically copied anyway to not rely on the build machines capabilities.
diff --git a/Makefile.PL b/Makefile.PL
index d32205d..3e8fa0a 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -124,14 +124,7 @@ if ($IS_MINGW)
 # Look for available libs
 our @libdirs = qw
 {
-  -L/usr/lib
-  -L/usr/lib/i386-linux-gnu
-  -L/usr/X11R6/lib
-  -L/opt/X11/lib
-  -L/usr/local/lib
-  -L/usr/openwin/lib
-  -L/opt/csw/lib
-  -L/usr/local/freeglut/lib
+@@libdirs@@
 };

 our @check_libs = qw
@@ -804,7 +797,6 @@ sub get_extensions
   my $exc_file = 'gl_exclude.h';
   unlink($exc_file) if (-e $exc_file);
   my $glv_file = 'utils/glversion.txt';
-  unlink($glv_file) if (-e $glv_file);

   # Only run the rest if GLUT is installed
   print "Testing GLUT version\n" if ($verbose);
@@ -861,7 +853,7 @@ sub get_extensions
     $make_ver = ";make -f Makefile " .  (length($lib) ? "GLUT_LIB=$lib " : "") . (length($def) ? "GLUT_DEF=$def " : "");
     print "glversion: '$make_ver'\n" if $verbose>1;
   }
-  my $exec = 'cd utils'."$make_ver clean".$make_ver;
+  my $exec = 'cd utils'.$make_ver;
   print "glversion: $exec\n" if ($verbose);
   my $stat = `$exec`;
   print "\n$stat\n\n" if ($verbose);

debug log:

solving 2f5afd95f8 ...
found 2f5afd95f8 in https://yhetil.org/guix/867ds8se42.fsf@gmail.com/

applying [1/1] https://yhetil.org/guix/867ds8se42.fsf@gmail.com/
diff --git a/gnu/packages/patches/perl-opengl-makefile.patch b/gnu/packages/patches/perl-opengl-makefile.patch
new file mode 100644
index 0000000000..2f5afd95f8

Checking patch gnu/packages/patches/perl-opengl-makefile.patch...
Applied patch gnu/packages/patches/perl-opengl-makefile.patch cleanly.

index at:
100644 2f5afd95f8f9e104d132cfe0ed2a59d532f5660d	gnu/packages/patches/perl-opengl-makefile.patch

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.