nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: sdl: Don't use dlopen for shared object loading. 

* gnu/packages/sdl.scm (sdl)[arguments]<#:configure-flags>:
  Use '--disable-sdl-dlopen'.
  [propagated-inputs]: Add libcap.
This commit is contained in:
宋文武 2015-02-05 15:03:50 +08:00
parent b907324d05
commit 666aa995f0
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gnu/packages/sdl.scm
View File

@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 David Thompson <dthompson2@worcester.edu> ;;; Copyright © 2013 David Thompson <dthompson2@worcester.edu>
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -58,16 +59,15 @@
(patches (list (search-patch "sdl-libx11-1.6.patch"))))) (patches (list (search-patch "sdl-libx11-1.6.patch")))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(;; Explicitly link against Xext because SDL tries to dlopen it and '(;; Explicitly link against shared libraries instead of dlopening them.
;; doesn't go very far otherwise (see ;; For X11, ALSA, PulseAudio, etc.
;; <https://lists.gnu.org/archive/html/guix-devel/2013-11/msg00088.html> #:configure-flags '("--disable-sdl-dlopen")
;; for details.)
#:configure-flags '("LDFLAGS=-lXext")
#:tests? #f)) ; no check target #:tests? #f)) ; no check target
(propagated-inputs (propagated-inputs
;; SDL headers include X11 headers. ;; SDL headers include X11 headers.
`(("libx11" ,libx11))) `(("libx11" ,libx11)
("libcap" ,libcap))) ; 'libSDL.la' contain `-lcap'.
(native-inputs `(("pkg-config" ,pkg-config))) (native-inputs `(("pkg-config" ,pkg-config)))
(inputs `(("libxrandr" ,libxrandr) (inputs `(("libxrandr" ,libxrandr)
("mesa" ,mesa) ("mesa" ,mesa)