From mboxrd@z Thu Jan 1 00:00:00 1970 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> In-Reply-To: <20250115145750.1540971-1-michael.tremer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8697576569198048444==" List-Id: --===============8697576569198048444== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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) -- 2.39.5 --===============8697576569198048444==--