* [PATCH 1/2] pmacct: Patch file to allow build to work with GCC 11
@ 2021-07-16 11:12 Adolf Belka
2021-07-16 11:12 ` [PATCH 2/2] libcdada: Patch file to allow build to work with GCC 11 and update version to 0.3.5 Adolf Belka
0 siblings, 1 reply; 2+ messages in thread
From: Adolf Belka @ 2021-07-16 11:12 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 3220 bytes --]
- 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 <adolf.belka(a)ipfire.org>
---
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
--
2.32.0
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH 2/2] libcdada: Patch file to allow build to work with GCC 11 and update version to 0.3.5
2021-07-16 11:12 [PATCH 1/2] pmacct: Patch file to allow build to work with GCC 11 Adolf Belka
@ 2021-07-16 11:12 ` Adolf Belka
0 siblings, 0 replies; 2+ messages in thread
From: Adolf Belka @ 2021-07-16 11:12 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 6814 bytes --]
- Update from 0.3.4 to 0.3.5
- Created libcdada-0.3.5-Werror.patch based on the gentoo 0.3.5 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
- Added --without-tests and --without-checks to the ./configure statement. This prevents
the test and checks being built
- Removed libcdada-0.3.4-use-shared-library-for-tests-and-examples-build.patch as no
longer needed with the tests and checks no longer being built
- No update required for rootfile
- Changelog
v0.3.5 (20th April 2021)
New
- Improved public API documentation
- build: add --without-tests --without-examples build options
Bug fix
- Fix `E_EMPTY` return codes set/map/list/stack/queue
- Fix `make check` when valgrind is not installed
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
lfs/libcdada | 18 +++---
...library-for-tests-and-examples-build.patch | 56 -------------------
src/patches/libcdada-0.3.5-Werror.patch | 24 ++++++++
3 files changed, 34 insertions(+), 64 deletions(-)
delete mode 100644 src/patches/libcdada-0.3.4-use-shared-library-for-tests-and-examples-build.patch
create mode 100644 src/patches/libcdada-0.3.5-Werror.patch
diff --git a/lfs/libcdada b/lfs/libcdada
index f1470ea05..201cd8351 100644
--- a/lfs/libcdada
+++ b/lfs/libcdada
@@ -24,7 +24,7 @@
include Config
-VER = 0.3.4
+VER = 0.3.5
THISAPP = libcdada-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,9 +32,8 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = libcdada
-PAK_VER = 1
+PAK_VER = 2
-SUP_ARCH = none
DEPS =
@@ -46,7 +45,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = f5067835014e02d221af9754df8b140b
+$(DL_FILE)_MD5 = adbd5fef042d34b9fff01ceedb81b5ee
install : $(TARGET)
@@ -79,11 +78,14 @@ $(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) && patch -Np1 -i $(DIR_SRC)/src/patches/libcdada-0.3.4-use-shared-library-for-tests-and-examples-build.patch
+ cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/libcdada-0.3.5-Werror.patch
cd $(DIR_APP) && ./autogen.sh
- cd $(DIR_APP)/build && ../configure \
- --prefix=/usr \
- --disable-static
+ cd $(DIR_APP) && autoupdate
+ cd $(DIR_APP)/build && ../configure \
+ --prefix=/usr \
+ --disable-static \
+ --without-tests \
+ --without-examples
cd $(DIR_APP)/build && make install
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/src/patches/libcdada-0.3.4-use-shared-library-for-tests-and-examples-build.patch b/src/patches/libcdada-0.3.4-use-shared-library-for-tests-and-examples-build.patch
deleted file mode 100644
index adb06ad9d..000000000
--- a/src/patches/libcdada-0.3.4-use-shared-library-for-tests-and-examples-build.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -ruN libcdada-0.3.4.orig/examples/Makefile.am libcdada-0.3.4/examples/Makefile.am
---- libcdada-0.3.4.orig/examples/Makefile.am 2021-01-15 00:01:59.000000000 +0100
-+++ libcdada-0.3.4/examples/Makefile.am 2021-02-28 15:41:13.940082099 +0100
-@@ -11,32 +11,32 @@
-
- list_u32_SOURCES = list_u32.c
- list_u32_CPPFLAGS = -I$(top_builddir)/include/ -I$(top_srcdir)/include/
--list_u32_LDADD = ../src/.libs/libcdada.a -lstdc++
-+list_u32_LDADD = ../src/.libs/libcdada.so -lstdc++
-
- map_struct_SOURCES = map_struct.c
- map_struct_CPPFLAGS = -I$(top_builddir)/include/ -I$(top_srcdir)/include/
--map_struct_LDADD = ../src/.libs/libcdada.a -lstdc++
-+map_struct_LDADD = ../src/.libs/libcdada.so -lstdc++
-
- custom_gen_SOURCES = custom-gen/my_program_gen.c custom-gen/cdada.cc
- custom_gen_CPPFLAGS = -I$(top_builddir)/include/ -I$(top_srcdir)/include/
--custom_gen_LDADD = ../src/.libs/libcdada.a -lstdc++
-+custom_gen_LDADD = ../src/.libs/libcdada.so -lstdc++
-
- custom_macro_SOURCES = custom-macro/my_program.c custom-macro/cdada.cc
- custom_macro_CPPFLAGS = -I$(top_builddir)/include/ -I$(top_srcdir)/include/
--custom_macro_LDADD = ../src/.libs/libcdada.a -lstdc++
-+custom_macro_LDADD = ../src/.libs/libcdada.so -lstdc++
-
- str_SOURCES = str.c
- str_CPPFLAGS = -I$(top_builddir)/include/ -I$(top_srcdir)/include/
--str_LDADD = ../src/.libs/libcdada.a -lstdc++
-+str_LDADD = ../src/.libs/libcdada.so -lstdc++
-
- bbitmap_SOURCES = bbitmap.c
- bbitmap_CPPFLAGS = -I$(top_builddir)/include/ -I$(top_srcdir)/include/
--bbitmap_LDADD = ../src/.libs/libcdada.a -lstdc++
-+bbitmap_LDADD = ../src/.libs/libcdada.so -lstdc++
-
- queue_u32_SOURCES = queue_u32.c
- queue_u32_CPPFLAGS = -I$(top_builddir)/include/ -I$(top_srcdir)/include/
--queue_u32_LDADD = ../src/.libs/libcdada.a -lstdc++
-+queue_u32_LDADD = ../src/.libs/libcdada.so -lstdc++
-
- stack_u32_SOURCES = stack_u32.c
- stack_u32_CPPFLAGS = -I$(top_builddir)/include/ -I$(top_srcdir)/include/
--stack_u32_LDADD = ../src/.libs/libcdada.a -lstdc++
-+stack_u32_LDADD = ../src/.libs/libcdada.so -lstdc++
-diff -ruN libcdada-0.3.4.orig/test/Makefile.am libcdada-0.3.4/test/Makefile.am
---- libcdada-0.3.4.orig/test/Makefile.am 2021-01-15 00:01:59.000000000 +0100
-+++ libcdada-0.3.4/test/Makefile.am 2021-02-28 15:40:37.458117227 +0100
-@@ -63,7 +63,7 @@
- benchmark_SOURCES= benchmark.cc
- benchmark_CXXFLAGS= -O3
- benchmark_CPPFLAGS= -I$(top_builddir)/include/ -I$(top_srcdir)/include/
--benchmark_LDADD= -lpthread ../src/.libs/libcdada.a
-+benchmark_LDADD= -lpthread ../src/.libs/libcdada.so
-
- #Valgrind
- if VALGRIND_ENABLED
diff --git a/src/patches/libcdada-0.3.5-Werror.patch b/src/patches/libcdada-0.3.5-Werror.patch
new file mode 100644
index 000000000..94ceb4502
--- /dev/null
+++ b/src/patches/libcdada-0.3.5-Werror.patch
@@ -0,0 +1,24 @@
+diff --git a/configure.ac b/configure.ac
+index f2c4dde..fbde89c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -4,7 +4,7 @@ AC_INIT(LIBCDADA, m4_esyscmd_s(cat VERSION), marcdevel(a)gmail.com, libcdada, http
+ 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
--
2.32.0
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-07-16 11:12 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-16 11:12 [PATCH 1/2] pmacct: Patch file to allow build to work with GCC 11 Adolf Belka
2021-07-16 11:12 ` [PATCH 2/2] libcdada: Patch file to allow build to work with GCC 11 and update version to 0.3.5 Adolf Belka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox