[hurd] 05/14: Complete changes to use -L instead of -Wl, -rpath-link

[Samuel Thibault]

This is an automated email from the git hooks/post-receive script.

sthibault pushed a commit to branch upstream
in repository hurd.

commit 34071b357d821cc6285ef85d600dfa842252949c
Author: Thomas Schwinge <address@hidden>
Date:   Mon May 16 16:49:30 2016 +0200

    Complete changes to use -L instead of -Wl,-rpath-link
    
    Changes missing from commit c9c29eb890527fe68900e4a0af7c2df9a9fa5b40.
    
    * console-client/Makefile (%.so.$(hurd-version)): Use $(lpath) instead of
    $(rpath)
    * libstore/Makefile (libstore_%.so.$(hurd-version)): Likewise.
---
 console-client/Makefile | 5 +++--
 libstore/Makefile       | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/console-client/Makefile b/console-client/Makefile
index 1784d7c..024a053 100644
--- a/console-client/Makefile
+++ b/console-client/Makefile
@@ -1,6 +1,7 @@
 #
 #   Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2004,
-#   2005, 2008, 2010 Free Software Foundation, Inc.
+#   2005, 2008, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Free Software
+#   Foundation, Inc.
 #
 #   This program is free software; you can redistribute it and/or
 #   modify it under the terms of the GNU General Public License as
@@ -91,7 +92,7 @@ $(module-dir)/%: %
 # You can use this rule to make a dynamically-loadable version of any
 # of the modules.
 %.so.$(hurd-version): 
-       $(CC) -shared -Wl,-soname=$@ -o $@ $(rpath) \
+       $(CC) -shared -Wl,-soname=$@ -o $@ $(lpath) \
                $(CFLAGS) $($*-CFLAGS) $(LDFLAGS) \
                '-Wl,-(' $($*-LDLIBS) '-Wl,-)' $^
 
diff --git a/libstore/Makefile b/libstore/Makefile
index 28f5660..3ba0017 100644
--- a/libstore/Makefile
+++ b/libstore/Makefile
@@ -1,6 +1,7 @@
 # Makefile for libstore
 #
-#   Copyright (C) 1995,96,97,2001,02 Free Software Foundation, Inc.
+#   Copyright (C) 1995, 1996, 1997, 1999, 2001, 2002, 2010, 2012, 2013, 2014,
+#   2016 Free Software Foundation, Inc.
 #   Written by Miles Bader <address@hidden>
 #
 #   This file is part of the GNU Hurd.
@@ -73,7 +74,7 @@ libstore_bunzip2.so.$(hurd-version): $(BUNZIP2_OBJS:.o=_pic.o)
 # just include all the standard store types in libstore.so itself.
 libstore_%.so.$(hurd-version): %_pic.o libstore.so
        $(CC) -shared -Wl,-soname=$@ -o $@ \
-             $(rpath) $(CFLAGS) $(LDFLAGS) $(libstore_$*.so-LDFLAGS) $^
+             $(lpath) $(CFLAGS) $(LDFLAGS) $(libstore_$*.so-LDFLAGS) $^
 
 # Each libstore_TYPE.a is in fact an object file script so that `-lstore_TYPE'
 # just has the same effect as `-u store_TYPE_class'.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-hurd/hurd.git