From mboxrd@z Thu Jan 1 00:00:00 1970 From: Adolf Belka To: development@lists.ipfire.org Subject: Re: [PATCH 2/2] libcdada: New addon - dependency for pmacct Date: Thu, 18 Mar 2021 14:12:10 +0100 Message-ID: <7df788c7-7f65-5f9e-de0d-59e9a170c957@ipfire.org> In-Reply-To: <6497E120-AE28-43B4-BD54-56DDB76E85AB@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8752164546159262968==" List-Id: --===============8752164546159262968== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hi Michael, On 18/03/2021 13:58, Michael Tremer wrote: > Hello, >=20 >> On 8 Mar 2021, at 12:00, Adolf Belka (ipfire) w= rote: >> >> 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 >=20 > Does John not have an email address? Yes Jon does but he did not want his gmail address placed in that patch in pu= blic view. In the mailing list it is also used but all the actual .'s are rep= laced by (dot). >=20 > You should probably use Signed-off-by: for these two as well or Suggested-b= y: Jon is the user of the package and has been doing all the testing and evaluat= ion phase. Erik kicked off the addon patch generation work and I have taken i= t over. So I will do any updates that need to be done in the future with Jon = testing it out before submission. >=20 > There is more about what they mean over here: >=20 > https://wiki.ipfire.org/devel/git/tags Will look those up. Should I redo the patch set as a V2 with those tags added= ? Once I know I should deal with the lack of email address. >=20 > Apart from that, the patch looks good. >=20 > -Michael >=20 >> 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= -and-examples-build.patch >> >> diff --git a/config/rootfiles/packages/libcdada b/config/rootfiles/package= s/libcdada >> 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 >> + >> +#########################################################################= ###### >> +# 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: >> + @$(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= -shared-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-e= xamples-build.patch b/src/patches/libcdada-0.3.4-use-shared-library-for-tests= -and-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= -build.patch >> @@ -0,0 +1,56 @@ >> +diff -ruN libcdada-0.3.4.orig/examples/Makefile.am libcdada-0.3.4/example= s/Makefile.am >> +--- libcdada-0.3.4.orig/examples/Makefile.am 2021-01-15 00:01:59.00000000= 0 +0100 >> ++++ libcdada-0.3.4/examples/Makefile.am 2021-02-28 15:41:13.940082099 +01= 00 >> +@@ -11,32 +11,32 @@ >> + >> + 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++ >> + >> + map_struct_SOURCES =3D map_struct.c >> + map_struct_CPPFLAGS =3D -I$(top_builddir)/include/ -I$(top_srcdir)/inclu= de/ >> +-map_struct_LDADD =3D ../src/.libs/libcdada.a -lstdc++ >> ++map_struct_LDADD =3D ../src/.libs/libcdada.so -lstdc++ >> + >> + 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)/inclu= de/ >> +-custom_gen_LDADD =3D ../src/.libs/libcdada.a -lstdc++ >> ++custom_gen_LDADD =3D ../src/.libs/libcdada.so -lstdc++ >> + >> + custom_macro_SOURCES =3D custom-macro/my_program.c custom-macro/cdada.cc >> + custom_macro_CPPFLAGS =3D -I$(top_builddir)/include/ -I$(top_srcdir)/inc= lude/ >> +-custom_macro_LDADD =3D ../src/.libs/libcdada.a -lstdc++ >> ++custom_macro_LDADD =3D ../src/.libs/libcdada.so -lstdc++ >> + >> + 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++ >> + >> + 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++ >> + >> + queue_u32_SOURCES =3D queue_u32.c >> + queue_u32_CPPFLAGS =3D -I$(top_builddir)/include/ -I$(top_srcdir)/includ= e/ >> +-queue_u32_LDADD =3D ../src/.libs/libcdada.a -lstdc++ >> ++queue_u32_LDADD =3D ../src/.libs/libcdada.so -lstdc++ >> + >> + stack_u32_SOURCES =3D stack_u32.c >> + stack_u32_CPPFLAGS =3D -I$(top_builddir)/include/ -I$(top_srcdir)/includ= e/ >> +-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/Makefi= le.am >> +--- libcdada-0.3.4.orig/test/Makefile.am 2021-01-15 00:01:59.000000000 +0= 100 >> ++++ 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 >> + >> + #Valgrind >> + if VALGRIND_ENABLED >> --=20 >> 2.30.1 >> >=20 --===============8752164546159262968==--