Release 1.0.2

* Updated build scripts.

Author: sadko4u

CHANGELOG

@@ -2,6 +2,9 @@
 * RECENT CHANGES
 *******************************************************************************
 
+=== 1.0.2 ===
+* Updated build scripts.
+
 === 1.0.1 ===
 * Updated build scripts.
 
@@ -86,4 +89,5 @@
 * Supports SIMD optimizations for 32-bit i586 architecture.
 * Supports SIMD optimizations for 64-bit x86_64 architecture.
 * Supports SIMD optimizations for 32-bit ARMv7 architecture.
-* Supports SIMD optimizations for 64-bit AArch64 architecture.
+* Supports SIMD optimizations for 64-bit AArch64 architecture.
+

include/lsp-plug.in/dsp/version.h

@@ -25,7 +25,7 @@
 // Define version of headers
 #define LSP_DSP_LIB_MAJOR           1
 #define LSP_DSP_LIB_MINOR           0
-#define LSP_DSP_LIB_MICRO           1
+#define LSP_DSP_LIB_MICRO           2
 
 #ifdef LSP_DSP_LIB_BUILTIN
     #define LSP_DSP_LIB_CPPEXPORT

make/configure.mk

@@ -266,7 +266,7 @@ $(CONFIG_VARS): prepare
 	echo "$(@)=$($(@))" >> "$(CONFIG)"
 
 config: $(CONFIG_VARS)
-	echo "Architecture: $(ARCHITECTURE) ($(ARCHITECTURE_CFLAGS))"
+	echo "Architecture: $(ARCHITECTURE_FAMILY)/$(ARCHITECTURE) ($(ARCHITECTURE_CFLAGS))"
 	echo "Features:     $(FEATURES)"
 	echo "Configured OK"
 

make/system.mk

@@ -2,20 +2,20 @@
 # Copyright (C) 2020 Linux Studio Plugins Project <https://lsp-plug.in/>
 #           (C) 2020 Vladimir Sadovnikov <sadko4u@gmail.com>
 #
-# This file is part of lsp-dsp-lib
+# This file is part of lsp-plugins
 #
-# lsp-dsp-lib is free software: you can redistribute it and/or modify
+# lsp-plugins is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # any later version.
 #
-# lsp-dsp-lib is distributed in the hope that it will be useful,
+# lsp-plugins is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Lesser General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with lsp-dsp-lib.  If not, see <https://www.gnu.org/licenses/>.
+# along with lsp-plugins.  If not, see <https://www.gnu.org/licenses/>.
 #
 
 # Detect operating system
@@ -56,51 +56,71 @@ endif
 # The current architecture can be obtained by: gcc -Q --help=target
 ifeq ($(patsubst armv6%,armv6,$(BUILD_ARCH)),armv6)
   override ARCHITECTURE   = arm32
+  ARCHITECTURE_FAMILY     = arm32
   ARCHITECTURE_CFLAGS    := -march=armv6 -marm
 else ifeq ($(patsubst armv7ve%,armv7ve,$(BUILD_ARCH)),armv7ve)
   override ARCHITECTURE   = arm32
+  ARCHITECTURE_FAMILY     = arm32
   ARCHITECTURE_CFLAGS    := -march=armv7ve -marm
 else ifeq ($(patsubst armv7%,armv7,$(BUILD_ARCH)),armv7)
   override ARCHITECTURE   = arm32
+  ARCHITECTURE_FAMILY     = arm32
   ARCHITECTURE_CFLAGS    := -march=armv7-a -marm
 else ifeq ($(patsubst armv8%,armv8,$(BUILD_ARCH)),armv8)
   override ARCHITECTURE   = aarch64
+  ARCHITECTURE_FAMILY     = aarch64
   ARCHITECTURE_CFLAGS    := -march=armv8-a
 else ifeq ($(patsubst aarch64%,aarch64,$(BUILD_ARCH)),aarch64)
   override ARCHITECTURE   = aarch64
+  ARCHITECTURE_FAMILY     = aarch64
   ARCHITECTURE_CFLAGS    := -march=armv8-a
 else ifeq ($(BUILD_ARCH),arm32)
   override ARCHITECTURE   = arm32
+  ARCHITECTURE_FAMILY     = arm32
   ARCHITECTURE_CFLAGS    := -march=armv6 -marm
 else ifeq ($(BUILD_ARCH),arm)
   override ARCHITECTURE   = arm32
+  ARCHITECTURE_FAMILY     = arm32
   ARCHITECTURE_CFLAGS    := -march=armv6 -marm
 else ifeq ($(patsubst %x86_64%,x86_64,$(BUILD_ARCH)),x86_64)
   override ARCHITECTURE   = x86_64
+  ARCHITECTURE_FAMILY     = x86_64
   ARCHITECTURE_CFLAGS    := -march=x86-64 -m64
 else ifeq ($(patsubst %amd64%,amd64,$(BUILD_ARCH)),amd64)
   override ARCHITECTURE   = x86_64
+  ARCHITECTURE_FAMILY     = x86_64
   ARCHITECTURE_CFLAGS    := -march=x86-64 -m64
 else ifeq ($(patsubst %AMD64%,AMD64,$(BUILD_ARCH)),AMD64)
   override ARCHITECTURE   = x86_64
+  ARCHITECTURE_FAMILY     = x86_64
   ARCHITECTURE_CFLAGS    := -march=x86-64 -m64
 else ifeq ($(BUILD_ARCH),i86pc)
   override ARCHITECTURE   = x86_64
+  ARCHITECTURE_FAMILY     = x86_64
   ARCHITECTURE_CFLAGS    := -march=x86-64 -m64
+else ifeq ($(patsubst %i686%,i686,$(BUILD_ARCH)),i686)
+  override ARCHITECTURE   = i686
+  ARCHITECTURE_FAMILY     = ia32
+  ARCHITECTURE_CFLAGS    := -march=i686 -m32
 else ifeq ($(patsubst i%86,i586,$(BUILD_ARCH)),i586)
   override ARCHITECTURE   = i586
+  ARCHITECTURE_FAMILY     = ia32
   ARCHITECTURE_CFLAGS    := -march=i586 -m32
 else ifeq ($(BUILD_ARCH),x86)
   override ARCHITECTURE   = i586
+  ARCHITECTURE_FAMILY     = ia32
   ARCHITECTURE_CFLAGS    := -march=i586 -m32
 else ifeq ($(BUILD_ARCH),riscv32)
   override ARCHITECTURE   = riscv32
+  ARCHITECTURE_FAMILY     = riscv32
   ARCHITECTURE_CFLAGS    := -march=rv32imafdc -mabi=lp32d
 else ifeq ($(BUILD_ARCH),riscv64)
   override ARCHITECTURE   = riscv64
+  ARCHITECTURE_FAMILY     = riscv64
   ARCHITECTURE_CFLAGS    := -march=rv64imafdc -mabi=lp64d
 else
-  override ARCHITECTURE   =
+  override ARCHITECTURE   = $(BUILD_ARCH)
+  ARCHITECTURE_FAMILY     = generic
   ARCHITECTURE_CFLAGS    :=
 endif
 
@@ -182,6 +202,7 @@ COMMON_VARS = \
 	ROOT_ARTIFACT_ID \
 	PLATFORM \
 	ARCHITECTURE \
+	ARCHITECTURE_FAMILY \
 	ARCHITECTURE_CFLAGS \
 	BUILDDIR \
 	FEATURES \
@@ -209,6 +230,7 @@ sysvars:
 	echo "  ADD_FEATURES              list of features enabled in the build as an addition to default"
 	echo "  ARCHITECTURE              target architecture to perform build"
 	echo "  ARCHITECTURE_CFLAGS       compiler flags to specify architecture"
+	echo "  ARCHITECTURE_FAMILY       compiler flags to specify architecture family"
 	echo "  ARCHITECTURE_LDFLAGS      linker flags to specify architecture"
 	echo "  BINDIR                    location of the binaries"
 	echo "  BUILDDIR                  location of the build directory"

make/tools.mk

@@ -63,7 +63,7 @@ INSTALL            := $(X_INSTALL_TOOL)
 
 # Patch flags and tools for (cross) build
 FLAG_RELRO          = -Wl,-z,relro,-z,now
-FLAG_STDLIB         = -lc
+FLAG_STDLIB         = 
 CFLAGS_EXT          = $(ARCHITECTURE_CFLAGS)
 CXXFLAGS_EXT        = $(ARCHITECTURE_CFLAGS)
 EXE_FLAGS_EXT       = $(ARCHITECTURE_CFLAGS)
@@ -110,7 +110,7 @@ else
 endif
 
 # Define flags for (cross) build
-CFLAGS             := \
+CFLAGS             ?= \
   $(CFLAGS_EXT) \
   -fdata-sections \
   -ffunction-sections \
@@ -120,7 +120,7 @@ CFLAGS             := \
 
 CDEFS              += -DLSP_INSTALL_PREFIX=\\\"$(PREFIX)\\\"
 
-CXXFLAGS           := \
+CXXFLAGS           ?= \
   $(CXXFLAGS_EXT) \
   -std=c++98 \
   -fno-exceptions \
@@ -136,7 +136,7 @@ CXXDEFS            += -DLSP_INSTALL_PREFIX=\\\"$(PREFIX)\\\"
 INCLUDE            :=
 LDFLAGS            := $(LDFLAGS_EXT) -r
 EXE_FLAGS          := $(EXE_FLAGS_EXT) $(FLAG_RELRO) -Wl,--gc-sections
-SO_FLAGS           := $(SO_FLAGS_EXT) $(FLAG_RELRO) -Wl,--gc-sections -shared -Llibrary $(FLAG_STDLIB) -fPIC 
+SO_FLAGS           := $(SO_FLAGS_EXT) $(FLAG_RELRO) -Wl,--gc-sections -shared $(FLAG_STDLIB) -fPIC 
 
 # Define flags for host build
 HOST_CFLAGS        := $(CFLAGS)

modules.mk

@@ -19,13 +19,13 @@
 #
 
 # Variables that describe dependencies
-LSP_COMMON_LIB_VERSION     := 1.0.16
+LSP_COMMON_LIB_VERSION     := 1.0.17
 LSP_COMMON_LIB_NAME        := lsp-common-lib
 LSP_COMMON_LIB_TYPE        := src
 LSP_COMMON_LIB_URL_RO      := https://github.com/lsp-plugins/$(LSP_COMMON_LIB_NAME).git
 LSP_COMMON_LIB_URL_RW      := git@github.com:lsp-plugins/$(LSP_COMMON_LIB_NAME).git
 
-LSP_TEST_FW_VERSION        := 1.0.10
+LSP_TEST_FW_VERSION        := 1.0.11
 LSP_TEST_FW_NAME           := lsp-test-fw
 LSP_TEST_FW_TYPE           := src
 LSP_TEST_FW_URL_RO         := https://github.com/lsp-plugins/$(LSP_TEST_FW_NAME).git

project.mk

@@ -23,4 +23,4 @@ ARTIFACT_ID                 = LSP_DSP_LIB
 ARTIFACT_NAME               = lsp-dsp-lib
 ARTIFACT_DESC               = DSP library for digital signal processing
 ARTIFACT_HEADERS            = lsp-plug.in
-ARTIFACT_VERSION            = 1.0.1
+ARTIFACT_VERSION            = 1.0.2

src/Makefile

@@ -90,13 +90,13 @@ CXX_OBJ_AARCH64         = $(ARTIFACT_BIN)/main/aarch64/aarch64.o
 CXX_OBJ_ASIMD           = $(ARTIFACT_BIN)/main/aarch64/asimd.o
 CXX_OBJ                 = $(CXX_OBJ_MAIN) $(CXX_OBJ_EXT)
 
-ifeq ($(ARCHITECTURE),i586)
+ifeq ($(ARCHITECTURE_FAMILY),ia32)
   CXX_OBJ_EXT            += $(CXX_OBJ_X86) $(CXX_OBJ_SSE) $(CXX_OBJ_SSE2) $(CXX_OBJ_SSE3) $(CXX_OBJ_SSE4) $(CXX_OBJ_AVX) $(CXX_OBJ_AVX2)
-else ifeq ($(ARCHITECTURE),x86_64)
+else ifeq ($(ARCHITECTURE_FAMILY),x86_64)
   CXX_OBJ_EXT            += $(CXX_OBJ_X86) $(CXX_OBJ_SSE) $(CXX_OBJ_SSE2) $(CXX_OBJ_SSE3) $(CXX_OBJ_SSE4) $(CXX_OBJ_AVX) $(CXX_OBJ_AVX2)
-else ifeq ($(ARCHITECTURE),arm32)
+else ifeq ($(ARCHITECTURE_FAMILY),arm32)
   CXX_OBJ_EXT            += $(CXX_OBJ_ARM) $(CXX_OBJ_NEON_D32)
-else ifeq ($(ARCHITECTURE),aarch64)
+else ifeq ($(ARCHITECTURE_FAMILY),aarch64)
   CXX_OBJ_EXT            += $(CXX_OBJ_AARCH64) $(CXX_OBJ_ASIMD)
 endif
 
@@ -151,7 +151,7 @@ depend: $(DEP_CXX)
 	    $(eval SED_RULES += s/$(shell echo "$($(dep)_BIN)" | sed "s/\\//\\\\\//g")/\\$$$$\\($(dep)_BIN\\)/g;)\
 	  )\
 	)
-	cat $(DEP_CXX) | sed -E "$(SED_RULES)" >Makefile.$(ARCHITECTURE).d
+	cat $(DEP_CXX) | sed -E "$(SED_RULES)" >Makefile.$(ARCHITECTURE_FAMILY).d
 
 $(ARTIFACT_DEPS):
 	echo "make $(notdir $($(@)_OBJ))"
@@ -236,4 +236,4 @@ $(CXX_OBJ_NEON_D32):   EXT_FLAGS=$(CXX_NEON_D32_CFLAGS)
 $(CXX_OBJ_ASIMD):      EXT_FLAGS=$(CXX_ASIMD_CFLAGS)
 
 # Dependencies
--include $(CURDIR)/Makefile.$(ARCHITECTURE).d
+-include $(CURDIR)/Makefile.$(ARCHITECTURE_FAMILY).d