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): bb5eb93bfb'>refslogtreecommitdiff
path: root/gnu/tests.scm
AgeCommit message (Expand)Author
2023-11-05tests: Honor system and target when lowering <system-test>....* gnu/tests.scm (compile-system-test): Wrap ‘system-test-value’ call in ‘mparameterize’. Change-Id: I4be28913a86f43059b0886ad2fcf81a9c699b730 Ludovic Courtès
2023-04-21tests: Fork and exec a new Guile for the marionette REPL....By merely forking PID 1, details from PID 1 (shepherd) would leak into the marionette process, such as the set of modules in scope and state inherited from the shepherd process (<service> instances, fibers, etc.). Running a fresh Guile instance avoids that. * gnu/tests.scm (marionette-program): New procedure. (marionette-shepherd-service): Change 'start' to use 'make-forkexec-constructor', and run the result of 'marionette-program'. Ludovic Courtès