webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-26 19:00:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

libcdada: Patch file to allow build to work with GCC 11 and update version to 0.3.5

Browse Source 
- 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@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
This commit is contained in:
Adolf Belka
2021-07-16 13:12:58 +02:00
committed by Arne Fitzenreiter
parent 21e59055e9
commit 113b93fde6
3 changed files with 34 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/patches/libcdada-0.3.4-use-shared-library-for-tests-and-examples-build.patch
View File

@@ -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

24
src/patches/libcdada-0.3.5-Werror.patch Normal file
View File

@@ -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@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