Update framework archs

.github/workflows/build.yml

@@ -23,17 +23,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # x64=x86_64, evansport=x86, aarch64=armv8, armv7, 88f6281=armv5, ppc853x/qoriq=ppc
+        # x64=x86_64, evansport=i686, aarch64=armv8, armv7, hi3535=armv7l, 88f6281=armv5, 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, armv7-1.2, 88f6281-6.1, qoriq-6.1, ppc853x-5.2]
+        arch: [noarch, x64-6.1, evansport-6.1, aarch64-6.1, armv7-6.1, hi3535-6.1, 88f6281-6.1, qoriq-6.1]
 
     steps:
       - name: Cache toolchains
         uses: actions/cache@v1
         with:
-          path: toolchains
-          key: toolchains-${{ matrix.arch }}-v2
-          restore-keys: toolchains-${{ matrix.arch }}
+          path: toolchain
+          key: toolchain-${{ matrix.arch }}-v2
+          restore-keys: toolchain-${{ matrix.arch }}
 
       - name: Checkout repository
         uses: actions/checkout@v2

Makefile

@@ -1,5 +1,5 @@
 
-AVAILABLE_TCS = $(notdir $(wildcard toolchains/syno-*))
+AVAILABLE_TCS = $(notdir $(wildcard toolchain/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 toolchains/*/Makefile)) ; \
+	@for tc in $(dir $(wildcard toolchain/*/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 toolchains/*/Makefile)) ; \
+	@for tc in $(dir $(wildcard toolchain/*/Makefile)) ; \
 	do \
 	    $(MAKE) -C $${tc} ; \
 	done
@@ -115,7 +115,7 @@ native-digests:
 	done
 
 toolchain-digests:
-	@for tc in $(dir $(wildcard toolchains/*/Makefile)) ; \
+	@for tc in $(dir $(wildcard toolchain/*/Makefile)) ; \
 	do \
 	    $(MAKE) -C $${tc} digests ; \
 	done
@@ -145,7 +145,7 @@ toolchains: $(addprefix toolchain-,$(AVAILABLE_ARCHS))
 kernel-modules: $(addprefix kernel-,$(AVAILABLE_ARCHS))
 
 toolchain-%:
-	-@cd toolchains/syno-$*/ && MAKEFLAGS= $(MAKE)
+	-@cd toolchain/syno-$*/ && MAKEFLAGS= $(MAKE)
 
 kernel-%:
 	-@cd kernel/syno-$*/ && MAKEFLAGS= $(MAKE)

cross/bison/Makefile

@@ -12,7 +12,10 @@ COMMENT  = General-purpose parser generator
 LICENSE  = GPLv3
 
 GNU_CONFIGURE = 1
-ifeq ($(findstring $(ARCH), powerpc ppc824x ppc853x ppc854x),$(ARCH))
+
+include ../../mk/spksrc.archs.mk
+
+ifeq ($(findstring $(ARCH),$(OLD_PCC_ARCHS)),$(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_ARCHES) $(ARM8_ARCHES)),$(ARCH))
+ifeq ($(findstring $(ARCH),$(x64_ARCHS) $(ARMv8_ARCHS)),$(ARCH))
 ADDRESS_MODEL = 64
 endif
 

cross/chromaprint/Makefile

@@ -12,7 +12,7 @@ LICENSE  = LGPL2.1+
 OPTIONAL_DEPENDS = cross/ffmpeg
 
 # compiler too old
-UNSUPPORTED_ARCHS = $(ARM5_ARCHES) powerpc ppc824x ppc853x ppc854x
+UNSUPPORTED_ARCHS = $(ARMv5_ARCHS) $(OLD_PPC_ARCHS)
 
 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.common.mk
+include ../../mk/spksrc.archs.mk
 
-ifeq ($(findstring $(ARCH),$(ARM5_ARCHES) ppc853x hi3535),$(ARCH))
+ifeq ($(findstring $(ARCH),$(ARMv5_ARCHS) $(ARMv7L_ARCHS) $(OLD_PPC_ARCHS)),$(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,8 +8,6 @@ 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.common.mk
+include ../../mk/spksrc.archs.mk
 
 # This is more a toolchain than an arch limitation
-ifeq ($(findstring $(ARCH),ppc853x),$(ARCH))
+ifeq ($(findstring $(ARCH),$(OLD_PPC_ARCHS)),$(ARCH))
 CONFIGURE_ARGS += --disable-defrag
 PLIST_TRANSFORM = sed -e '/bin:sbin\/e4defrag/d'
 endif

cross/erlang/Makefile

@@ -12,11 +12,11 @@ COMMENT  = Erlang is a programming language used to build massively scalable sof
 LICENSE  = Erlang Public License
 
 # Get arch-defs now
-include ../../mk/spksrc.cross-cc.mk
+include ../../mk/spksrc.archs.mk
 
 GNU_CONFIGURE = 1
 CONFIGURE_ARGS += --with-ssl=$(STAGING_INSTALL_PREFIX) erl_xcomp_sysroot=$(INSTALL_DIR)
-ifeq ($(findstring $(ARCH), $(ARM5_ARCHES)),$(ARCH))
+ifeq ($(findstring $(ARCH),$(ARMv5_ARCHS)),$(ARCH))
 CONFIGURE_ARGS += --disable-smp-require-native-atomics
 endif
 

cross/ffmpeg/Makefile

@@ -84,39 +84,39 @@ DEPENDS += cross/shine
 CONFIGURE_ARGS += --enable-libshine
 endif
 
-ifeq ($(findstring $(ARCH),alpine comcerto2k monaco $(ARM8_ARCHES) $(x86_ARCHES) $(x64_ARCHES)),$(ARCH))
+ifeq ($(findstring $(ARCH),alpine comcerto2k monaco $(ARMv8_ARCHS) $(i686_ARCHS) $(x64_ARCHS)),$(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 $(ARM8_ARCHES) $(x64_ARCHES)),$(ARCH))
+ifeq ($(findstring $(ARCH),alpine comcerto2k monaco $(ARMv8_ARCHS) $(x64_ARCHS)),$(ARCH))
 DEPENDS += cross/svt-av1
 CONFIGURE_ARGS += --enable-libsvtav1
 endif
 
-ifeq ($(findstring $(ARCH),$(ARM5_ARCHES)),$(ARCH))
+ifeq ($(findstring $(ARCH),$(ARMv5_ARCHS)),$(ARCH))
 CONFIGURE_ARGS += --arch=arm --disable-neon --disable-yasm --disable-asm
 endif
 
-ifeq ($(findstring $(ARCH),$(ARM7_ARCHES)),$(ARCH))
+ifeq ($(findstring $(ARCH),$(ARMv7_ARCHS) $(ARMv7L_ARCHS)),$(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),$(ARM8_ARCHES)),$(ARCH))
+ifeq ($(findstring $(ARCH),$(ARMv8_ARCHS)),$(ARCH))
 CONFIGURE_ARGS += --arch=arm64 --enable-neon --enable-thumb --disable-yasm --disable-asm
 endif
 
-ifeq ($(findstring $(ARCH),$(x86_ARCHES)),$(ARCH))
+# only evansport is in i686 archs - no other x86 arch is supported
+ifeq ($(findstring $(ARCH),$(i686_ARCHS)),$(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,18 +138,15 @@ 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_ARCHES)),$(ARCH))
+ifeq ($(findstring $(ARCH),$(x64_ARCHS)),$(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_ARCHES)),$(ARCH))
+ifeq ($(findstring $(ARCH),$(PPC_ARCHS)),$(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_ARCHES)),$(ARCH))
+ifeq ($(findstring $(ARCH),$(PPC_ARCHS)),$(ARCH))
+# avoid error: AltiVec and SPE instructions cannot coexist
 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 = powerpc ppc824x ppc853x ppc854x
+UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS)
 
 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_ARCHES)),$(ARCH))
+ifeq ($(findstring $(ARCH),$(PPC_ARCHS)),$(ARCH))
 # archs/toolchains without compatible RS485 support (linux serial.h)
 CONFIGURE_ARGS += ac_cv_have_decl_TIOCSRS485=no
 endif

cross/glib/Makefile

@@ -12,7 +12,7 @@ HOMEPAGE = https://developer.gnome.org/glib/
 COMMENT  = General-purpose utility library
 LICENSE  = GPLv2
 
-UNSUPPORTED_ARCHS = powerpc ppc824x ppc853x ppc854x
+UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS)
 
 # https://developer.gnome.org/glib/
 # https://developer.gnome.org/glib/stable/glib-building.html

cross/gnupg/Makefile

@@ -19,14 +19,14 @@ CONFIGURE_ARGS += --with-libassuan-prefix=$(STAGING_INSTALL_PREFIX)
 CONFIGURE_ARGS += --with-ksba-prefix=$(STAGING_INSTALL_PREFIX)
 CONFIGURE_ARGS += --with-npth-prefix=$(STAGING_INSTALL_PREFIX)
 
-include ../../mk/spksrc.common.mk
+include ../../mk/spksrc.archs.mk
 
-ifeq ($(findstring $(ARCH), powerpc ppc824x ppc853x ppc854x),$(ARCH))
+ifeq ($(findstring $(ARCH),$(OLD_PPC_ARCHS)),$(ARCH))
 # kernel before 2.6.36 do not support inotify
 CONFIGURE_ARGS += ac_cv_func_inotify_init=no
 endif
 
-ifeq ($(findstring $(ARCH), $(ARM5_ARCHES) powerpc ppc824x ppc853x ppc854x),$(ARCH))
+ifeq ($(findstring $(ARCH),$(ARMv5_ARCHS) $(OLD_PPC_ARCHS)),$(ARCH))
 # use clock_gettime of librt
 ADDITIONAL_LDFLAGS = -lrt
 endif

cross/haproxy/Makefile

@@ -20,20 +20,20 @@ BUILD_OPTIONS = USE_TPROXY=1 USE_PTHREAD_PSHARED=1 USE_OPENSSL=1 USE_ZLIB=1
 BUILD_OPTIONS += USE_PCRE2=1 PCRE2_INC=$(INSTALL_DIR)$(INSTALL_PREFIX)/include PCRE2_LIB=$(INSTALL_DIR)$(INSTALL_PREFIX)/lib
 BUILD_OPTIONS += USE_LUA=1 LUA_INC=$(INSTALL_DIR)$(INSTALL_PREFIX)/include LUA_LIB=$(INSTALL_DIR)$(INSTALL_PREFIX)/lib
 
-include ../../mk/spksrc.common.mk
+include ../../mk/spksrc.archs.mk
 
 ARCH_OPTIONS =
 
-ifeq ($(findstring $(ARCH), $(ARM5_ARCHES) powerpc ppc824x ppc853x ppc854x),$(ARCH))
-# ARM5_ARCHES and PPC_ARCHES (except QorIQ) have older kernels and need rt library for clock_gettime()
+ifeq ($(findstring $(ARCH),$(ARMv5_ARCHS) $(OLD_PPC_ARCHS)),$(ARCH))
+# ARMv5 and PPC archs (except QorIQ) have older kernels and need rt library for clock_gettime()
 BUILD_OPTIONS += USE_RT=1
 ADDITIONAL_CFLAGS += -DLUA_32BITS
 endif
 ifeq ($(findstring $(ARCH), qoriq),$(ARCH))
 BUILD_OPTIONS += ADDLIB=-latomic
 endif
 
-ifeq ($(findstring $(ARCH), $(x64_ARCHES)),$(ARCH))
+ifeq ($(findstring $(ARCH),$(x64_ARCHS)),$(ARCH))
 ARCH_OPTIONS = ARCH=x86_64
 endif
 

cross/ifuse/Makefile

@@ -21,14 +21,13 @@ IFUSE_AUTOGEN_ARGS =
 
 include ../../mk/spksrc.cross-cc.mk
 
-ifeq ($(findstring $(ARCH), $(ARM_ARCHES)),$(ARCH))
+ifeq ($(findstring $(ARCH),$(ARM_ARCHS)),$(ARCH))
 IFUSE_AUTOGEN_ARGS += --host=arm-linux
 endif
-ifeq ($(findstring $(ARCH), $(PPC_ARCHES)),$(ARCH))
+ifeq ($(findstring $(ARCH),$(PPC_ARCHS)),$(ARCH))
 IFUSE_AUTOGEN_ARGS += --host=ppc-linux
 endif
 
-
 .PHONY ifuse_pre_configure:
 ifuse_pre_configure:
 	$(RUN) ./autogen.sh $(IFUSE_AUTOGEN_ARGS)

cross/imagemagick/Makefile

@@ -18,8 +18,8 @@ INSTALL_TARGET = imagemagick_install
 
 include ../../mk/spksrc.cross-cc.mk
 
-ifeq ($(findstring $(ARCH), $(ARM5_ARCHES) powerpc ppc824x ppc853x ppc854x),$(ARCH))
-# ARM5_ARCHES and PPC_ARCHES (except QorIQ) have older kernels
+ifeq ($(findstring $(ARCH),$(ARMv5_ARCHS) $(OLD_PPC_ARCHS)),$(ARCH))
+# ARMv5 and PPC archs (except QorIQ) have older kernels
 # linking to lib rt fixes unreferenced clock_gettime
 CONFIGURE_ARGS += CFLAGS=-lrt
 endif

cross/intel-media-driver/Makefile

@@ -6,7 +6,7 @@ PKG_DIST_SITE = https://github.com/intel/media-driver/archive
 PKG_DIR = media-driver-$(PKG_NAME)-$(PKG_VERS)
 
 DEPENDS = cross/gmmlib
-UNSUPPORTED_ARCHS = $(ARM_ARCHES) $(PPC_ARCHES) $(x86_ARCHES)
+UNSUPPORTED_ARCHS = $(ARM_ARCHS) $(PPC_ARCHS) $(i686_ARCHS)
 
 HOMEPAGE = https://github.com/intel/media-driver
 COMMENT  = The Intel Media Driver for VAAPI is a new VA-API (Video Acceleration API) user mode driver supporting hardware accelerated decoding, encoding, and video post processing for GEN based graphics hardware.

cross/intel-media-sdk/Makefile

@@ -6,7 +6,7 @@ PKG_DIST_SITE = https://github.com/Intel-Media-SDK/MediaSDK/archive
 PKG_DIR = MediaSDK-$(PKG_NAME)-$(PKG_VERS)
 
 DEPENDS = cross/intel-media-driver
-UNSUPPORTED_ARCHS = $(ARM_ARCHES) $(PPC_ARCHES) $(x86_ARCHES)
+UNSUPPORTED_ARCHS = $(ARM_ARCHS) $(PPC_ARCHS) $(i686_ARCHS)
 
 HOMEPAGE = http://mediasdk.intel.com
 COMMENT  = Intel Media SDK provides a plain C API to access hardware-accelerated video decode, encode and filtering on Intel® Gen graphics hardware platforms. Implementation written in C++ 11 with parts in C-for-Media (CM).

cross/js/Makefile

@@ -22,19 +22,19 @@ CONFIGURE_ARGS = ac_cv_va_copy=C99 --disable-dependency-tracking --disable-stati
 
 PRE_COMPILE_TARGET = js_pre_compile
 
-include ../../mk/spksrc.common.mk
+include ../../mk/spksrc.archs.mk
 
 PRE_COMPILE_HOST_CPU =
-ifeq ($(findstring $(ARCH),$(x64_ARCHES)),$(ARCH))
+ifeq ($(findstring $(ARCH),$(x64_ARCHS)),$(ARCH))
 PRE_COMPILE_HOST_CPU = -D__x86_64__
 endif
-ifeq ($(findstring $(ARCH),$(x86_ARCHES)),$(ARCH))
+ifeq ($(findstring $(ARCH),$(i686_ARCHS)),$(ARCH))
 PRE_COMPILE_HOST_CPU = -D__i386__
 endif
-ifeq ($(findstring $(ARCH),$(ARM_ARCHES)),$(ARCH))
+ifeq ($(findstring $(ARCH),$(ARM_ARCHS)),$(ARCH))
 PRE_COMPILE_HOST_CPU = -D__arm__
 endif
-ifeq ($(findstring $(ARCH),$(PPC_ARCHES)),$(ARCH))
+ifeq ($(findstring $(ARCH),$(PPC_ARCHS)),$(ARCH))
 PRE_COMPILE_HOST_CPU = -D__powerpc__
 endif
 

cross/lame/Makefile

@@ -18,7 +18,7 @@ NASM_PATH = $(WORK_DIR)/../../../native/nasm/work-native/install/usr/local/bin
 
 include ../../mk/spksrc.cross-cc.mk
 
-ifeq ($(findstring $(ARCH), $(x86_ARCHES)),$(ARCH))
+ifeq ($(findstring $(ARCH),$(x64_ARCHS) $(i686_ARCHS)),$(ARCH))
 DEPENDS += native/nasm
 ENV += AS=$(NASM_PATH)/nasm
 ENV += PATH=$(NASM_PATH):$$PATH