Should be user

.github/workflows/build.yml

@@ -23,17 +23,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # x64=x86_64, evansport=i686, aarch64=armv8, armv7, hi3535=armv7l, 88f6281=armv5, qoriq=ppc
+        # x64=x86_64, evansport=x86, aarch64=armv8, armv7, 88f6281=armv5, ppc853x/qoriq=ppc
         # https://github.com/SynoCommunity/spksrc/wiki/Synology-and-SynoCommunity-Package-Architectures
-        arch: [noarch, x64-6.1, evansport-6.1, aarch64-6.1, armv7-6.1, hi3535-6.1, 88f6281-6.1, qoriq-6.1]
+        arch: [noarch, x64-6.1, evansport-6.1, aarch64-6.1, armv7-6.1, armv7-1.2, 88f6281-6.1, qoriq-6.1, ppc853x-5.2]
 
     steps:
       - name: Cache toolchains
         uses: actions/cache@v1
         with:
-          path: toolchain
-          key: toolchain-${{ matrix.arch }}-v2
-          restore-keys: toolchain-${{ matrix.arch }}
+          path: toolchains
+          key: toolchains-${{ matrix.arch }}-v2
+          restore-keys: toolchains-${{ matrix.arch }}
 
       - name: Checkout repository
         uses: actions/checkout@v2

.gitignore

@@ -5,8 +5,8 @@ cross/*/work*
 kernel/*/work*
 spk/*/work*
 diyspk/*/work*
-toolchain/*/work*
-toolchain/*/*_done
+toolchains/*/work*
+toolchains/*/*_done
 toolkit/*/work*
 local.mk
 *.DS_Store

Dockerfile

@@ -45,7 +45,6 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
 		lzip \
 		mercurial \
 		ncurses-dev \
-		ninja-build \
 		php \
 		pkg-config \
 		python3 \

Makefile

@@ -1,5 +1,5 @@
 
-AVAILABLE_TCS = $(notdir $(wildcard toolchain/syno-*))
+AVAILABLE_TCS = $(notdir $(wildcard toolchains/syno-*))
 AVAILABLE_ARCHS = $(notdir $(subst syno-,/,$(AVAILABLE_TCS)))
 SUPPORTED_SPKS = $(sort $(patsubst spk/%/Makefile,%,$(wildcard spk/*/Makefile)))
 
@@ -26,7 +26,7 @@ native-clean:
 	done
 
 toolchain-clean:
-	@for tc in $(dir $(wildcard toolchain/*/Makefile)) ; \
+	@for tc in $(dir $(wildcard toolchains/*/Makefile)) ; \
 	do \
 	    $(MAKE) -C $${tc} clean ; \
 	done
@@ -91,7 +91,7 @@ endef
 $(foreach arch,$(AVAILABLE_ARCHS),$(foreach spk,$(SUPPORTED_SPKS),$(eval $(call SPK_ARCH_template,$(spk),$(arch)))))
 
 prepare: downloads
-	@for tc in $(dir $(wildcard toolchain/*/Makefile)) ; \
+	@for tc in $(dir $(wildcard toolchains/*/Makefile)) ; \
 	do \
 	    $(MAKE) -C $${tc} ; \
 	done
@@ -115,7 +115,7 @@ native-digests:
 	done
 
 toolchain-digests:
-	@for tc in $(dir $(wildcard toolchain/*/Makefile)) ; \
+	@for tc in $(dir $(wildcard toolchains/*/Makefile)) ; \
 	do \
 	    $(MAKE) -C $${tc} digests ; \
 	done
@@ -145,7 +145,7 @@ toolchains: $(addprefix toolchain-,$(AVAILABLE_ARCHS))
 kernel-modules: $(addprefix kernel-,$(AVAILABLE_ARCHS))
 
 toolchain-%:
-	-@cd toolchain/syno-$*/ && MAKEFLAGS= $(MAKE)
+	-@cd toolchains/syno-$*/ && MAKEFLAGS= $(MAKE)
 
 kernel-%:
 	-@cd kernel/syno-$*/ && MAKEFLAGS= $(MAKE)

README.rst

@@ -26,12 +26,8 @@ A virtual machine based on an 64-bit version of Debian 10 stable OS is recommend
 * Install the requirements (in sync with Dockerfile)::
 
     sudo dpkg --add-architecture i386 && sudo apt-get update
-    sudo apt udpate
-    sudo apt install autogen automake bc bison build-essential check cmake curl cython debootstrap ed expect flex g++-multilib gawk gettext git gperf imagemagick intltool jq libbz2-dev libc6-i386 libcppunit-dev libffi-dev libgc-dev libgmp3-dev libltdl-dev libmount-dev libncurses-dev libpcre3-dev libssl-dev libtool libunistring-dev lzip mercurial ncurses-dev ninja-build php pkg-config python3 python3-distutils rename scons subversion swig texinfo unzip xmlto zlib1g-dev
-    wget https://bootstrap.pypa.io/get-pip.py -O - | sudo python2
-    sudo pip2 install wheel httpie
-    wget https://bootstrap.pypa.io/get-pip.py -O - | sudo python3
-    sudo pip3 install meson==0.56.0
+    sudo apt install autogen automake bc bison build-essential check cmake curl cython debootstrap ed expect flex g++-multilib gawk gettext git gperf imagemagick intltool jq libbz2-dev libc6-i386 libcppunit-dev libffi-dev libgc-dev libgmp3-dev libltdl-dev libmount-dev libncurses-dev libpcre3-dev libssl-dev libtool libunistring-dev lzip mercurial ncurses-dev php pkg-config python3 python3-distutils rename scons subversion swig texinfo unzip xmlto zlib1g-dev
+    sudo pip install -U setuptools pip wheel httpie
 
 * You may need to install some packages from testing like autoconf. Read about Apt-Pinning to know how to do that.
 * Some older toolchains may require 32-bit development versions of packages, e.g. `zlib1g-dev:i386`

cross/bison/Makefile

@@ -12,10 +12,7 @@ COMMENT  = General-purpose parser generator
 LICENSE  = GPLv3
 
 GNU_CONFIGURE = 1
-
-include ../../mk/spksrc.archs.mk
-
-ifeq ($(findstring $(ARCH),$(OLD_PCC_ARCHS)),$(ARCH))
+ifeq ($(findstring $(ARCH), powerpc ppc824x ppc853x ppc854x),$(ARCH))
 CONFIGURE_ARGS = gl_cv_func_signbit_gcc=no
 endif
 

cross/boost/Makefile

@@ -47,7 +47,7 @@ endif
 include ../../mk/spksrc.cross-cc.mk
 
 ADDRESS_MODEL = 32
-ifeq ($(findstring $(ARCH),$(x64_ARCHS) $(ARMv8_ARCHS)),$(ARCH))
+ifeq ($(findstring $(ARCH),$(x64_ARCHES) $(ARM8_ARCHES)),$(ARCH))
 ADDRESS_MODEL = 64
 endif
 

cross/chromaprint/Makefile

@@ -12,7 +12,7 @@ LICENSE  = LGPL2.1+
 OPTIONAL_DEPENDS = cross/ffmpeg
 
 # compiler too old
-UNSUPPORTED_ARCHS = $(ARMv5_ARCHS) $(OLD_PPC_ARCHS)
+UNSUPPORTED_ARCHS = $(ARM5_ARCHES) powerpc ppc824x ppc853x ppc854x
 
 ifneq ($(wildcard $(FFMPEG_DIR)),)
 CMAKE_RPATH = /var/packages/ffmpeg/target/lib

cross/davfs2/Makefile

@@ -16,9 +16,9 @@ GNU_CONFIGURE = 1
 CONFIGURE_ARGS = --with-neon=$(STAGING_INSTALL_PREFIX)
 CONFIGURE_ARGS += ac_cv_func_malloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes
 
-include ../../mk/spksrc.archs.mk
+include ../../mk/spksrc.common.mk
 
-ifeq ($(findstring $(ARCH),$(ARMv5_ARCHS) $(ARMv7L_ARCHS) $(OLD_PPC_ARCHS)),$(ARCH))
+ifeq ($(findstring $(ARCH),$(ARM5_ARCHES) ppc853x hi3535),$(ARCH))
 # patch Makefile.in for gcc -lt 4.9
 # see https://savannah.nongnu.org/bugs/?51004
 POST_CONFIGURE_TARGET = davfs2_post_configure

cross/dnscrypt-proxy/Makefile

@@ -8,6 +8,8 @@ EXTRACT_PATH = $(WORK_DIR)/src/github.com/$(PKG_NAME)
 PKG_DIR =  $(PKG_NAME)-$(PKG_VERS)
 
 DEPENDS = native/go
+UNSUPPORTED_ARCHS = $(PPC_ARCHES)
+GENERIC_ARCHS = ARM7
 
 HOMEPAGE = https://github.com/jedisct1/dnscrypt-proxy
 COMMENT  = A flexible DNS proxy, with support for modern encrypted DNS protocols such as DNSCrypt v2 and DNS-over-HTTP/2.

cross/e2fsprogs/Makefile

@@ -14,10 +14,10 @@ LICENSE  = GPL
 GNU_CONFIGURE = 1
 CONFIGURE_ARGS = --enable-elf-shlibs
 
-include ../../mk/spksrc.archs.mk
+include ../../mk/spksrc.common.mk
 
 # This is more a toolchain than an arch limitation
-ifeq ($(findstring $(ARCH),$(OLD_PPC_ARCHS)),$(ARCH))
+ifeq ($(findstring $(ARCH),ppc853x),$(ARCH))
 CONFIGURE_ARGS += --disable-defrag
 PLIST_TRANSFORM = sed -e '/bin:sbin\/e4defrag/d'
 endif

cross/erlang/Makefile

@@ -11,20 +11,19 @@ HOMEPAGE = https://www.erlang.org
 COMMENT  = Erlang is a programming language used to build massively scalable soft real-time systems with requirements on high availability.
 LICENSE  = Erlang Public License
 
-include ../../mk/spksrc.archs.mk
+# Get arch-defs now
+include ../../mk/spksrc.cross-cc.mk
 
 GNU_CONFIGURE = 1
 CONFIGURE_ARGS += --with-ssl=$(STAGING_INSTALL_PREFIX) erl_xcomp_sysroot=$(INSTALL_DIR)
-ifeq ($(findstring $(ARCH),$(ARMv5_ARCHS)),$(ARCH))
+ifeq ($(findstring $(ARCH), $(ARM5_ARCHES)),$(ARCH))
 CONFIGURE_ARGS += --disable-smp-require-native-atomics
 endif
 
 INSTALL_TARGET = erlang_install
 
 ENV += PATH=$(WORK_DIR)/../../../native/$(PKG_NAME)/work-native/install/usr/local/bin:$$PATH
 
-include ../../mk/spksrc.cross-cc.mk
-
 .PHONY: erlang_install
 erlang_install:
 	$(RUN) make install DESTDIR=$(INSTALL_DIR) INSTALL_PREFIX=

cross/fdupes/Makefile

@@ -1,19 +1,14 @@
 PKG_NAME = fdupes
-PKG_VERS = 2.1.2
-PKG_EXT = tar.gz
+PKG_VERS = 1.51
+PKG_EXT = zip
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
-PKG_DIST_SITE = https://github.com/adrianlopezroche/$(PKG_NAME)/releases/download/v$(PKG_VERS)
-PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
-
-DEPENDS = cross/ncursesw cross/pcre2
+PKG_DIST_SITE = https://github.com/adrianlopezroche/fdupes/archive/
+PKG_DIR = $(PKG_NAME)-$(PKG_NAME)-$(PKG_VERS)
 
 HOMEPAGE = https://github.com/adrianlopezroche/fdupes
 COMMENT  = FDUPES is a program for identifying or deleting duplicate files residing within specified directories.
 LICENSE  = MIT
 
-# fdupes needs pcre2-32
-ENV += PCRE2_CLI_FULL=1 
-
-GNU_CONFIGURE = 1
+CONFIGURE_TARGET = none
 
 include ../../mk/spksrc.cross-cc.mk

cross/fdupes/digests

@@ -1,3 +1,3 @@
-fdupes-2.1.2.tar.gz SHA1 f28e91729b867bb28d18d05efbefad2c26df0e23
-fdupes-2.1.2.tar.gz SHA256 cd5cb53b6d898cf20f19b57b81114a5b263cc1149cd0da3104578b083b2837bd
-fdupes-2.1.2.tar.gz MD5 03fa46275d8b04b0baea80ebde973926
+fdupes-1.51.zip SHA1 ea3b5fd7aa59c25a79e544777645a4ba63c608b7
+fdupes-1.51.zip SHA256 7b5bacf0519d0097041156dd46b707917c50fb980802af7ccc303d0ae250ba55
+fdupes-1.51.zip MD5 f1e12bda45245845d47d2f58e3c7344f

cross/ffmpeg/Makefile

@@ -84,39 +84,39 @@ DEPENDS += cross/shine
 CONFIGURE_ARGS += --enable-libshine
 endif
 
-ifeq ($(findstring $(ARCH),alpine comcerto2k monaco $(ARMv8_ARCHS) $(i686_ARCHS) $(x64_ARCHS)),$(ARCH))
+ifeq ($(findstring $(ARCH),alpine comcerto2k monaco $(ARM8_ARCHES) $(x86_ARCHES) $(x64_ARCHES)),$(ARCH))
 DEPENDS += cross/libaom
 CONFIGURE_ARGS += --enable-libaom
 endif
 endif
 
 # Add SVT-AV1 codec to supported ARCH
 # Patch for support from: https://github.com/OpenVisualCloud/SVT-AV1/tree/master/ffmpeg_plugin
-ifeq ($(findstring $(ARCH),alpine comcerto2k monaco $(ARMv8_ARCHS) $(x64_ARCHS)),$(ARCH))
+ifeq ($(findstring $(ARCH),alpine comcerto2k monaco $(ARM8_ARCHES) $(x64_ARCHES)),$(ARCH))
 DEPENDS += cross/svt-av1
 CONFIGURE_ARGS += --enable-libsvtav1
 endif
 
-ifeq ($(findstring $(ARCH),$(ARMv5_ARCHS)),$(ARCH))
+ifeq ($(findstring $(ARCH),$(ARM5_ARCHES)),$(ARCH))
 CONFIGURE_ARGS += --arch=arm --disable-neon --disable-yasm --disable-asm
 endif
 
-ifeq ($(findstring $(ARCH),$(ARMv7_ARCHS) $(ARMv7L_ARCHS)),$(ARCH))
+ifeq ($(findstring $(ARCH),$(ARM7_ARCHES)),$(ARCH))
 CONFIGURE_ARGS += --arch=arm --enable-neon --enable-thumb --disable-armv6 --disable-armv6t2 --disable-vfp --disable-armv5te --disable-yasm --disable-asm
 ifneq ($(findstring $(ARCH),alpine),$(ARCH))
 CONFIGURE_ARGS += --extra-cflags=-DSYNO_ALPINE_NEON
 endif
 endif
 
-ifeq ($(findstring $(ARCH),$(ARMv8_ARCHS)),$(ARCH))
+ifeq ($(findstring $(ARCH),$(ARM8_ARCHES)),$(ARCH))
 CONFIGURE_ARGS += --arch=arm64 --enable-neon --enable-thumb --disable-yasm --disable-asm
 endif
 
-# only evansport is in i686 archs - no other x86 arch is supported
-ifeq ($(findstring $(ARCH),$(i686_ARCHS)),$(ARCH))
+ifeq ($(findstring $(ARCH),$(x86_ARCHES)),$(ARCH))
 DEPENDS += native/nasm
 ENV += PATH=$(NASM_PATH):$$PATH
 
+ifeq ($(findstring $(ARCH),'evansport'),$(ARCH))
 DEPENDS += cross/json-c
 CONFIGURE_ARGS += --arch=x86 --cpu=atom
 CONFIGURE_ARGS += --disable-x86asm
@@ -138,15 +138,18 @@ CONFIGURE_ARGS += --disable-decoder=wmv3_smd
 #CONFIGURE_ARGS += --extra-cflags=-DSYNO_EVANSPORT_SMD
 #CONFIGURE_ARGS += --enable-libh264_smd --enable-smd
 
+else
+CONFIGURE_ARGS += --arch=i386
+endif
 endif
 
-ifeq ($(findstring $(ARCH),$(x64_ARCHS)),$(ARCH))
+ifeq ($(findstring $(ARCH),$(x64_ARCHES)),$(ARCH))
 DEPENDS += native/nasm cross/libva cross/libva-utils cross/intel-vaapi-driver cross/intel-media-driver cross/intel-media-sdk cross/svt-hevc
 ENV += PATH=$(NASM_PATH):$$PATH
 CONFIGURE_ARGS += --arch=x86_64 --enable-vaapi --enable-libmfx --enable-libsvthevc
 endif
 
-ifeq ($(findstring $(ARCH),$(PPC_ARCHS)),$(ARCH))
+ifeq ($(findstring $(ARCH),$(PPC_ARCHES)),$(ARCH))
 DEPENDS += native/nasm
 ENV += PATH=$(NASM_PATH):$$PATH
 CONFIGURE_ARGS += --arch=ppc

cross/flac/Makefile

@@ -20,7 +20,7 @@ CONFIGURE_ARGS = --disable-thorough-tests --disable-doxygen-docs --disable-oggte
 
 include ../../mk/spksrc.cross-cc.mk
 
-ifeq ($(findstring $(ARCH),$(PPC_ARCHS)),$(ARCH))
-# avoid error: AltiVec and SPE instructions cannot coexist
+ifeq ($(findstring $(ARCH),$(PPC_ARCHES)),$(ARCH))
 CONFIGURE_ARGS += --disable-altivec
 endif
+

cross/gensio/Makefile

@@ -11,7 +11,7 @@ COMMENT  = gensio - General Stream I/O
 LICENSE  = GPLv2
 
 # qoriq is the only PPC arch that is supported
-UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS)
+UNSUPPORTED_ARCHS = powerpc ppc824x ppc853x ppc854x
 
 DEPENDS = cross/openssl
 
@@ -22,7 +22,7 @@ CONFIGURE_ARGS  = --with-python=no --with-swig=no
 
 include ../../mk/spksrc.cross-cc.mk
 
-ifeq ($(findstring $(ARCH),$(PPC_ARCHS)),$(ARCH))
+ifeq ($(findstring $(ARCH), $(PPC_ARCHES)),$(ARCH))
 # archs/toolchains without compatible RS485 support (linux serial.h)
 CONFIGURE_ARGS += ac_cv_have_decl_TIOCSRS485=no
 endif

cross/glib/Makefile

@@ -1,24 +1,49 @@
 PKG_NAME = glib
-PKG_VERS = 2.62.6
-PKG_SHORT_VERS = $(word 1,$(subst ., ,$(PKG_VERS))).$(word 2,$(subst ., ,$(PKG_VERS)))
+PKG_SHORT_VERS = 2.58
+PKG_VERS = $(PKG_SHORT_VERS).3
 PKG_EXT = tar.xz
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://ftp.gnome.org/pub/GNOME/sources/$(PKG_NAME)/$(PKG_SHORT_VERS)
 
-DEPENDS = cross/libffi cross/pcre cross/zlib
+DEPENDS = native/glib cross/libffi cross/pcre cross/zlib
 
 HOMEPAGE = https://developer.gnome.org/glib/
 COMMENT  = General-purpose utility library
 LICENSE  = GPLv2
 
-UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS)
+GNU_CONFIGURE = 1
+CONFIGURE_ARGS = --disable-man --disable-libmount --enable-shared=yes --enable-static=no
+CONFIGURE_ARGS += glib_cv_long_long_format=ll glib_cv_stack_grows=no glib_cv_uscore=no ac_cv_func_posix_getpwuid_r=yes ac_cv_func_posix_getgrgid_r=yes
+CONFIGURE_ARGS += GLIB_GENMARSHAL=$(WORK_DIR)/../../../native/glib/work-native/$(PKG_DIR)/gobject/glib-genmarshal
+CONFIGURE_ARGS += GLIB_COMPILE_SCHEMAS=$(WORK_DIR)/../../../native/glib/work-native/$(PKG_DIR)/gio/glib-compile-schemas
+CONFIGURE_ARGS += GLIB_COMPILE_RESOURCES=$(WORK_DIR)/../../../native/glib/work-native/$(PKG_DIR)/gio/glib-compile-resources
 
-# https://developer.gnome.org/glib/
-# https://developer.gnome.org/glib/stable/glib-building.html
-# 2.62.6, 2.63.3-OK, 2.63.4-ERROR
-CONFIGURE_ARGS += -Dman=false -Dlibmount=false -Ddefault_library=shared -Dselinux=disabled
-# 2.63.5, 2.66.3
-#CONFIGURE_ARGS += -Dman=false -Dlibmount=disabled -Ddefault_library=shared -Dselinux=disabled
+ADDITIONAL_CFLAGS = -Wno-unused-value
 
-include ../../mk/spksrc.cross-meson.mk
+PRE_CONFIGURE_TARGET = glib_pre_configure
+
+include ../../mk/spksrc.cross-cc.mk
+
+ifeq ($(findstring $(ARCH),$(PPC_ARCHES)),$(ARCH))
+CONFIGURE_ARGS += --host=ppc-linux
+endif
+
+ifeq ($(findstring $(ARCH),$(ARM_ARCHES)),$(ARCH))
+CONFIGURE_ARGS += --host=arm-linux
+endif
+
+ifeq ($(findstring $(ARCH), $(x64_ARCHES)),$(ARCH))
+CONFIGURE_ARGS += --host=x86_64-linux-gnu
+endif
+
+ifeq ($(findstring $(ARCH), $(x86_ARCHES)),$(ARCH))
+CONFIGURE_ARGS += --host=i686-linux-gnu
+endif
+
+.PHONY: glib_pre_configure
+
+glib_pre_configure: 
+	# force autogen to first use internal pcre instead of provided to prevent
+	# build failure.  Subsequent default configure will superseed this afterwards
+	$(RUN) ./autogen.sh --with-pcre $(CONFIGURE_ARGS)