From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <libc-hacker-return-8350-listarch-libc-hacker=sources.redhat.com@sources.redhat.com>
Received: (qmail 17515 invoked by alias); 5 Mar 2005 16:42:15 -0000
Mailing-List: contact libc-hacker-help@sources.redhat.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:libc-hacker-subscribe@sources.redhat.com>
List-Archive: <http://sources.redhat.com/ml/libc-hacker/>
List-Post: <mailto:libc-hacker@sources.redhat.com>
List-Help: <mailto:libc-hacker-help@sources.redhat.com>, <http://sources.redhat.com/ml/#faqs>
Sender: libc-hacker-owner@sources.redhat.com
Received: (qmail 17495 invoked from network); 5 Mar 2005 16:42:14 -0000
Received: from unknown (HELO sunsite.mff.cuni.cz) (195.113.15.26)
  by sourceware.org with SMTP; 5 Mar 2005 16:42:14 -0000
Received: from sunsite.mff.cuni.cz (sunsite.mff.cuni.cz [127.0.0.1])
	by sunsite.mff.cuni.cz (8.13.1/8.13.1) with ESMTP id j25GgDR6010747;
	Sat, 5 Mar 2005 17:42:13 +0100
Received: (from jj@localhost)
	by sunsite.mff.cuni.cz (8.13.1/8.13.1/Submit) id j25GgDFv010746;
	Sat, 5 Mar 2005 17:42:13 +0100
Date: Sat, 05 Mar 2005 16:42:00 -0000
From: Jakub Jelinek <jakub@redhat.com>
To: Ulrich Drepper <drepper@redhat.com>
Cc: Glibc hackers <libc-hacker@sources.redhat.com>
Subject: [PATCH] Fix libc.so linker script
Message-ID: <20050305164213.GO4777@sunsite.mff.cuni.cz>
Reply-To: Jakub Jelinek <jakub@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.4.1i
X-SW-Source: 2005-03/txt/msg00015.txt.bz2

Hi!

The linker script uses $(slibdir) for libc.so.6 and $(libdir) for
libc_nonshared.a, so using $(inst_slibdir) for ld-linux.so.2 is at least
inconsistent.  Either all paths must be non-inst_ ones, or all must be
inst_ ones.  As the former is what everybody is used to, here is a patch
that changes it that way.

2005-03-05  Jakub Jelinek  <jakub@redhat.com>

	* Makerules ($(inst_libdir)/libc.so): Use $(slibdir) instead of
	$(inst_slibdir) in AS_NEEDED directive.

--- libc/Makerules.jj	2005-02-25 14:44:59.000000000 +0100
+++ libc/Makerules	2005-03-05 14:10:03.604286875 +0100
@@ -972,7 +972,7 @@ $(inst_libdir)/libc.so: $(common-objpfx)
 	 cat $<; \
 	 echo 'GROUP ( $(slibdir)/libc.so$(libc.so-version)' \
 	      '$(libdir)/$(patsubst %,$(libtype.oS),$(libprefix)$(libc-name))'\
-	      ' AS_NEEDED (' $(inst_slibdir)/$(rtld-installed-name) ') )' \
+	      ' AS_NEEDED (' $(slibdir)/$(rtld-installed-name) ') )' \
 	) > $@.new
 	mv -f $@.new $@
 

	Jakub