Tweaks for disabling LTO and getting early win32 builds

Signed-off-by: falkTX <[email protected]>
mod-audio · Sep 21, 2023 · 1c2f247 · 1c2f247
1 parent f371014
commit 1c2f247
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/plugins/package/aidadsp-lv2/aidadsp-lv2.mk b/plugins/package/aidadsp-lv2/aidadsp-lv2.mk
@@ -12,9 +12,12 @@ AIDADSP_LV2_BUNDLES = rt-neural-generic.lv2
 # custom optimization flags
 AIDADSP_LV2_TARGET_OPT  = $(filter-out -funsafe-loop-optimizations,$(subst ",,$(BR2_TARGET_OPTIMIZATION)))
 AIDADSP_LV2_TARGET_OPT += -fno-unsafe-loop-optimizations
-AIDADSP_LV2_TARGET_OPT += -fno-strict-aliasing -flto -ffat-lto-objects
 AIDADSP_LV2_TARGET_OPT += -fPIC
 
+ifndef BR2_SKIP_LTO
+AIDADSP_LV2_TARGET_OPT += -fno-strict-aliasing -flto -ffat-lto-objects
+endif
+
 # pass options into cmake
 AIDADSP_LV2_CONF_OPTS = -DPREFIX="/usr/lib/lv2"
 AIDADSP_LV2_CONF_OPTS += -DRTNEURAL_EIGEN=ON

diff --git a/plugins/package/artyfx/artyfx.mk b/plugins/package/artyfx/artyfx.mk
@@ -26,7 +26,7 @@ define ARTYFX_POST_INSTALL_TARGET_TTLFILES
 
 	# bitta split bundle
 	install -d $(TARGET_DIR)/usr/lib/lv2/artyfx-bitta.lv2
-	cp $(TARGET_DIR)/usr/lib/lv2/artyfx.lv2/*.so $(TARGET_DIR)/usr/lib/lv2/artyfx-bitta.lv2/
+	cp $(TARGET_DIR)/usr/lib/lv2/artyfx.lv2/*.* $(TARGET_DIR)/usr/lib/lv2/artyfx-bitta.lv2/
 	cp -rL $($(PKG)_PKGDIR)/artyfx-bitta.lv2/* $(TARGET_DIR)/usr/lib/lv2/artyfx-bitta.lv2/
 endef
 

diff --git a/plugins/package/carla-plugins/carla-plugins.mk b/plugins/package/carla-plugins/carla-plugins.mk
@@ -4,7 +4,7 @@
 #
 ######################################
 
-CARLA_PLUGINS_VERSION = 9317df59709ae646f6e08a1e2c9834b4a0325101
+CARLA_PLUGINS_VERSION = ecad5268e71faa9d9d8a5d40b7573a6936ad4b6e
 CARLA_PLUGINS_SITE = $(call github,falkTX,Carla,$(CARLA_PLUGINS_VERSION))
 CARLA_PLUGINS_DEPENDENCIES = libsndfile
 CARLA_PLUGINS_BUNDLES = carla-files.lv2

diff --git a/plugins/package/mod-convolution-loader/mod-convolution-loader.mk b/plugins/package/mod-convolution-loader/mod-convolution-loader.mk
@@ -12,7 +12,11 @@ MOD_CONVOLUTION_LOADER_BUNDLES = MOD-CabinetLoader.lv2 MOD-ConvolutionLoader.lv2
 # needed for submodules support
 MOD_CONVOLUTION_LOADER_PRE_DOWNLOAD_HOOKS += MOD_PLUGIN_BUILDER_DOWNLOAD_WITH_SUBMODULES
 
-MOD_CONVOLUTION_LOADER_TARGET_MAKE = $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) CROSS_COMPILING=true NOOPT=true WITH_LTO=true -C $(@D)
+MOD_CONVOLUTION_LOADER_TARGET_MAKE = $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) CROSS_COMPILING=true NOOPT=true -C $(@D)
+
+ifndef BR2_SKIP_LTO
+MOD_CONVOLUTION_LOADER_TARGET_MAKE += WITH_LTO=true
+endif
 
 define MOD_CONVOLUTION_LOADER_BUILD_CMDS
 	$(MOD_CONVOLUTION_LOADER_TARGET_MAKE)