[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
12/64: Fix compile errors on Illumos
From: |
Ludovic Courtès |
Subject: |
12/64: Fix compile errors on Illumos |
Date: |
Mon, 05 Jan 2015 16:38:52 +0000 |
civodul pushed a commit to branch nix
in repository guix.
commit ae6b631dc48f4b923a6ed17b8d6e59524c4ea883
Author: Danny Wilson <address@hidden>
Date: Thu Apr 3 16:59:25 2014 +0200
Fix compile errors on Illumos
---
src/libstore/build.cc | 1 +
src/libstore/local.mk | 4 ++++
src/nix-daemon/local.mk | 4 ++++
3 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index 2e2f92f..f38cd29 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -13,6 +13,7 @@
#include <sstream>
#include <algorithm>
+#include <limits.h>
#include <time.h>
#include <sys/time.h>
#include <sys/wait.h>
diff --git a/src/libstore/local.mk b/src/libstore/local.mk
index 2dddce7..40cb25d 100644
--- a/src/libstore/local.mk
+++ b/src/libstore/local.mk
@@ -10,6 +10,10 @@ libstore_LIBS = libutil libformat
libstore_LDFLAGS = -lsqlite3 -lbz2
+ifeq ($(OS), SunOS)
+ libstore_LDFLAGS += -lsocket
+endif
+
libstore_CXXFLAGS = \
-DNIX_STORE_DIR=\"$(storedir)\" \
-DNIX_DATA_DIR=\"$(datadir)\" \
diff --git a/src/nix-daemon/local.mk b/src/nix-daemon/local.mk
index db071a3..bab84e7 100644
--- a/src/nix-daemon/local.mk
+++ b/src/nix-daemon/local.mk
@@ -6,4 +6,8 @@ nix-daemon_SOURCES := $(d)/nix-daemon.cc
nix-daemon_LIBS = libmain libstore libutil libformat
+ifeq ($(OS), SunOS)
+ nix-daemon_LDFLAGS += -lsocket
+endif
+
$(eval $(call install-symlink, nix-daemon, $(bindir)/nix-worker))
- 01/64: Support setting CFLAGS and CXXFLAGS for libraries/programs, (continued)
- 01/64: Support setting CFLAGS and CXXFLAGS for libraries/programs, Ludovic Courtès, 2015/01/05
- 02/64: Add a function for looking up programs in $PATH, Ludovic Courtès, 2015/01/05
- 03/64: More GNU Make 3.81 compatibility, Ludovic Courtès, 2015/01/05
- 06/64: Add a variable GLOBAL_CXXFLAGS_PCH for use by precompiled headers, Ludovic Courtès, 2015/01/05
- 05/64: Add variable GLOBAL_COMMON_DEPS, Ludovic Courtès, 2015/01/05
- 07/64: Add support for making relocatable packages using $ORIGIN, Ludovic Courtès, 2015/01/05
- 09/64: Tweak error message, Ludovic Courtès, 2015/01/05
- 04/64: Make it work on GNU Make > 3.81 again, Ludovic Courtès, 2015/01/05
- 10/64: Support Illumos, Ludovic Courtès, 2015/01/05
- 11/64: Sync with make-rules repo, Ludovic Courtès, 2015/01/05
- 12/64: Fix compile errors on Illumos,
Ludovic Courtès <=
- 13/64: Document that we require a C++11 compiler, Ludovic Courtès, 2015/01/05
- 16/64: Remove unnecessary quotes around file names, Ludovic Courtès, 2015/01/05
- 08/64: Don't set an absolute soname, Ludovic Courtès, 2015/01/05
- 15/64: Include position info in function application, Ludovic Courtès, 2015/01/05
- 14/64: Update release notes, Ludovic Courtès, 2015/01/05
- 18/64: forceInt: Show position info, Ludovic Courtès, 2015/01/05
- 19/64: forceList: Show position info, Ludovic Courtès, 2015/01/05
- 21/64: forceString: Show position info, Ludovic Courtès, 2015/01/05
- 25/64: Show position info in attribute selection errors, Ludovic Courtès, 2015/01/05
- 29/64: nix-shell --pure: Keep the user's $PAGER, Ludovic Courtès, 2015/01/05