Do not assume the SDL_image and SLD_mixer libraries are installed at the same
prefix reported by sdl-config, but instead get flags from the pkg-config files
installed with these libraries.
--- a/SConscript 2011-12-24 15:46:47.000000000 -0600
+++ b/SConscript 2014-06-12 21:20:45.702668330 -0500
@@ -199,7 +199,13 @@
self.fatal_error += " * library 'png' not found\n"
def configure_sdl(self):
- if self.conf.CheckMyProgram('sdl-config'):
+ if self.conf.CheckMyProgram('pkg-config'):
+ self.conf.env.ParseConfig("pkg-config --cflags --libs sdl")
+ for sdllib in ['image', 'mixer']:
+ self.conf.env.ParseConfig("pkg-config --cflags --libs SDL_%s" % sdllib)
+ if not self.conf.CheckSDLLib(sdllib):
+ self.fatal_error += " * SDL library '%s' not found\n" % sdllib
+ elif self.conf.CheckMyProgram('sdl-config'):
self.conf.env.ParseConfig("sdl-config --cflags --libs | sed 's/-I/-isystem/g'")
for sdllib in ['image', 'mixer']:
if not self.conf.CheckSDLLib(sdllib):
10254a45ba'>refslogtreecommitdiff
|
Age | Commit message (Expand) | Author |
2020-05-04 | Add (guix openpgp)....* guix/openpgp.scm, tests/openpgp.scm, tests/civodul.key,
tests/dsa.key, tests/ed25519.key, tests/rsa.key,
tests/ed25519.sec: New files.
* Makefile.am (MODULES): Add guix/openpgp.scm.
(SCM_TESTS): Add tests/openpgp.scm.
(EXTRA_DIST): Add tests/*.key and tests/ed25519.sec.
| Ludovic Courtès |
i srfi-26) from (host-)
imported modules.
Tobias Geerinckx-Rice |
2019-06-11 | services: Add SRFI-26 to Nix activation gexp....Fix the following fatal error on ‘guix system reconfigure’:
Backtrace:
18 (primitive-load "/home/nckx/.config/guix/current/bin/guix")
In guix/ui.scm:
1620:12 17 (run-guix-command _ . _)
In ice-9/boot-9.scm:
829:9 16 (catch _ _ #<procedure 7a7caa2d4c80 at guix/ui.scm:587:2 (key c)> _)
829:9 15 (catch _ _ #<procedure 7a7caa2d4c98 at guix/ui.scm:710:6 (key proc format-string format-args . …> …)
In guix/scripts/system.scm:
1325:8 14 (_)
In guix/status.scm:
768:4 13 (call-with-status-report _ _)
In guix/scripts/system.scm:
1181:4 12 (process-action _ _ _)
In guix/store.scm:
623:10 11 (call-with-store _)
1800:24 10 (run-with-store _ _ #:guile-for-build _ #:system _ #:target _)
In guix/scripts/system.scm:
920:13 9 (_ _)
409:8 8 (_ _)
In unknown file:
7 (primitive-load "/gnu/store/dha7j9gcz3vgb8cy7vfvvaswwsywrrzj-activate")
In ice-9/boot-9.scm:
260:13 6 (for-each #<procedure primitive-load (_)> _)
In unknown file:
5 (primitive-load "/gnu/store/ql1xjxrssxm51z2bn2v6l3mlrncij84h-activate-service")
In ice-9/eval.scm:
619:8 4 (_ #f)
196:35 3 (_ #f)
196:27 2 (_ #f)
223:20 1 (proc #<directory (guile-user) 1fa4140>)
In unknown file:
0 (%resolve-variable (7 . cut) #<directory (guile-user) 1fa4140>)
ERROR: In procedure %resolve-variable:
error: cut: unbound variable
Reported-by: Alex McGrath on #guix.
* gnu/services/nix.scm (nix-activation): Import and use (srfi srfi-26).
| Tobias Geerinckx-Rice |
2019-06-10 | services: Add 'nix-service-type'....* gnu/services/nix.scm: New file.
* gnu/local.mk: Add this.
* doc/guix.texi (Miscellaneous Services): Document this.
| Oleg Pykhalov |