[PATCH] Makefile.tests: Add LIBDL make(1) variable for portability sake

[PATCH] Makefile.tests: Add LIBDL make(1) variable for portability sake

[kevans-HZy0K5TPuP5AfugRpC6u6w]

Some platforms (many, if not all, of the *BSD projects) do not provide a libdl,
and instead provide the same functionality in libc. Instead of forcing these
platforms to patch out the link against libdl, add a LIBDL make(1) variable to
allow the -ldl argument to be excluded easily via make(1) arguments.

Signed-off-by: Kyle Evans <kevans-HZy0K5TPuP5AfugRpC6u6w@public.gmane.org>
---
 tests/Makefile.tests | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/Makefile.tests b/tests/Makefile.tests
index 2258135..262944a 100644
--- a/tests/Makefile.tests
+++ b/tests/Makefile.tests
@@ -54,9 +54,12 @@ tests:	$(TESTS) $(TESTS_TREES)
 
 $(LIB_TESTS): %: $(TESTS_PREFIX)testutils.o util.o $(LIBFDT_archive)
 
+# Not necessary on all platforms; allow -ldl to be excluded instead of forcing
+# other platforms to patch it out.
+LIBDL = -ldl
 $(DL_LIB_TESTS): %: %.o $(TESTS_PREFIX)testutils.o util.o $(LIBFDT_archive)
 	@$(VECHO) LD [libdl] $@
-	$(LINK.c) -o $@ $^ -ldl
+	$(LINK.c) -o $@ $^ $(LIBDL)
 
 $(LIBTREE_TESTS): %: $(TESTS_PREFIX)testutils.o $(TESTS_PREFIX)trees.o \
 		util.o $(LIBFDT_archive)
-- 
2.15.1

Re: [PATCH] Makefile.tests: Add LIBDL make(1) variable for portability sake

[David Gibson]

[-- Attachment #1: Type: text/plain, Size: 1523 bytes --]

On Wed, Jan 03, 2018 at 10:30:13PM -0600, kevans-HZy0K5TPuP5AfugRpC6u6w@public.gmane.org wrote:
> Some platforms (many, if not all, of the *BSD projects) do not provide a libdl,
> and instead provide the same functionality in libc. Instead of forcing these
> platforms to patch out the link against libdl, add a LIBDL make(1) variable to
> allow the -ldl argument to be excluded easily via make(1) arguments.
> 
> Signed-off-by: Kyle Evans <kevans-HZy0K5TPuP5AfugRpC6u6w@public.gmane.org>

Applied, thanks.

> ---
>  tests/Makefile.tests | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/Makefile.tests b/tests/Makefile.tests
> index 2258135..262944a 100644
> --- a/tests/Makefile.tests
> +++ b/tests/Makefile.tests
> @@ -54,9 +54,12 @@ tests:	$(TESTS) $(TESTS_TREES)
>  
>  $(LIB_TESTS): %: $(TESTS_PREFIX)testutils.o util.o $(LIBFDT_archive)
>  
> +# Not necessary on all platforms; allow -ldl to be excluded instead of forcing
> +# other platforms to patch it out.
> +LIBDL = -ldl
>  $(DL_LIB_TESTS): %: %.o $(TESTS_PREFIX)testutils.o util.o $(LIBFDT_archive)
>  	@$(VECHO) LD [libdl] $@
> -	$(LINK.c) -o $@ $^ -ldl
> +	$(LINK.c) -o $@ $^ $(LIBDL)
>  
>  $(LIBTREE_TESTS): %: $(TESTS_PREFIX)testutils.o $(TESTS_PREFIX)trees.o \
>  		util.o $(LIBFDT_archive)

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]