delroth/hydra
0
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

hydra: Clarify the dependency on BDW-GC.

Browse source
This commit is contained in:
Ludovic Courtès 2011-01-14 12:53:54 +00:00
parent 55a6f53c66
commit 18e23e90e2
4 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -42,6 +42,8 @@ AC_CHECK_LIB([expr], [_ZN3nix17parseExprFromFileERNS_9EvalStateESs], [:],
CPPFLAGS="$old_CPPFLAGS" CPPFLAGS="$old_CPPFLAGS"
LIBS="$old_LIBS" LIBS="$old_LIBS"
PKG_CHECK_MODULES([BDW_GC], [bdw-gc])
AC_CONFIG_FILES([ AC_CONFIG_FILES([
Makefile Makefile

5
release.nix
View file

@ -15,7 +15,8 @@ rec {
inherit officialRelease; inherit officialRelease;
version = builtins.readFile ./version; version = builtins.readFile ./version;
buildInputs = [ perl libxslt dblatex tetex nukeReferences ] ; buildInputs =
[ perl libxslt dblatex tetex nukeReferences pkgconfig boehmgc ] ;
preConfigure = '' preConfigure = ''
# TeX needs a writable font cache. # TeX needs a writable font cache.
@ -46,7 +47,7 @@ rec {
configureFlags = "--with-nix=${nix}"; configureFlags = "--with-nix=${nix}";
buildInputs = buildInputs =
[ perl makeWrapper libtool nix unzip nukeReferences boehmgc ] [ perl makeWrapper libtool nix unzip nukeReferences pkgconfig boehmgc ]
++ (import ./deps.nix) { inherit pkgs; }; ++ (import ./deps.nix) { inherit pkgs; };
hydraPath = stdenv.lib.concatStringsSep ":" (map (p: "${p}/bin") ( [ hydraPath = stdenv.lib.concatStringsSep ":" (map (p: "${p}/bin") ( [

8
src/c/Makefile.am
View file

@ -1,6 +1,8 @@
bin_PROGRAMS = hydra_eval_jobs bin_PROGRAMS = hydra_eval_jobs
hydra_eval_jobs_SOURCES = hydra_eval_jobs.cc hydra_eval_jobs_SOURCES = hydra_eval_jobs.cc
hydra_eval_jobs_LDADD = -lmain -lexpr -L$(nix)/lib/nix hydra_eval_jobs_LDADD = -lmain -lexpr -L$(nix)/lib/nix $(BDW_GC_LIBS)
AM_CXXFLAGS = \
-I$(nix)/include/nix AM_CXXFLAGS = \
-I$(nix)/include/nix \
$(BDW_GC_CFLAGS)

2
src/c/hydra_eval_jobs.cc
View file

@ -1,6 +1,8 @@
#include <map> #include <map>
#include <iostream> #include <iostream>
#include <gc/gc_allocator.h>
#include "shared.hh" #include "shared.hh"
#include "store-api.hh" #include "store-api.hh"
#include "eval.hh" #include "eval.hh"