From mboxrd@z Thu Jan 1 00:00:00 1970 From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH] libtirpc: Convert from an addon to a core program - fixes Bug 13015 Date: Fri, 27 Jan 2023 15:30:02 +0100 Message-ID: <20230127143002.3442315-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2498589087752646176==" List-Id: --===============2498589087752646176== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable - libtirpc is required for lsof to work from CU172 onwards. rpc.h is no longe= r available from glibc. This would normally cause the lsof build to fail but libtirpc = as an addon is built before lsof and so is present in the build and lsof is linked to = it. When running lsof it fails as the linked libtirpc library is not present u= nless it has been installed as an addon. - This patch converts the libtirpc lfs from an addon to a core program and mo= ves the rootfile from the packages directory to the common directory. - Tested out on my vm testbed. With CU172 lsof fails to run due to the missin= g libtirpc With the build based on this patch installed lsof works normally again. - Disabled the static library build in the configure options and updated the = rootfile Tested-by: Adolf Belka Fixes: Bug#13015 Signed-off-by: Adolf Belka --- config/rootfiles/{packages =3D> common}/libtirpc | 1 - lfs/libtirpc | 18 +++++++----------- 2 files changed, 7 insertions(+), 12 deletions(-) rename config/rootfiles/{packages =3D> common}/libtirpc (98%) diff --git a/config/rootfiles/packages/libtirpc b/config/rootfiles/common/lib= tirpc similarity index 98% rename from config/rootfiles/packages/libtirpc rename to config/rootfiles/common/libtirpc index ed7f33242..7e85a0a25 100644 --- a/config/rootfiles/packages/libtirpc +++ b/config/rootfiles/common/libtirpc @@ -34,7 +34,6 @@ etc/netconfig #usr/include/tirpc/rpcsvc #usr/include/tirpc/rpcsvc/crypt.h #usr/include/tirpc/rpcsvc/crypt.x -#usr/lib/libtirpc.a #usr/lib/libtirpc.la #usr/lib/libtirpc.so usr/lib/libtirpc.so.3 diff --git a/lfs/libtirpc b/lfs/libtirpc index ac897f2eb..09d7b6555 100644 --- a/lfs/libtirpc +++ b/lfs/libtirpc @@ -1,7 +1,7 @@ ############################################################################= ### # = # # IPFire.org - A linux based firewall = # -# Copyright (C) 2007-2018 IPFire Team = # +# Copyright (C) 2007-2023 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 = # @@ -33,12 +33,6 @@ DL_FILE =3D $(THISAPP).tar.bz2 DL_FROM =3D $(URL_IPFIRE) DIR_APP =3D $(DIR_SRC)/$(THISAPP) TARGET =3D $(DIR_INFO)/$(THISAPP) -PROG =3D libtirpc -PAK_VER =3D 3 - -DEPS =3D - -SERVICES =3D =20 CFLAGS +=3D -fcommon =20 @@ -60,9 +54,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) =20 b2 : $(subst %,%_BLAKE2,$(objects)) =20 -dist: - @$(PAK) - ############################################################################= ### # Downloading, checking, b2sum ############################################################################= ### @@ -84,7 +75,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) $(UPDATE_AUTOMAKE) - cd $(DIR_APP) && ./configure --prefix=3D/usr --sysconfdir=3D/etc --disable-= gssapi --disable-ipv6 + cd $(DIR_APP) && ./configure \ + --prefix=3D/usr \ + --sysconfdir=3D/etc \ + --disable-gssapi \ + --disable-ipv6 \ + --disable-static cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) --=20 2.39.1 --===============2498589087752646176==--