Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

synocli-file: add pixz #6075

Closed
wants to merge 47 commits into from
Closed
Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
ef9e17d
new package libarchive
dotysan Apr 15, 2024
8a10f99
First pass at spk build
dotysan Apr 15, 2024
cc8bb2d
libarchive is not a pkg but just a depdendency
dotysan Apr 16, 2024
d5a0380
new DIY package: pixz
dotysan Apr 16, 2024
65cb7eb
Disable iconv for libarchive
dotysan Apr 16, 2024
9e4e331
Merge branch 'libarchive' into pixz
dotysan Apr 16, 2024
59adc30
Add pixz to synocli-file
dotysan Apr 16, 2024
df1e911
Proper build env dependency for libarchive
dotysan Apr 17, 2024
9367225
pixz: fix undefined reference to rpl_malloc
dotysan Apr 17, 2024
d074b5d
libarchive: whoops must include native dependency
dotysan Apr 17, 2024
5b32915
pixz: bump rev; ready for prime time
dotysan Apr 17, 2024
faec11c
Update cross/libarchive/PLIST
dotysan Apr 19, 2024
cedc12e
add pixz
dotysan Apr 19, 2024
8a7ebfc
misc. updates (#6080)
hgy59 Apr 24, 2024
c3a0be5
python310: update to v3.10.14 (#6082)
hgy59 Apr 24, 2024
3026823
update git and gitea (#6092)
hgy59 May 5, 2024
b896cd2
octoprint: update to v1.10.1 (#6097)
hgy59 May 15, 2024
18f68fb
armv5 rust version frozen for no-atomic support (#6108)
th0ma7 May 30, 2024
986c281
go: update to v1.22 (#6094)
hgy59 May 31, 2024
5eccb90
Update SABnzbd to 4.3.2 (#6107)
Safihre May 31, 2024
3174f7b
rust-qoriq: Migrate from native to toolchain/syno-qoriq-6.2.4-rust (#…
th0ma7 Jun 4, 2024
61f7d56
c-ares: update and fix download link (#6128)
hgy59 Jun 7, 2024
d946e75
openssl3: update to v3.1.6 (#6129)
hgy59 Jun 7, 2024
602f1d9
Update synocli-monitor (#6127)
hgy59 Jun 8, 2024
c1a463a
ownCloud: Update to v10.14.0 (#6132)
mreid-tt Jun 9, 2024
2b2958e
fix qoriq rust with github build (#6133)
hgy59 Jun 11, 2024
c5f5325
Noarch publish fix (#6134)
th0ma7 Jun 11, 2024
f57435a
synocli-devel: fix autoconf (#6015) (#6079)
hgy59 Jun 12, 2024
b19c77d
native/go: update to v1.22.4 (#6141)
hgy59 Jun 13, 2024
9955fd3
cloudflared: update to 2024.6.0 (#6140)
hgy59 Jun 13, 2024
51c7dd3
synocli-devel: fix build of gdb for OLD_PPC_ARCHS (#6142)
hgy59 Jun 13, 2024
3d05cc5
Update Gitea to v1.22.0 (#6104)
wkobiela Jun 14, 2024
a0aa33f
update image and font libraries (#6143)
hgy59 Jun 15, 2024
dec856f
kernel.mk: Fix regression build issue since #6002 (#6089)
th0ma7 Jun 16, 2024
488bab2
new package libarchive
dotysan Apr 15, 2024
439e450
First pass at spk build
dotysan Apr 15, 2024
9fd37a5
libarchive is not a pkg but just a depdendency
dotysan Apr 16, 2024
2185371
new DIY package: pixz
dotysan Apr 16, 2024
71c4152
Disable iconv for libarchive
dotysan Apr 16, 2024
360f837
Add pixz to synocli-file
dotysan Apr 16, 2024
3381f2a
Proper build env dependency for libarchive
dotysan Apr 17, 2024
60b09ee
pixz: fix undefined reference to rpl_malloc
dotysan Apr 17, 2024
a4a4df6
libarchive: whoops must include native dependency
dotysan Apr 17, 2024
7d52db3
pixz: bump rev; ready for prime time
dotysan Apr 17, 2024
cc8d015
Update cross/libarchive/PLIST
dotysan Apr 19, 2024
47e02a8
add pixz
dotysan Apr 19, 2024
43a4cf5
Merge branch 'pixz' of github.com:dotysan/spksrc into pixz
dotysan Jun 16, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions cross/libarchive/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
PKG_NAME = libarchive
PKG_VERS = 3.7.3

PKG_DIST_SITE = https://github.com/libarchive/$(PKG_NAME)/releases/download/v$(PKG_VERS)
PKG_EXT = tar.xz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)

COMMENT = Multi-format archive and compression library
HOMEPAGE = https://www.libarchive.org/
LICENSE = 3-Clause BSD

BUILD_DEPENDS = native/autoconf
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It works without native/autoconf.
and if you do not add the native/autoconf binary folder to the path, the build can't find it

Suggested change
BUILD_DEPENDS = native/autoconf

DEPENDS = cross/openssl3

GNU_CONFIGURE = 1
CONFIGURE_ARGS += --without-iconv

include ../../mk/spksrc.cross-cc.mk
3 changes: 3 additions & 0 deletions cross/libarchive/PLIST
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
lib:lib/libarchive.so
lib:lib/libarchive.so.13
dotysan marked this conversation as resolved.
Show resolved Hide resolved
lib:lib/libarchive.so.13.7.3
3 changes: 3 additions & 0 deletions cross/libarchive/digests
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
libarchive-3.7.3.tar.xz SHA1 67d722171cc3552ecd7fccd05934e8de4596c02b
libarchive-3.7.3.tar.xz SHA256 63e7a7174638fc7d6b79b4c8b0ad954e0f4f45abe7239c1ecb200232aa9a43d2
libarchive-3.7.3.tar.xz MD5 b60683739a16ff6f00f32aa3516402ed
39 changes: 39 additions & 0 deletions cross/pixz/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
PKG_NAME = pixz
PKG_REPO = https://github.com/vasi/$(PKG_NAME)

PKG_VERS = 1.0.7
# above will break cross-compile https://github.com/vasi/pixz/issues/67
# - patch: https://github.com/vasi/pixz/commit/4ddfdca8416a008819d08d14d6a6f4796aef7857
# or should we pull from master? no release in almost 4 years
#PKG_VERS = d0e61be32968b2c6a532612b4080dee656ce5db6
#PKG_DIST_SITE = $(PKG_REPO)/archive
#PKG_EXT = tar.gz
#PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT)

PKG_DIST_SITE = $(PKG_REPO)/releases/download/v$(PKG_VERS)
PKG_EXT = tar.xz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)

PKG_DIR = $(PKG_NAME)-$(PKG_VERS)

COMMENT = Parallel, indexed xz compressor
HOMEPAGE = $(PKG_REPO)
LICENSE = FreeBSD 2-Clause "Simplified"

DEPENDS = cross/xz
DEPENDS += cross/libarchive

PATCHES_LEVEL = 1

PRE_CONFIGURE_TARGET = pixz_pre_configure
GNU_CONFIGURE = 1
CONFIGURE_ARGS += --without-manpage

include ../../mk/spksrc.cross-cc.mk

.PHONY: pixz_pre_configure
# must rebuild configure after patching configure.ac
pixz_pre_configure:
@$(RUN) autoreconf -fi
# below only in gh/source archive; not release
# @$(RUN) ./autogen.sh
1 change: 1 addition & 0 deletions cross/pixz/PLIST
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bin:bin/pixz
3 changes: 3 additions & 0 deletions cross/pixz/digests
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
pixz-1.0.7.tar.xz SHA1 56238b6a53f4b0ddfcce8d4e4655e13035bdbe5a
pixz-1.0.7.tar.xz SHA256 e5e32c6eb0bf112b98e74a5da8fb63b9f2cae71800f599d97ce540e150c8ddc5
pixz-1.0.7.tar.xz MD5 d49ed375b176590ed995d109251fef3d
31 changes: 31 additions & 0 deletions cross/pixz/patches/0001-configure.ac-replace-AC_CHECK_FILE.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
From 4ddfdca8416a008819d08d14d6a6f4796aef7857 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <[email protected]>
Date: Mon, 12 Oct 2020 22:40:13 +0200
Subject: [PATCH] configure.ac: replace AC_CHECK_FILE

AC_CHECK_FILE can't be used when cross-compiling so replace it by a
simple test -f

Signed-off-by: Fabrice Fontaine <[email protected]>
---
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0a19a2a..9773993 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,8 +16,8 @@ AC_PROG_CC_STDC
# Check for a2x only if the man page is missing, i.e. we are building from git. The release tarballs
# are set up to include the man pages. This way, only people creating tarballs via `make dist` and
# people building from git need a2x as a dependency.
-AC_CHECK_FILE(
- [src/pixz.1],
+AS_IF(
+ [test -f src/pixz.1],
[],
[
AC_ARG_WITH(
--
2.43.0

17 changes: 17 additions & 0 deletions cross/pixz/patches/0002-undefined-references.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
Fix undefined reference to `rpl_malloc' when cross-compiling.

diff -wpurN pixz-1.0.7/configure.ac pixz-1.0.7.patched/configure.ac
--- pixz-1.0.7/configure.ac 2024-04-17 12:41:01.040203638 -0700
+++ pixz-1.0.7.patched/configure.ac 2024-04-17 12:41:49.224434589 -0700
@@ -65,10 +65,8 @@ AC_TYPE_UINT8_T
AC_SYS_LARGEFILE

# Checks for library functions.
-AC_FUNC_MALLOC
-AC_FUNC_REALLOC
AC_FUNC_STRTOD
-AC_CHECK_FUNCS([memchr memmove memset strerror strtol])
+AC_CHECK_FUNCS([malloc realloc memchr memmove memset strerror strtol])
AC_CHECK_HEADER([sys/endian.h],
[
AC_CHECK_DECLS([htole64, le64toh], [], [], [
17 changes: 17 additions & 0 deletions diyspk/pixz/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
SPK_NAME = pixz
SPK_VERS = 1.0.7
SPK_REV = 1
#SPK_ICON = src/pixz.png

#DISPLAY_NAME = pixz
DESCRIPTION = Parallel, indexed xz compressor
HOMEPAGE = https://github.com/vasi/$(SPK_NAME)
LICENSE = 2-Clause BSD
MAINTAINER = dotysan

DEPENDS = cross/$(SPK_NAME)

STARTABLE = no
SPK_COMMANDS = bin/$(SPK_NAME)

include ../../mk/spksrc.spk.mk
16 changes: 16 additions & 0 deletions native/autoconf/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
PKG_NAME = autoconf
PKG_VERS = 2.72
PKG_EXT = tar.xz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://ftp.gnu.org/gnu/autoconf/
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)

DEPENDS = cross/m4

HOMEPAGE = https://www.gnu.org/software/autoconf/
COMMENT = Autoconf is an extensible package of M4 macros that produce shell scripts to automatically configure software source code packages.
LICENSE = GPLv2

GNU_CONFIGURE = 1

include ../../mk/spksrc.native-cc.mk
3 changes: 3 additions & 0 deletions native/autoconf/digests
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
autoconf-2.72.tar.xz SHA1 1d082d999ff4506ec8f92c6ecb9732546f5204fb
autoconf-2.72.tar.xz SHA256 ba885c1319578d6c94d46e9b0dceb4014caafe2490e437a0dbca3f270a223f5a
autoconf-2.72.tar.xz MD5 1be79f7106ab6767f18391c5e22be701
4 changes: 3 additions & 1 deletion spk/synocli-file/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
SPK_NAME = synocli-file
SPK_VERS = 3.3
SPK_REV = 23
SPK_REV = 24
SPK_ICON = src/synocli-file.png

# cross/libblkid must be built before cross/e2fsprogs or cross/libext2fs
Expand All @@ -13,6 +13,7 @@ DEPENDS = cross/less cross/tree cross/ncdu cross/jdupes cross/rhash cross/nano
DEPENDS += cross/mc cross/pcre2 cross/fdupes cross/zstd
DEPENDS += cross/detox
DEPENDS += cross/lzip cross/plzip
DEPENDS += cross/pixz
DEPENDS += cross/mg
DEPENDS += cross/jupp
DEPENDS += cross/iconv
Expand Down Expand Up @@ -118,6 +119,7 @@ SPK_COMMANDS += bin/pcre2grep bin/pcre2test
SPK_COMMANDS += bin/rmlint
SPK_COMMANDS += bin/zstd bin/unzstd bin/zstdcat bin/zstdmt bin/zstdgrep bin/zstdless
SPK_COMMANDS += bin/lzip bin/plzip
SPK_COMMANDS += bin/pixz
SPK_COMMANDS += bin/fdupes
SPK_COMMANDS += bin/micro
SPK_COMMANDS += bin/fzf
Expand Down