mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-17 02:14:36 +00:00
ba9d95ca8f
Don't use ./shared.nix as it's not shared anymore. Fix tests with an upstream patch and a few commands in postPatch. Assert that blas and lapack are compatible. Rename utf8proc patch.
30 lines
890 B
Diff
30 lines
890 B
Diff
From 54a66b5728ec98f44a1768f064509be4fd3f2ef6 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Tuegel <ttuegel@gmail.com>
|
|
Date: Sat, 10 Oct 2015 13:09:48 -0500
|
|
Subject: [PATCH 1/3] use system utf8proc
|
|
|
|
---
|
|
src/flisp/Makefile | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/src/flisp/Makefile b/src/flisp/Makefile
|
|
index bec8624..5437b5c 100644
|
|
--- a/src/flisp/Makefile
|
|
+++ b/src/flisp/Makefile
|
|
@@ -24,9 +24,9 @@ DOBJS = $(SRCS:%.c=$(BUILDDIR)/%.dbg.obj)
|
|
LLTDIR := ../support
|
|
LLT_release := $(BUILDDIR)/$(LLTDIR)/libsupport.a
|
|
LLT_debug := $(BUILDDIR)/$(LLTDIR)/libsupport-debug.a
|
|
-LIBFILES_release := $(LLT_release) $(LIBUV) $(LIBUTF8PROC)
|
|
-LIBFILES_debug := $(LLT_debug) $(LIBUV) $(LIBUTF8PROC)
|
|
-LIBS :=
|
|
+LIBFILES_release := $(LLT_release) $(LIBUV)
|
|
+LIBFILES_debug := $(LLT_debug) $(LIBUV)
|
|
+LIBS := $(LIBUTF8PROC)
|
|
ifneq ($(OS),WINNT)
|
|
LIBS += -lpthread
|
|
endif
|
|
--
|
|
2.5.2
|
|
|