From patchwork Sun May 4 01:51:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan McCrohan X-Patchwork-Id: 4107021 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 4AA00BFF02 for ; Sun, 4 May 2014 02:09:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7885D20251 for ; Sun, 4 May 2014 02:09:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 19D0920254 for ; Sun, 4 May 2014 02:09:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753437AbaEDCJu (ORCPT ); Sat, 3 May 2014 22:09:50 -0400 Received: from fep19.mx.upcmail.net ([62.179.121.39]:63351 "EHLO fep19.mx.upcmail.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752897AbaEDCJt (ORCPT ); Sat, 3 May 2014 22:09:49 -0400 X-Greylist: delayed 1094 seconds by postgrey-1.27 at vger.kernel.org; Sat, 03 May 2014 22:09:47 EDT Received: from edge02.upcmail.net ([192.168.13.237]) by viefep16-int.chello.at (InterMail vM.8.01.05.05 201-2260-151-110-20120111) with ESMTP id <20140504015131.BUDT24925.viefep16-int.chello.at@edge02.upcmail.net>; Sun, 4 May 2014 03:51:31 +0200 Received: from lambda.dereenigne.org ([188.141.43.74]) by edge02.upcmail.net with edge id xdrV1n00V1c0xrw02drXCn; Sun, 04 May 2014 03:51:31 +0200 X-SourceIP: 188.141.43.74 Received: from localhost.dereenigne.org ([127.0.0.1] helo=lambda.dereenigne.org) by lambda.dereenigne.org with esmtp (Exim 4.82) (envelope-from ) id 1WglaT-00068e-Oa; Sun, 04 May 2014 02:51:29 +0100 From: Jonathan McCrohan To: linux-media@vger.kernel.org, pkg-vdr-dvb-devel@lists.alioth.debian.org Cc: Jonathan McCrohan Subject: [PATCH 4/6] [dvb-apps] dvb-apps: pass LDFLAGS to alevt and lib binaries Date: Sun, 4 May 2014 02:51:19 +0100 Message-Id: <1399168281-20626-5-git-send-email-jmccrohan@gmail.com> X-Mailer: git-send-email 1.9.2 In-Reply-To: <1399168281-20626-1-git-send-email-jmccrohan@gmail.com> References: <1399168281-20626-1-git-send-email-jmccrohan@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-6.5 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, FREEMAIL_FROM,HK_RANDOM_FROM,RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Based on patch by Tobias Grimm in Debian's dvb-apps 1.1.1+rev1500-1 package. Description: Use LDFLAGS passed in from dpkg-buildflags The alevt and lib binaries are not linked with the hardening options provided by dpkg-buildflags because LDFLAGS isn't used there. This patch simple adds the LDFLAGS to the Makefiles. Author: Tobias Grimm Date: Thu, 19 Sep 2013 23:04:58 +0200 Signed-off-by: Jonathan McCrohan --- Make.rules | 4 ++-- util/alevt/Makefile | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Make.rules b/Make.rules index 3410d7b..0726060 100644 --- a/Make.rules +++ b/Make.rules @@ -46,7 +46,7 @@ ifeq ($(V),1) %: %.c $(CC) $(CPPFLAGS) $(CFLAGS) -MMD $(LDFLAGS) -o $@ $< $(filter-out %.h %.c,$^) $(LOADLIBES) $(LDLIBS) %.so: - $(CC) -shared -o $@ $^ + $(CC) -shared $(LDFLAGS) -o $@ $^ %.a: $(AR) rcs $@ $^ clean:: @@ -76,7 +76,7 @@ else @$(CC) $(CPPFLAGS) $(CFLAGS) -MMD $(LDFLAGS) -o $@ $< $(filter-out %.h %.c,$^) $(LOADLIBES) $(LDLIBS) %.so: @echo CC $@ - @$(CC) -shared -o $@ $^ + @$(CC) -shared $(LDFLAGS) -o $@ $^ %.a: @echo AR $@ @$(AR) rcs $@ $^ diff --git a/util/alevt/Makefile b/util/alevt/Makefile index 2f7c8da..ac1996f 100644 --- a/util/alevt/Makefile +++ b/util/alevt/Makefile @@ -25,13 +25,13 @@ endif all: alevt alevt-date alevt-cap alevt.1 alevt-date.1 alevt-cap.1 alevt: $(OBJS) - $(CC) $(OPT) $(OBJS) -o alevt -L$(PREFIX)/lib -L$(PREFIX)/lib64 -lX11 $(EXPLIBS) + $(CC) $(OPT) $(OBJS) $(LDFLAGS) -o alevt -L$(PREFIX)/lib -L$(PREFIX)/lib64 -lX11 $(EXPLIBS) alevt-date: $(TOBJS) - $(CC) $(OPT) $(TOBJS) -o alevt-date $(ZVBILIB) + $(CC) $(OPT) $(TOBJS) $(LDFLAGS) -o alevt-date $(ZVBILIB) alevt-cap: $(COBJS) - $(CC) $(OPT) $(COBJS) -o alevt-cap $(EXPLIBS) + $(CC) $(OPT) $(COBJS) $(LDFLAGS) -o alevt-cap $(EXPLIBS) font.o: font1.xbm font2.xbm font3.xbm font4.xbm fontsize.h: font1.xbm font2.xbm font3.xbm font4.xbm