From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Adolf Belka (ipfire)" To: development@lists.ipfire.org Subject: [PATCH 2/2] libcdada: New addon - dependency for pmacct Date: Mon, 08 Mar 2021 13:00:25 +0100 Message-ID: <20210308120025.2100-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0475976493275027200==" List-Id: --===============0475976493275027200== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Adolf Belka - This package is required for its library which is a dependency for pmacct - url for developer is https://msune.github.io/libcdada/ - patch is required to allow disabling of staic library Makefiles for tests and examples explicitly uses static library The patch changes all .a to .so Co-authored-by: Jon Murphy Co-authored-by: Erik Kapfer Signed-off-by: Adolf Belka --- config/rootfiles/packages/libcdada | 28 ++++++ lfs/libcdada | 87 +++++++++++++++++++ ...library-for-tests-and-examples-build.patch | 56 ++++++++++++ 3 files changed, 171 insertions(+) create mode 100644 config/rootfiles/packages/libcdada create mode 100644 lfs/libcdada create mode 100644 src/patches/libcdada-0.3.4-use-shared-library-for-tests-a= nd-examples-build.patch diff --git a/config/rootfiles/packages/libcdada b/config/rootfiles/packages/l= ibcdada new file mode 100644 index 000000000..b3b1b99b1 --- /dev/null +++ b/config/rootfiles/packages/libcdada @@ -0,0 +1,28 @@ +#usr/bin/cdada-gen +#usr/include/cdada +#usr/include/cdada.h +#usr/include/cdada/__common_internal.h +#usr/include/cdada/__list_internal.h +#usr/include/cdada/__map_internal.h +#usr/include/cdada/__queue_internal.h +#usr/include/cdada/__set_internal.h +#usr/include/cdada/__stack_internal.h +#usr/include/cdada/bbitmap.h +#usr/include/cdada/list.h +#usr/include/cdada/list_custom_cc.h +#usr/include/cdada/map.h +#usr/include/cdada/map_custom_cc.h +#usr/include/cdada/queue.h +#usr/include/cdada/queue_custom_cc.h +#usr/include/cdada/set.h +#usr/include/cdada/set_custom_cc.h +#usr/include/cdada/stack.h +#usr/include/cdada/stack_custom_cc.h +#usr/include/cdada/str.h +#usr/include/cdada/utils.h +#usr/include/cdada/version.h +#usr/lib/libcdada.a +#usr/lib/libcdada.la +#usr/lib/libcdada.so +usr/lib/libcdada.so.0 +usr/lib/libcdada.so.0.0.0 diff --git a/lfs/libcdada b/lfs/libcdada new file mode 100644 index 000000000..a30b03333 --- /dev/null +++ b/lfs/libcdada @@ -0,0 +1,87 @@ +############################################################################= ### +# = # +# IPFire.org - A linux based firewall = # +# Copyright (C) 2019 IPFire Team = # +# = # +# This program is free software: you can redistribute it and/or modify = # +# it under the terms of the GNU General Public License as published by = # +# the Free Software Foundation, either version 3 of the License, or = # +# (at your option) any later version. = # +# = # +# This program is distributed in the hope that it will be useful, = # +# but WITHOUT ANY WARRANTY; without even the implied warranty of = # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the = # +# GNU General Public License for more details. = # +# = # +# You should have received a copy of the GNU General Public License = # +# along with this program. If not, see . = # +# = # +############################################################################= ### + +############################################################################= ### +# Definitions +############################################################################= ### + +include Config + +VER =3D 0.3.4 + +THISAPP =3D libcdada-$(VER) +DL_FILE =3D $(THISAPP).tar.gz +DL_FROM =3D $(URL_IPFIRE) +DIR_APP =3D $(DIR_SRC)/$(THISAPP) +TARGET =3D $(DIR_INFO)/$(THISAPP) +PROG =3D libcdada +PAK_VER =3D 1 + +DEPS =3D=20 + +############################################################################= ### +# Top-level Rules +############################################################################= ### + +objects =3D $(DL_FILE) + +$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 =3D f5067835014e02d221af9754df8b140b + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist:=20 + @$(PAK) + +############################################################################= ### +# Downloading, checking, md5sum +############################################################################= ### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################= ### +# Installation Details +############################################################################= ### + +$(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-sh= ared-library-for-tests-and-examples-build.patch + cd $(DIR_APP) && ./autogen.sh + cd $(DIR_APP)/build && ../configure \ + --prefix=3D/usr \ + --disable-static + 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-exam= ples-build.patch b/src/patches/libcdada-0.3.4-use-shared-library-for-tests-an= d-examples-build.patch new file mode 100644 index 000000000..adb06ad9d --- /dev/null +++ b/src/patches/libcdada-0.3.4-use-shared-library-for-tests-and-examples-bu= ild.patch @@ -0,0 +1,56 @@ +diff -ruN libcdada-0.3.4.orig/examples/Makefile.am libcdada-0.3.4/examples/M= akefile.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 @@ +=20 + list_u32_SOURCES =3D list_u32.c + list_u32_CPPFLAGS =3D -I$(top_builddir)/include/ -I$(top_srcdir)/include/ +-list_u32_LDADD =3D ../src/.libs/libcdada.a -lstdc++ ++list_u32_LDADD =3D ../src/.libs/libcdada.so -lstdc++ +=20 + map_struct_SOURCES =3D map_struct.c + map_struct_CPPFLAGS =3D -I$(top_builddir)/include/ -I$(top_srcdir)/include/ +-map_struct_LDADD =3D ../src/.libs/libcdada.a -lstdc++ ++map_struct_LDADD =3D ../src/.libs/libcdada.so -lstdc++ +=20 + custom_gen_SOURCES =3D custom-gen/my_program_gen.c custom-gen/cdada.cc + custom_gen_CPPFLAGS =3D -I$(top_builddir)/include/ -I$(top_srcdir)/include/ +-custom_gen_LDADD =3D ../src/.libs/libcdada.a -lstdc++ ++custom_gen_LDADD =3D ../src/.libs/libcdada.so -lstdc++ +=20 + custom_macro_SOURCES =3D custom-macro/my_program.c custom-macro/cdada.cc + custom_macro_CPPFLAGS =3D -I$(top_builddir)/include/ -I$(top_srcdir)/includ= e/ +-custom_macro_LDADD =3D ../src/.libs/libcdada.a -lstdc++ ++custom_macro_LDADD =3D ../src/.libs/libcdada.so -lstdc++ +=20 + str_SOURCES =3D str.c + str_CPPFLAGS =3D -I$(top_builddir)/include/ -I$(top_srcdir)/include/ +-str_LDADD =3D ../src/.libs/libcdada.a -lstdc++ ++str_LDADD =3D ../src/.libs/libcdada.so -lstdc++ +=20 + bbitmap_SOURCES =3D bbitmap.c + bbitmap_CPPFLAGS =3D -I$(top_builddir)/include/ -I$(top_srcdir)/include/ +-bbitmap_LDADD =3D ../src/.libs/libcdada.a -lstdc++ ++bbitmap_LDADD =3D ../src/.libs/libcdada.so -lstdc++ +=20 + queue_u32_SOURCES =3D queue_u32.c + queue_u32_CPPFLAGS =3D -I$(top_builddir)/include/ -I$(top_srcdir)/include/ +-queue_u32_LDADD =3D ../src/.libs/libcdada.a -lstdc++ ++queue_u32_LDADD =3D ../src/.libs/libcdada.so -lstdc++ +=20 + stack_u32_SOURCES =3D stack_u32.c + stack_u32_CPPFLAGS =3D -I$(top_builddir)/include/ -I$(top_srcdir)/include/ +-stack_u32_LDADD =3D ../src/.libs/libcdada.a -lstdc++ ++stack_u32_LDADD =3D ../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=3D benchmark.cc + benchmark_CXXFLAGS=3D -O3 + benchmark_CPPFLAGS=3D -I$(top_builddir)/include/ -I$(top_srcdir)/include/ +-benchmark_LDADD=3D -lpthread ../src/.libs/libcdada.a ++benchmark_LDADD=3D -lpthread ../src/.libs/libcdada.so +=20 + #Valgrind + if VALGRIND_ENABLED --=20 2.30.1 --===============0475976493275027200==--