From c8f132e7366c14f42d453b3afa13402f144a2cf3 Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Mon, 6 Mar 2017 20:45:40 +0100
Subject: [PATCH] fix LD_LIBRARY_PATH in makefiles to not use semicolon
The current makefiles generate invalid LD_LIBRARY_PATHs like:
LD_LIBRARY_PATH="../alib2std/lib-release;../alib2common/lib-release;lib-release" test-bin-release/alib2test
Standard directory separator on Unix/Linux systems is a colon. I found
that semicolon may be used to separate two lists of directories - the
first one is searched before the list(s) supplied on the command line,
the second one is searched after. But that's apparently not the case
here.
It seems that glibc doesn't care about it, because it somehow works on
Jenkins that runs on Gentoo. However, more correct libc libraries, like
musl libc, do care about it and don't accept such LD_LIBRARY_PATH.
---
alib2algo/makefile | 4 ++--
alib2algo_experimental/makefile | 4 ++--
alib2common/makefile | 4 ++--
alib2data/makefile | 4 ++--
alib2data_experimental/makefile | 4 ++--
alib2elgo/makefile | 4 ++--
alib2measurepp/makefile | 4 ++--
alib2raw/makefile | 4 ++--
alib2std/makefile | 4 ++--
alib2str/makefile | 4 ++--
alib2str_experimental/makefile | 4 ++--
11 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/alib2algo/makefile b/alib2algo/makefile
index affb6d2eb1..2c1b963e6c 100644
--- a/alib2algo/makefile
+++ b/alib2algo/makefile
@@ -170,10 +170,10 @@ $(TEST_OBJECTS_RELEASE): test-obj-release/
# main targets
debug: test-bin-debug/$(TESTBIN)
- LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-debug;,$(LINK_PATHS)))lib-debug" test-bin-debug/$(TESTBIN)
+ LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-debug:,$(LINK_PATHS)))lib-debug" test-bin-debug/$(TESTBIN)
release: test-bin-release/$(TESTBIN)
- LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-release;,$(LINK_PATHS)))lib-release" test-bin-release/$(TESTBIN)
+ LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-release:,$(LINK_PATHS)))lib-release" test-bin-release/$(TESTBIN)
clean: clean-debug clean-release
$(RM) -r doc
diff --git a/alib2algo_experimental/makefile b/alib2algo_experimental/makefile
index affb6d2eb1..2c1b963e6c 100644
--- a/alib2algo_experimental/makefile
+++ b/alib2algo_experimental/makefile
@@ -170,10 +170,10 @@ $(TEST_OBJECTS_RELEASE): test-obj-release/
# main targets
debug: test-bin-debug/$(TESTBIN)
- LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-debug;,$(LINK_PATHS)))lib-debug" test-bin-debug/$(TESTBIN)
+ LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-debug:,$(LINK_PATHS)))lib-debug" test-bin-debug/$(TESTBIN)
release: test-bin-release/$(TESTBIN)
- LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-release;,$(LINK_PATHS)))lib-release" test-bin-release/$(TESTBIN)
+ LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-release:,$(LINK_PATHS)))lib-release" test-bin-release/$(TESTBIN)
clean: clean-debug clean-release
$(RM) -r doc
diff --git a/alib2common/makefile b/alib2common/makefile
index affb6d2eb1..2c1b963e6c 100644
--- a/alib2common/makefile
+++ b/alib2common/makefile
@@ -170,10 +170,10 @@ $(TEST_OBJECTS_RELEASE): test-obj-release/
# main targets
debug: test-bin-debug/$(TESTBIN)
- LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-debug;,$(LINK_PATHS)))lib-debug" test-bin-debug/$(TESTBIN)
+ LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-debug:,$(LINK_PATHS)))lib-debug" test-bin-debug/$(TESTBIN)
release: test-bin-release/$(TESTBIN)
- LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-release;,$(LINK_PATHS)))lib-release" test-bin-release/$(TESTBIN)
+ LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-release:,$(LINK_PATHS)))lib-release" test-bin-release/$(TESTBIN)
clean: clean-debug clean-release
$(RM) -r doc
diff --git a/alib2data/makefile b/alib2data/makefile
index affb6d2eb1..2c1b963e6c 100644
--- a/alib2data/makefile
+++ b/alib2data/makefile
@@ -170,10 +170,10 @@ $(TEST_OBJECTS_RELEASE): test-obj-release/
# main targets
debug: test-bin-debug/$(TESTBIN)
- LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-debug;,$(LINK_PATHS)))lib-debug" test-bin-debug/$(TESTBIN)
+ LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-debug:,$(LINK_PATHS)))lib-debug" test-bin-debug/$(TESTBIN)
release: test-bin-release/$(TESTBIN)
- LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-release;,$(LINK_PATHS)))lib-release" test-bin-release/$(TESTBIN)
+ LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-release:,$(LINK_PATHS)))lib-release" test-bin-release/$(TESTBIN)
clean: clean-debug clean-release
$(RM) -r doc
diff --git a/alib2data_experimental/makefile b/alib2data_experimental/makefile
index affb6d2eb1..2c1b963e6c 100644
--- a/alib2data_experimental/makefile
+++ b/alib2data_experimental/makefile
@@ -170,10 +170,10 @@ $(TEST_OBJECTS_RELEASE): test-obj-release/
# main targets
debug: test-bin-debug/$(TESTBIN)
- LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-debug;,$(LINK_PATHS)))lib-debug" test-bin-debug/$(TESTBIN)
+ LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-debug:,$(LINK_PATHS)))lib-debug" test-bin-debug/$(TESTBIN)
release: test-bin-release/$(TESTBIN)
- LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-release;,$(LINK_PATHS)))lib-release" test-bin-release/$(TESTBIN)
+ LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-release:,$(LINK_PATHS)))lib-release" test-bin-release/$(TESTBIN)
clean: clean-debug clean-release
$(RM) -r doc
diff --git a/alib2elgo/makefile b/alib2elgo/makefile
index affb6d2eb1..2c1b963e6c 100644
--- a/alib2elgo/makefile
+++ b/alib2elgo/makefile
@@ -170,10 +170,10 @@ $(TEST_OBJECTS_RELEASE): test-obj-release/
# main targets
debug: test-bin-debug/$(TESTBIN)
- LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-debug;,$(LINK_PATHS)))lib-debug" test-bin-debug/$(TESTBIN)
+ LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-debug:,$(LINK_PATHS)))lib-debug" test-bin-debug/$(TESTBIN)
release: test-bin-release/$(TESTBIN)
- LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-release;,$(LINK_PATHS)))lib-release" test-bin-release/$(TESTBIN)
+ LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-release:,$(LINK_PATHS)))lib-release" test-bin-release/$(TESTBIN)
clean: clean-debug clean-release
$(RM) -r doc
diff --git a/alib2measurepp/makefile b/alib2measurepp/makefile
index affb6d2eb1..2c1b963e6c 100644
--- a/alib2measurepp/makefile
+++ b/alib2measurepp/makefile
@@ -170,10 +170,10 @@ $(TEST_OBJECTS_RELEASE): test-obj-release/
# main targets
debug: test-bin-debug/$(TESTBIN)
- LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-debug;,$(LINK_PATHS)))lib-debug" test-bin-debug/$(TESTBIN)
+ LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-debug:,$(LINK_PATHS)))lib-debug" test-bin-debug/$(TESTBIN)
release: test-bin-release/$(TESTBIN)
- LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-release;,$(LINK_PATHS)))lib-release" test-bin-release/$(TESTBIN)
+ LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-release:,$(LINK_PATHS)))lib-release" test-bin-release/$(TESTBIN)
clean: clean-debug clean-release
$(RM) -r doc
diff --git a/alib2raw/makefile b/alib2raw/makefile
index affb6d2eb1..2c1b963e6c 100644
--- a/alib2raw/makefile
+++ b/alib2raw/makefile
@@ -170,10 +170,10 @@ $(TEST_OBJECTS_RELEASE): test-obj-release/
# main targets
debug: test-bin-debug/$(TESTBIN)
- LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-debug;,$(LINK_PATHS)))lib-debug" test-bin-debug/$(TESTBIN)
+ LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-debug:,$(LINK_PATHS)))lib-debug" test-bin-debug/$(TESTBIN)
release: test-bin-release/$(TESTBIN)
- LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-release;,$(LINK_PATHS)))lib-release" test-bin-release/$(TESTBIN)
+ LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-release:,$(LINK_PATHS)))lib-release" test-bin-release/$(TESTBIN)
clean: clean-debug clean-release
$(RM) -r doc
diff --git a/alib2std/makefile b/alib2std/makefile
index affb6d2eb1..2c1b963e6c 100644
--- a/alib2std/makefile
+++ b/alib2std/makefile
@@ -170,10 +170,10 @@ $(TEST_OBJECTS_RELEASE): test-obj-release/
# main targets
debug: test-bin-debug/$(TESTBIN)
- LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-debug;,$(LINK_PATHS)))lib-debug" test-bin-debug/$(TESTBIN)
+ LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-debug:,$(LINK_PATHS)))lib-debug" test-bin-debug/$(TESTBIN)
release: test-bin-release/$(TESTBIN)
- LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-release;,$(LINK_PATHS)))lib-release" test-bin-release/$(TESTBIN)
+ LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-release:,$(LINK_PATHS)))lib-release" test-bin-release/$(TESTBIN)
clean: clean-debug clean-release
$(RM) -r doc
diff --git a/alib2str/makefile b/alib2str/makefile
index affb6d2eb1..2c1b963e6c 100644
--- a/alib2str/makefile
+++ b/alib2str/makefile
@@ -170,10 +170,10 @@ $(TEST_OBJECTS_RELEASE): test-obj-release/
# main targets
debug: test-bin-debug/$(TESTBIN)
- LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-debug;,$(LINK_PATHS)))lib-debug" test-bin-debug/$(TESTBIN)
+ LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-debug:,$(LINK_PATHS)))lib-debug" test-bin-debug/$(TESTBIN)
release: test-bin-release/$(TESTBIN)
- LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-release;,$(LINK_PATHS)))lib-release" test-bin-release/$(TESTBIN)
+ LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-release:,$(LINK_PATHS)))lib-release" test-bin-release/$(TESTBIN)
clean: clean-debug clean-release
$(RM) -r doc
diff --git a/alib2str_experimental/makefile b/alib2str_experimental/makefile
index affb6d2eb1..2c1b963e6c 100644
--- a/alib2str_experimental/makefile
+++ b/alib2str_experimental/makefile
@@ -170,10 +170,10 @@ $(TEST_OBJECTS_RELEASE): test-obj-release/
# main targets
debug: test-bin-debug/$(TESTBIN)
- LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-debug;,$(LINK_PATHS)))lib-debug" test-bin-debug/$(TESTBIN)
+ LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-debug:,$(LINK_PATHS)))lib-debug" test-bin-debug/$(TESTBIN)
release: test-bin-release/$(TESTBIN)
- LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-release;,$(LINK_PATHS)))lib-release" test-bin-release/$(TESTBIN)
+ LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-release:,$(LINK_PATHS)))lib-release" test-bin-release/$(TESTBIN)
clean: clean-debug clean-release
$(RM) -r doc
--
GitLab