From patchwork Wed Jan 15 14:57:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 8419 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R11" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4YY8Px3PKJz3wv0 for ; Wed, 15 Jan 2025 15:03:17 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "E5" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4YY8Pt1jVPz4W6; Wed, 15 Jan 2025 15:03:14 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4YY8Pt18zXz32mH; Wed, 15 Jan 2025 15:03:14 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R11" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4YY8Pn73zXz32mH for ; Wed, 15 Jan 2025 15:03:09 +0000 (UTC) Received: from michael.haj.ipfire.org (michael.haj.ipfire.org [172.28.1.242]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) client-signature ECDSA (secp384r1)) (Client CN "michael.haj.ipfire.org", Issuer "E5" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4YY8Pm6JsVz4X5; Wed, 15 Jan 2025 15:03:08 +0000 (UTC) Received: by michael.haj.ipfire.org (Postfix, from userid 0) id 4YY8Pm3YBHzTgkt; Wed, 15 Jan 2025 15:03:08 +0000 (UTC) From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 3/6] zlib-ng: Install the compat library into /lib again Date: Wed, 15 Jan 2025 14:57:47 +0000 Message-Id: <20250115145750.1540971-3-michael.tremer@ipfire.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250115145750.1540971-1-michael.tremer@ipfire.org> References: <20250115145750.1540971-1-michael.tremer@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: 7EAF4W7L2PE5X7NFNIXAZO3VNYI2LVPF X-Message-ID-Hash: 7EAF4W7L2PE5X7NFNIXAZO3VNYI2LVPF X-MailFrom: root@michael.haj.ipfire.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Michael Tremer X-Mailman-Version: 3.3.8 Precedence: list List-Id: IPFire development talk Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: This is just to remain compatible with the older version which was also installed in /lib. Signed-off-by: Michael Tremer --- config/rootfiles/common/zlib-ng | 6 +++--- lfs/zlib-ng | 8 ++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/config/rootfiles/common/zlib-ng b/config/rootfiles/common/zlib-ng index 0e6cf18c5..be111d244 100644 --- a/config/rootfiles/common/zlib-ng +++ b/config/rootfiles/common/zlib-ng @@ -1,3 +1,6 @@ +#lib/libz.so +lib/libz.so.1 +lib/libz.so.1.3.1.zlib-ng #usr/include/zconf-ng.h #usr/include/zconf.h #usr/include/zlib-ng.h @@ -9,9 +12,6 @@ usr/lib/libz-ng.so.2 usr/lib/libz-ng.so.2.2.3 #usr/lib/libz.a -#usr/lib/libz.so -usr/lib/libz.so.1 -usr/lib/libz.so.1.3.1.zlib-ng #usr/lib/pkgconfig #usr/lib/pkgconfig/zlib-ng.pc #usr/lib/pkgconfig/zlib.pc diff --git a/lfs/zlib-ng b/lfs/zlib-ng index 5310c6051..7708d3c76 100644 --- a/lfs/zlib-ng +++ b/lfs/zlib-ng @@ -94,5 +94,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP)/build && make install cd $(DIR_APP)/compat && make install +ifneq "$(TOOLCHAIN)" "1" + mv -v /usr/lib/libz.so.1.3.1.zlib-ng /lib/libz.so.1.3.1.zlib-ng + ln -svf libz.so.1.3.1.zlib-ng /lib/libz.so.1 + ln -svf libz.so.1.3.1.zlib-ng /lib/libz.so + rm -vf /usr/lib/libz.so.1 + rm -vf /usr/lib/libz.so +endif + @rm -rf $(DIR_APP) @$(POSTBUILD)