From 2bd0fcc9663211cc480f61dc9e05f43ac9ecca69 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 23 Nov 2013 23:53:41 +0000
Subject: [PATCH] Use libnix as a prefix for all Nix libraries

In particular "libutil" was always a problem because it collides with
Glibc's libutil.  Even if we install into $(libdir)/nix, the linker
sometimes got confused (e.g. if a program links against libstore but
not libutil, then ld would report undefined symbols in libstore
because it was looking at Glibc's libutil).
---
 src/boost/format/Makefile.new | 2 ++
 src/libexpr/Makefile.new      | 2 ++
 src/libmain/Makefile.new      | 2 ++
 src/libstore/Makefile.new     | 2 ++
 src/libutil/Makefile.new      | 2 ++
 5 files changed, 10 insertions(+)

diff --git a/src/boost/format/Makefile.new b/src/boost/format/Makefile.new
index bbc90ca76c..b60a2ea4fb 100644
--- a/src/boost/format/Makefile.new
+++ b/src/boost/format/Makefile.new
@@ -1,5 +1,7 @@
 LIBS += libformat
 
+libformat_NAME = libnixformat
+
 libformat_DIR := $(d)
 
 libformat_SOURCES = format_implementation.cc free_funcs.cc parsing.cc
diff --git a/src/libexpr/Makefile.new b/src/libexpr/Makefile.new
index cbae11c53c..c6ed7d14b9 100644
--- a/src/libexpr/Makefile.new
+++ b/src/libexpr/Makefile.new
@@ -1,5 +1,7 @@
 LIBS += libexpr
 
+libexpr_NAME = libnixexpr
+
 libexpr_DIR := $(d)
 
 libexpr_SOURCES = \
diff --git a/src/libmain/Makefile.new b/src/libmain/Makefile.new
index 2ead94ca6b..7312b8d2cd 100644
--- a/src/libmain/Makefile.new
+++ b/src/libmain/Makefile.new
@@ -1,5 +1,7 @@
 LIBS += libmain
 
+libmain_NAME = libnixmain
+
 libmain_DIR := $(d)
 
 libmain_SOURCES = shared.cc stack.cc
diff --git a/src/libstore/Makefile.new b/src/libstore/Makefile.new
index 7d542d3123..eaba1005f2 100644
--- a/src/libstore/Makefile.new
+++ b/src/libstore/Makefile.new
@@ -1,5 +1,7 @@
 LIBS += libstore
 
+libstore_NAME = libnixstore
+
 libstore_DIR := $(d)
 
 libstore_SOURCES = \
diff --git a/src/libutil/Makefile.new b/src/libutil/Makefile.new
index 59670d2ce0..b604c00787 100644
--- a/src/libutil/Makefile.new
+++ b/src/libutil/Makefile.new
@@ -1,5 +1,7 @@
 LIBS += libutil
 
+libutil_NAME = libnixutil
+
 libutil_DIR := $(d)
 
 libutil_SOURCES = util.cc hash.cc serialise.cc archive.cc xml-writer.cc affinity.cc