From patchwork Fri Nov 2 12:35:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Boccassi X-Patchwork-Id: 992299 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=debian.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42mhPw0h78zB4W6 for ; Fri, 2 Nov 2018 23:36:04 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727613AbeKBVnF (ORCPT ); Fri, 2 Nov 2018 17:43:05 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:51892 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726026AbeKBVnE (ORCPT ); Fri, 2 Nov 2018 17:43:04 -0400 Received: by mail-wm1-f68.google.com with SMTP id w7-v6so1859886wmc.1 for ; Fri, 02 Nov 2018 05:36:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=THiE8fiMizbLPQKJ+xG5JNBqiLlUiAAD+NOxuKlgcTc=; b=MmPg/elfM7DZb6uEnfsHx3Gb3YyMoe3uv3RMoq523KtC/3zBdwz/yi2NY6cs53eTLA 9dScHm+euKKYzuX6MLed18d7GU0HayMJEY7MHruqpeLk6CY/TiE//HuF9MeNgf9E/mr9 qLOqkx7iogH88BeVPYrVpWRc/srTj8W3JCvj8mOs66NOa7coYeKh6a2LIrmfxjoZLAxz fO85Krs8YzTtnYO4dS7H5pH/0AWIMIYTK0IDolOKg4O6GDNsQnbphLRNotPS6wEVAZYc LPbwcT0Q1wJ+ImFcER5FiBycJW5bYQB6Dni5ph1c6s0QURpCi0qldKWODSmRhMt5KNfs jmpQ== X-Gm-Message-State: AGRZ1gJk2R+uvVZiYklvUjEkldrOeVO3kr8j/GiUNC4wtwVoxkSiEFkw 6CAoumE2lMxjERrbIKTLbznnspnkfdc= X-Google-Smtp-Source: AJdET5cChMyB45Izo83FUoA5KwtM2deaQnulbhoj2m3EWg2PFJ625g4l0SxUK+s2FodI1ROF5N1BlQ== X-Received: by 2002:a1c:c287:: with SMTP id s129-v6mr544364wmf.97.1541162160193; Fri, 02 Nov 2018 05:36:00 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id r73-v6sm26716278wmb.37.2018.11.02.05.35.58 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 02 Nov 2018 05:35:59 -0700 (PDT) From: Luca Boccassi To: netdev@vger.kernel.org Cc: stephen@networkplumber.org, dsahern@gmail.com Subject: [PATCH iproute2 2/2] Pass CPPFLAGS to the compiler Date: Fri, 2 Nov 2018 12:35:44 +0000 Message-Id: <20181102123544.13000-2-bluca@debian.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181102123544.13000-1-bluca@debian.org> References: <20181102123544.13000-1-bluca@debian.org> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When building Debian packages pre-processor flags are passed via CPPFLAGS, as the convention indicates. Specifically, the hardening -D_FORTIFY_SOURCE=2 flag is used. Pass CPPFLAGS to all calls of QUIET_CC together with CFLAGS. Signed-off-by: Luca Boccassi --- configure | 2 +- misc/Makefile | 8 ++++---- tc/Makefile | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/configure b/configure index c5655978..5df6082b 100755 --- a/configure +++ b/configure @@ -436,4 +436,4 @@ check_cap echo >> $CONFIG echo "%.o: %.c" >> $CONFIG -echo ' $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<' >> $CONFIG +echo ' $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CPPFLAGS) -c -o $@ $<' >> $CONFIG diff --git a/misc/Makefile b/misc/Makefile index b2dd6b26..6a849af4 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -16,16 +16,16 @@ ss: $(SSOBJ) $(QUIET_LINK)$(CC) $^ $(LDFLAGS) $(LDLIBS) -o $@ nstat: nstat.c - $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o nstat nstat.c $(LDLIBS) -lm + $(QUIET_CC)$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o nstat nstat.c $(LDLIBS) -lm ifstat: ifstat.c - $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o ifstat ifstat.c $(LDLIBS) -lm + $(QUIET_CC)$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o ifstat ifstat.c $(LDLIBS) -lm rtacct: rtacct.c - $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o rtacct rtacct.c $(LDLIBS) -lm + $(QUIET_CC)$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o rtacct rtacct.c $(LDLIBS) -lm arpd: arpd.c - $(QUIET_CC)$(CC) $(CFLAGS) -I$(DBM_INCLUDE) $(LDFLAGS) -o arpd arpd.c $(LDLIBS) -ldb + $(QUIET_CC)$(CC) $(CFLAGS) -I$(DBM_INCLUDE) $(CPPFLAGS) $(LDFLAGS) -o arpd arpd.c $(LDLIBS) -ldb ssfilter.c: ssfilter.y $(QUIET_YACC)bison ssfilter.y -o ssfilter.c diff --git a/tc/Makefile b/tc/Makefile index 25a28284..f8010d3c 100644 --- a/tc/Makefile +++ b/tc/Makefile @@ -128,7 +128,7 @@ CFLAGS += -DYY_NO_INPUT MODDESTDIR := $(DESTDIR)$(LIBDIR)/tc %.so: %.c - $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -shared -fpic $< -o $@ + $(QUIET_CC)$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -shared -fpic $< -o $@ all: tc $(TCSO) @@ -158,13 +158,13 @@ clean: rm -f emp_ematch.yacc.* q_atm.so: q_atm.c - $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -shared -fpic -o q_atm.so q_atm.c -latm + $(QUIET_CC)$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -shared -fpic -o q_atm.so q_atm.c -latm m_xt.so: m_xt.c - $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -shared -fpic -o m_xt.so m_xt.c $$($(PKG_CONFIG) xtables --cflags --libs) + $(QUIET_CC)$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -shared -fpic -o m_xt.so m_xt.c $$($(PKG_CONFIG) xtables --cflags --libs) m_xt_old.so: m_xt_old.c - $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -shared -fpic -o m_xt_old.so m_xt_old.c $$($(PKG_CONFIG) xtables --cflags --libs) + $(QUIET_CC)$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -shared -fpic -o m_xt_old.so m_xt_old.c $$($(PKG_CONFIG) xtables --cflags --libs) em_ipset.o: CFLAGS += $$($(PKG_CONFIG) xtables --cflags)