07/64: Add support for making relocatable packages using $ORIGIN

[Ludovic Courtès]

civodul pushed a commit to branch nix
in repository guix.

commit a3767628481eefc956eb9d9d70eda62930549205
Author: Eelco Dolstra <address@hidden>
Date:   Mon Mar 3 15:19:04 2014 +0100

    Add support for making relocatable packages using $ORIGIN
---
 lib.mk       |    1 +
 libraries.mk |    9 ++++++---
 programs.mk  |    4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/lib.mk b/lib.mk
index 6bcd83a..3fde7fe 100644
--- a/lib.mk
+++ b/lib.mk
@@ -34,6 +34,7 @@ ifeq ($(BUILD_SHARED_LIBS), 1)
   ifneq ($(OS), Darwin)
     GLOBAL_LDFLAGS += -Wl,--no-copy-dt-needed-entries
   endif
+  SET_RPATH_TO_LIBS ?= 1
 endif
 
 
diff --git a/libraries.mk b/libraries.mk
index 547f393..2da6c9b 100644
--- a/libraries.mk
+++ b/libraries.mk
@@ -69,7 +69,7 @@ define build-library
     $(1)_PATH := $$(_d)/$$($(1)_NAME).$(SO_EXT)
 
     $$($(1)_PATH): $$($(1)_OBJS) $$(_libs) | $$(_d)/
-       $$(trace-ld) $(CXX) -o $$@ -shared $(GLOBAL_LDFLAGS) $$($(1)_OBJS) 
$$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), 
$$($$(lib)_LDFLAGS_USE))
+       $$(trace-ld) $(CXX) -o $$@ -shared $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) 
$$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), 
$$($$(lib)_LDFLAGS_USE))
 
     $(1)_LDFLAGS_USE += -L$$(_d) -Wl,-rpath,$$(abspath $$(_d)) -l$$(patsubst 
lib%,%,$$(strip $$($(1)_NAME)))
 
@@ -80,9 +80,12 @@ define build-library
     $$(eval $$(call create-dir, $$($(1)_INSTALL_DIR)))
 
     $$($(1)_INSTALL_PATH): $$($(1)_OBJS) $$(_libs_final) | 
$(DESTDIR)$$($(1)_INSTALL_DIR)/
-       $$(trace-ld) $(CXX) -o $$@ -shared $(GLOBAL_LDFLAGS) $$($(1)_OBJS) 
$$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), 
$$($$(lib)_LDFLAGS_USE_INSTALLED))
+       $$(trace-ld) $(CXX) -o $$@ -shared $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) 
$$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), 
$$($$(lib)_LDFLAGS_USE_INSTALLED))
 
-    $(1)_LDFLAGS_USE_INSTALLED += -L$$(DESTDIR)$$($(1)_INSTALL_DIR) 
-Wl,-rpath,$$($(1)_INSTALL_DIR) -l$$(patsubst lib%,%,$$(strip $$($(1)_NAME)))
+    $(1)_LDFLAGS_USE_INSTALLED += -L$$(DESTDIR)$$($(1)_INSTALL_DIR) 
-l$$(patsubst lib%,%,$$(strip $$($(1)_NAME)))
+    ifeq ($(SET_RPATH_TO_LIBS), 1)
+      $(1)_LDFLAGS_USE_INSTALLED += -Wl,-rpath,$$($(1)_INSTALL_DIR)
+    endif
 
     ifdef $(1)_FORCE_INSTALL
       install: $$($(1)_INSTALL_PATH)
diff --git a/programs.mk b/programs.mk
index d07c914..b6de068 100644
--- a/programs.mk
+++ b/programs.mk
@@ -29,7 +29,7 @@ define build-program
   $$(eval $$(call create-dir, $$(_d)))
 
   $$($(1)_PATH): $$($(1)_OBJS) $$(_libs) | $$(_d)/
-       $$(trace-ld) $(CXX) -o $$@ $(GLOBAL_LDFLAGS) $$($(1)_OBJS) 
$$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE))
+       $$(trace-ld) $(CXX) -o $$@ $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) 
$$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE))
 
   $(1)_INSTALL_DIR ?= $$(bindir)
   $(1)_INSTALL_PATH := $$($(1)_INSTALL_DIR)/$(1)
@@ -43,7 +43,7 @@ define build-program
     _libs_final := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_INSTALL_PATH))
 
     $(DESTDIR)$$($(1)_INSTALL_PATH): $$($(1)_OBJS) $$(_libs_final) | 
$(DESTDIR)$$($(1)_INSTALL_DIR)/
-       $$(trace-ld) $(CXX) -o $$@ $(GLOBAL_LDFLAGS) $$($(1)_OBJS) 
$$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), 
$$($$(lib)_LDFLAGS_USE_INSTALLED))
+       $$(trace-ld) $(CXX) -o $$@ $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) 
$$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), 
$$($$(lib)_LDFLAGS_USE_INSTALLED))
 
   else