summaryrefslogtreecommitdiff
path: root/gnu/packages/gl.scm
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2015-04-13 01:15:08 -0400
committerMark H Weaver <mhw@netris.org>2015-04-13 01:29:51 -0400
commit9bbd52e5366cb35406082a0289b3ce7ff164b9f3 (patch)
tree44f5a441e0de2dcc92e133c9a554acd868b69516 /gnu/packages/gl.scm
parent1ca8ff285ba0f055fbaf314d8a23fadc25839135 (diff)
downloadpatches-9bbd52e5366cb35406082a0289b3ce7ff164b9f3.tar
patches-9bbd52e5366cb35406082a0289b3ce7ff164b9f3.tar.gz
gnu: libepoxy: Fix tests on arm.
* gnu/packages/gl.scm (libepoxy)[arguments]: When building for arm, patch test/dlwrap.c to fix the tests.
Diffstat (limited to 'gnu/packages/gl.scm')
-rw-r--r--gnu/packages/gl.scm14
1 files changed, 12 insertions, 2 deletions
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index f3e63180c6..e640f83756 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -2,7 +2,7 @@
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2013 Joshua Grant <tadni@riseup.net>
;;; Copyright © 2014 David Thompson <davet@gnu.org>
-;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -434,7 +434,7 @@ OpenGL graphics API.")
(base32
"1xp8g6b7xlbym2rj4vkbl6xpb7ijq7glpv656mc7k9b01x22ihs2"))))
(arguments
- '(#:phases
+ `(#:phases
(alist-cons-after
'unpack 'autoreconf
(lambda _
@@ -449,6 +449,16 @@ OpenGL graphics API.")
(substitute* (find-files "." "\\.[ch]$")
(("libGL.so.1") (string-append mesa "/lib/libGL.so.1"))
(("libEGL.so.1") (string-append mesa "/lib/libEGL.so.1")))
+
+ ;; XXX On armhf systems, we must add "GLIBC_2.4" to the list of
+ ;; versions in test/dlwrap.c:dlwrap_real_dlsym. It would be
+ ;; better to make this a normal patch, but for now we do it here
+ ;; to prevent rebuilding on other platforms.
+ ,@(if (string-prefix? "arm" (or (%current-target-system)
+ (%current-system)))
+ '((substitute* '"test/dlwrap.c"
+ (("\"GLIBC_2\\.0\"") "\"GLIBC_2.0\", \"GLIBC_2.4\"")))
+ '())
#t))
%standard-phases))))
(build-system gnu-build-system)