mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #704 from ysangkok/freebsd-support

Browse source 
FreeBSD support with knowledge about Linux emulation
This commit is contained in:
Eelco Dolstra 2015-11-24 19:24:21 +01:00
commit cad40adce5
6 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/build.cc
View file

@ -1276,6 +1276,8 @@ static bool canBuildLocally(const BasicDerivation & drv)
|| (drv.platform == "i686-linux" && settings.thisSystem == "x86_64-linux")
|| (drv.platform == "armv6l-linux" && settings.thisSystem == "armv7l-linux")
#endif
|| (platform == "i686-linux" && settings.thisSystem == "x86_64-freebsd")
|| (platform == "i686-linux" && settings.thisSystem == "i686-freebsd")
;
}

2
src/libstore/local.mk
View file

@ -8,7 +8,7 @@ libstore_SOURCES := $(wildcard $(d)/*.cc)
libstore_LIBS = libutil libformat
libstore_LDFLAGS = -lsqlite3 -lbz2 -lcurl
libstore_LDFLAGS = $(SQLITE3_LIBS) -lbz2 $(LIBCURL_LIBS)
ifeq ($(OS), SunOS)
libstore_LDFLAGS += -lsocket