[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/64: Add support for making relocatable packages using $ORIGIN
From: |
Ludovic Courtès |
Subject: |
07/64: Add support for making relocatable packages using $ORIGIN |
Date: |
Mon, 05 Jan 2015 16:38:50 +0000 |
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
- branch nix updated (0a75126 -> a1dd396), Ludovic Courtès, 2015/01/05
- 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 <=
- 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, 2015/01/05
- 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