From b8a8544bd4c326b09482015484b9026fcf9db196 Mon Sep 17 00:00:00 2001 From: falkTX Date: Thu, 21 Sep 2023 19:33:20 +0200 Subject: [PATCH] More MOD fixup Signed-off-by: falkTX --- build-mod-plugin.sh | 5 +---- setup/mod-audio/builder.mk | 12 ++++++++++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/build-mod-plugin.sh b/build-mod-plugin.sh index 94484e5..4268d93 100755 --- a/build-mod-plugin.sh +++ b/build-mod-plugin.sh @@ -46,9 +46,6 @@ fi if [ ! -e "${PAWPAW_PREFIX}/usr/share" ]; then ln -s ../share "${PAWPAW_PREFIX}/usr/share" fi -if [ ! -e "${PAWPAW_PREFIX}/usr/var" ]; then - ln -s ../var "${PAWPAW_PREFIX}/usr/var" -fi # --------------------------------------------------------------------------------------------------------------------- @@ -63,6 +60,6 @@ if [ ! -e mod-plugin-builder ]; then exit 1 fi -make -f setup/mod-audio/builder.mk pkgname="${plugin}" ${MAKE_ARGS} WITH_LTO=false VERBOSE=1 +make -f setup/mod-audio/builder.mk pkgname="${plugin}" ${MAKE_ARGS} PREFIX=/usr WITH_LTO=false VERBOSE=1 -j # --------------------------------------------------------------------------------------------------------------------- diff --git a/setup/mod-audio/builder.mk b/setup/mod-audio/builder.mk index a828414..3e372e4 100644 --- a/setup/mod-audio/builder.mk +++ b/setup/mod-audio/builder.mk @@ -154,15 +154,23 @@ STAMP_PATCHED = $($(PKG)_BUILDDIR)/.stamp_patched STAMP_CONFIGURED = $($(PKG)_BUILDDIR)/.stamp_configured STAMP_BUILT = $($(PKG)_BUILDDIR)/.stamp_built STAMP_INSTALLED = $($(PKG)_BUILDDIR)/.stamp_installed +STAMP_PINSTALLED = $($(PKG)_BUILDDIR)/.stamp_post_installed PAWPAW_TMPDIR = /tmp/PawPaw PAWPAW_TMPNAME = git-dl -all: $(STAMP_INSTALLED) +all: $(STAMP_PINSTALLED) + +$(STAMP_PINSTALLED): $(STAMP_INSTALLED) + $(call $($(PKG)_POST_INSTALL_TARGET_HOOKS)) +ifneq (,$(wildcard $(PAWPAW_PREFIX)/usr/lib/lv2/$(firstword $($(PKG)_BUNDLES))/*.dll)) + $(foreach b,$($(PKG)_BUNDLES),sed -i -e 's|lv2:binary <\([_a-zA-Z0-9-]*\)\.so>|lv2:binary <\1\.dll>|g' $(PAWPAW_PREFIX)/usr/lib/lv2/$(b)/manifest.ttl;) + $(foreach b,$($(PKG)_BUNDLES),rm -f $(PAWPAW_PREFIX)/usr/lib/lv2/$(b)/*.dll.a;) +endif + touch $@ $(STAMP_INSTALLED): $(STAMP_BUILT) $($(PKG)_INSTALL_TARGET_CMDS) - $(call $($(PKG)_POST_INSTALL_TARGET_HOOKS)) touch $@ $(STAMP_BUILT): $(STAMP_CONFIGURED)