From patchwork Fri Jul 16 11:12:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 4537 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4GR7rm2gCLz3xGY for ; Fri, 16 Jul 2021 11:13:12 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4GR7rk677sz94; Fri, 16 Jul 2021 11:13:10 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4GR7rk2Mx2z2yDF; Fri, 16 Jul 2021 11:13:10 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4GR7rj3JTPz2xS8 for ; Fri, 16 Jul 2021 11:13:09 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4GR7rh5NJtz94; Fri, 16 Jul 2021 11:13:08 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1626433988; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=CB79Nn0EQjIbQYnn4aCYxN1UuqOV7WEAOOS2ENJdrpc=; b=yR4KizAH+Vc2VqIv7mRUHVTyQN2aX453XfyyZiMHMkUOE1JOmoTzyu+lH5BWFujHDi8OEO r7uNWqdxC1VoTlCQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1626433988; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=CB79Nn0EQjIbQYnn4aCYxN1UuqOV7WEAOOS2ENJdrpc=; b=fB01PXQinUeEeBOd5ZDR56B1KGUF0tJ9sjhXz8/H0Nw2+a8NrUyXBk2YwhW+ymAkZ1eoGO wrjMTYwa/kATGNwgBcMPpMTlKAu3dI8r05fTF7UCGeiw2Ec8LqWKmjdYSwCzE+8ONCkIq9 RCxmzrmhM8HqT+Mt/eTD6w4Topy5TyB1Y9A+P+93l0hw994e879Y4wuFV13LMWhhXsRJQz rjKzjjbSj4MJGH4v8dBKOgSddFQUBbuCS+lMT/57wec6Tlb5wOXaAYFeKC9wE8ggAzsYHm bdEGHXzHGgL4IQgv7eUYDEwyEjPETxjm1I/tML+R68ZmRryZwcJf4fn+6stHkg== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 1/2] pmacct: Patch file to allow build to work with GCC 11 Date: Fri, 16 Jul 2021 13:12:57 +0200 Message-Id: <20210716111258.210479-1-adolf.belka@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - Created pmacct-1.7.6-Werror.patch to remove -Werror flags from the configure This was flagging up warnings as errors and stopping the build - Removed the SUP_ARCH line to allow it to build again - No update required to the rootfile Signed-off-by: Adolf Belka --- lfs/pmacct | 17 ++++++------ src/patches/pmacct-1.7.6-Werror.patch | 38 +++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 8 deletions(-) create mode 100644 src/patches/pmacct-1.7.6-Werror.patch diff --git a/lfs/pmacct b/lfs/pmacct index 5674ecc1b..2307f8c87 100644 --- a/lfs/pmacct +++ b/lfs/pmacct @@ -32,9 +32,8 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = pmacct -PAK_VER = 1 +PAK_VER = 2 -SUP_ARCH = none DEPS = libcdada @@ -79,13 +78,15 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && rm configure + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/pmacct-1.7.6-Werror.patch cd $(DIR_APP) && ./autogen.sh - cd $(DIR_APP) && ./configure \ - --prefix=/usr \ - --sysconfdir=/etc/pmacct \ - --enable-sqlite3 \ - --enable-l2 \ - --enable-jansson + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --sysconfdir=/etc/pmacct \ + --enable-sqlite3 \ + --enable-l2 \ + --enable-jansson # Add directory for plugins and pipes -mkdir -v /var/spool/pmacct # Add configuration folder and copy conf file to it diff --git a/src/patches/pmacct-1.7.6-Werror.patch b/src/patches/pmacct-1.7.6-Werror.patch new file mode 100644 index 000000000..57bb7d1ff --- /dev/null +++ b/src/patches/pmacct-1.7.6-Werror.patch @@ -0,0 +1,38 @@ +--- pmacct-1.7.6/configure.ac.orig 2021-02-05 02:07:36.000000000 +0100 ++++ pmacct-1.7.6/configure.ac 2021-07-15 19:58:37.247916727 +0200 +@@ -1153,9 +1153,9 @@ AC_ARG_ENABLE(debug, + AC_MSG_RESULT(yes) + tmp_CFLAGS=`echo $CFLAGS | sed 's/O2/O0/g'` + CFLAGS="$tmp_CFLAGS" +- CFLAGS="$CFLAGS -g -Wall -Werror" ++ CFLAGS="$CFLAGS -g -Wall" + else +- CFLAGS="$CFLAGS -Wall -Werror" ++ CFLAGS="$CFLAGS -Wall" + AC_MSG_RESULT(no) + fi + ], + + +--- pmacct-1.7.6/src/external_libs/libcdada/configure.ac.orig 2021-02-07 16:29:15.000000000 +0100 ++++ pmacct-1.7.6/src/external_libs/libcdada/configure.ac 2021-07-16 09:04:30.858749121 +0200 +@@ -4,7 +4,7 @@ AC_INIT(LIBCDADA, m4_esyscmd_s(cat VERSI + AC_CONFIG_AUX_DIR([build-aux]) + AC_CONFIG_MACRO_DIR([m4]) + +-AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects]) ++AM_INIT_AUTOMAKE([-Wall foreign subdir-objects]) + + AC_GNU_SOURCE + +@@ -24,8 +24,8 @@ LT_INIT + AC_ENABLE_STATIC + + # Some useful default flags +-CFLAGS="-std=gnu89 -Werror -Wall $CFLAGS" +-CXXFLAGS="-Werror -Wall $CXXFLAGS" ++CFLAGS="-std=gnu89 -Wall $CFLAGS" ++CXXFLAGS="-Wall $CXXFLAGS" + AC_DEFINE([__STDC_FORMAT_MACROS], [], [Description]) + + # Check for Python3