galeb

чување 750a5595fd288d420cd8a9edd66fb7a6bf93b759
родитељ b9f9d7e6ba63b1c33ce2c7305a76ad82e01e5cd4
Аутор: Страхиња Радић <contact@strahinja.org>
Датум:   Thu, 28 Jul 2022 10:46:26 +0200

gzip -> pigz

Signed-off-by: Страхиња Радић <contact@strahinja.org>

Diffstat:
M
01-cross.sh
 | 
46
++++++++++++++++++++++++++++++++++++++--------
M
03-packages.sh
 | 
22
+++++++++++++++-------
M
lib/pkgs.tsv
 | 
2
+-

измењених датотека: 3, додавања: 54(+), брисања: 16(-)
diff --git a/01-cross.sh b/01-cross.sh
@@ -886,19 +886,49 @@ else
 fi
 end_substep
 
-begin_substep gzip-1.12
-if [ -x ${TL}/bin/gzip ]; then
-	msg info "%s exists, skipping %s" ${TL}/bin/gzip ${pkg}
+begin_substep zlib-ng-2.0.6
+if [ -e /${TLD}/lib/libz.so.1.2.11.zlib-ng ]; then
+	msg info "%s exists, skipping %s" /${TLD}/lib/libz.so.1.2.11.zlib-ng \
+		${pkg}
 else
-	extract_pkg ${G_SRC} ${pkg} ${pkg}.tar.xz
+	extract_pkg ${G_SRC} ${pkg} ${pkg}.tar.gz
 	(
 		cd_or_fail ${G_SRC}/${pkg}
-		run_configure . \
-			--prefix=/${TLD} \
-			--build=${G_HOST} \
-			--host=${G_TARGET}
+
+		apply_patch tools -Np1 -i \
+			${G_PAT}/zlib-ng-mlfs/configure-fix-interpreter.patch
+
+		AR=${G_TARGET}-ar \
+		CC=${G_TARGET}-gcc \
+		LD=${G_TARGET}-ld \
+		run_configure . --prefix=/${TLD} \
+			--libdir=/${TLD}/lib \
+			--zlib-compat \
+			--sharedlibdir=/${TLD}/lib
 		run_make ${JN}
 		run_make install
+		link_if_ne libz.so.1.2.11.zlib-ng /${TLD}/lib/libz.so.1.2.11
+	) || exit 1
+	remove_dir ${G_SRC}/${pkg}
+fi
+end_substep
+
+begin_substep pigz-2.7
+if [ -x ${TL}/bin/gzip ]; then
+	msg info "%s exists, skipping %s" ${TL}/bin/gzip ${pkg}
+else
+	extract_pkg ${G_SRC} ${pkg} ${pkg}.tar.gz
+	(
+		cd_or_fail ${G_SRC}/${pkg}
+		AR=${G_TARGET}-ar
+		CC=${G_TARGET}-gcc
+		LD=${G_TARGET}-ld
+		run_make AR=${G_TARGET}-ar CC=${G_TARGET}-gcc \
+			LD=${G_TARGET}-ld ${JN}
+		cp pigz /${TLD}/bin
+		ln -s pigz /${TLD}/bin/unpigz
+		ln -s pigz /${TLD}/bin/gzip
+		ln -s pigz /${TLD}/bin/gunzip
 	) || exit 1
 	remove_dir ${G_SRC}/${pkg}
 fi
diff --git a/03-packages.sh b/03-packages.sh
@@ -3057,13 +3057,13 @@ BUILD_CATMAN=1
 fi
 end_substep
 
-begin_substep gzip-1.12
+begin_substep pigz-2.7
 if [ -e /bin/gzip ]; then
 	msg info "%s exists, skipping %s" /bin/gzip ${pkg}
 elif [ -e ${G_SPKG}/${pkg}.tar.xz ]; then
 	unpack_pkg ${pkg} /
 else
-	extract_pkg ${G_SRC} ${pkg} ${pkg}.tar.xz
+	extract_pkg ${G_SRC} ${pkg} ${pkg}.tar.gz
 	(
 		cd_or_fail ${G_SRC}/${pkg}
 
@@ -3081,11 +3081,19 @@ mkpk_install()
 	DESTDIR=/build
 	export CFLAGS CXXFLAGS LDFLAGS DESTDIR
 
-	DEFS=NO_ASM gl_cv_func_fflush_stdin=yes \\
-	./configure --prefix=/
-
-	make ${JN} || exit 1
-	make install-strip
+	make CC=cc CFLAGS="\${CFLAGS}" LDFLAGS="\${LDFLAGS}" \\
+		${JN} || exit 1
+
+	mkdir -p ../build/bin ../build/share/man/man1 ../build/share/doc/${pkg}
+	cp pigz ../build/bin
+	ln -s pigz ../build/bin/unpigz
+	ln -s pigz ../build/bin/gzip
+	ln -s pigz ../build/bin/gunzip
+	cp pigz.1 ../build/share/man/man1
+	ln -s pigz.1 ../build/share/man/man1/unpigz.1
+	ln -s pigz.1 ../build/share/man/man1/gzip.1
+	ln -s pigz.1 ../build/share/man/man1/gunzip.1
+	cp pigz.pdf README ../build/share/doc/${pkg}
 }
 !
 		mkpk ${pkg}
diff --git a/lib/pkgs.tsv b/lib/pkgs.tsv
@@ -48,7 +48,6 @@ https://ftp.gnu.org/gnu/gmp/gmp-6.2.1.tar.xz	libgmp-6.2.1.tar.xz	0b82665c4a92fd2
 https://ftp.gnu.org/gnu/gperf/gperf-3.1.tar.gz		9e251c0a618ad0824b51117d5d9db87e
 https://ftp.gnu.org/gnu/grep/grep-3.7.tar.xz		7c9cca97fa18670a21e72638c3e1dabf
 https://ftp.gnu.org/gnu/groff/groff-1.22.4.tar.gz		08fb04335e2f5e73f23ea4c3adbf0c5f
-https://ftp.gnu.org/gnu/gzip/gzip-1.12.tar.xz		9608e4ac5f061b2a6479dc44e917a5db
 https://ftp.gnu.org/gnu/help2man/help2man-1.49.2.tar.xz		0372898fbf054140d62385a79c5855f4
 https://ftp.gnu.org/gnu/inetutils/inetutils-2.1.tar.xz		4e7676d1980e57c7df665e5c5c3c1047
 https://ftp.gnu.org/gnu/libtasn1/libtasn1-4.18.0.tar.gz		8203e72a2c0390515410b2ea2c032f04
@@ -136,3 +135,4 @@ https://www.kernel.org/pub/linux/utils/net/iproute2/iproute2-5.17.0.tar.xz		8ade
 https://www.leonerd.org.uk/code/libtermkey/libtermkey-0.22.tar.gz		08bf514d59660391c3a21b3977a16c8c
 https://www.nico.schottelius.org/software/gpm/archives/gpm-1.20.7.tar.bz2		bf84143905a6a903dbd4d4b911a2a2b8
 https://www.python.org/ftp/python/3.9.9/Python-3.9.9.tar.xz		11d12076311563252a995201248d17e5
+https://www.zlib.net/pigz/pigz-2.7.tar.gz		2d084221ba829d29f344305845a313f3