From patchwork Thu Jul  3 17:15:42 2014
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Siddhesh Poyarekar <siddhesh@redhat.com>
X-Patchwork-Id: 1907
Received: (qmail 25995 invoked by alias); 3 Jul 2014 17:16:01 -0000
Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <libc-alpha.sourceware.org>
List-Unsubscribe: <mailto:libc-alpha-unsubscribe-##L=##H@sourceware.org>
List-Subscribe: <mailto:libc-alpha-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/libc-alpha/>
List-Post: <mailto:libc-alpha@sourceware.org>
List-Help: <mailto:libc-alpha-help@sourceware.org>,
	<http://sourceware.org/ml/#faqs>
Sender: libc-alpha-owner@sourceware.org
Delivered-To: mailing list libc-alpha@sourceware.org
Received: (qmail 25954 invoked by uid 89); 3 Jul 2014 17:15:57 -0000
Authentication-Results: sourceware.org; auth=none
X-Virus-Found: No
X-Spam-SWARE-Status: No, score=-3.5 required=5.0 tests=AWL, BAYES_00,
	SPF_HELO_PASS, SPF_PASS,
	T_RP_MATCHES_RCVD autolearn=ham version=3.3.2
X-HELO: mx1.redhat.com
Date: Thu, 3 Jul 2014 22:45:42 +0530
From: Siddhesh Poyarekar <siddhesh@redhat.com>
To: Roland McGrath <roland@hack.frob.com>
Cc: libc-alpha <libc-alpha@sourceware.org>
Subject: [PATCH][roland/nptl] Link tst-timer against librt only when subdir
	is rt
Message-ID: <20140703171541.GY20796@spoyarek.pnq.redhat.com>
References: <53B3D952.6090906@archlinux.org>
	<20140702165555.F29192C397B@topped-with-meat.com>
	<20140702171225.GL20796@spoyarek.pnq.redhat.com>
	<20140702171701.8AA8B2C397B@topped-with-meat.com>
	<20140702172757.GN20796@spoyarek.pnq.redhat.com>
	<20140702173207.284972C397D@topped-with-meat.com>
	<20140702174135.GO20796@spoyarek.pnq.redhat.com>
MIME-Version: 1.0
Content-Disposition: inline
In-Reply-To: <20140702174135.GO20796@spoyarek.pnq.redhat.com>
User-Agent: Mutt/1.5.22.1-rc1 (2013-10-16)

Hi Roland,

I've started the build for roland/nptl in rawhide.  Among the changes
I had to make for rtkaio, there's a change that is probably relevant
upstream, which is to link tst-timer against librt only when the
subdir is rt.  This check was in place earlier, but was removed during
the move.  OK to put it back?

Siddhesh

	* sysdeps/pthread/Makefile: Link tst-timer against librt only
	when the subdir is rt.

diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile
index 1080dc9..af1a44d 100644
--- a/sysdeps/pthread/Makefile
+++ b/sysdeps/pthread/Makefile
@@ -16,8 +16,10 @@
 # License along with the GNU C Library; if not, see
 # <http://www.gnu.org/licenses/>.
 
+ifeq ($(subdir),rt)
 ifeq (yes,$(build-shared))
 $(objpfx)tst-timer: $(objpfx)librt.so $(shared-thread-library)
 else
 $(objpfx)tst-timer: $(objpfx)librt.a $(static-thread-library)
 endif
+endif