Skip to content

Commit

Permalink
More MOD fixup
Browse files Browse the repository at this point in the history
Signed-off-by: falkTX <falktx@falktx.com>
  • Loading branch information
falkTX committed Sep 21, 2023
1 parent 4297215 commit b8a8544
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 6 deletions.
5 changes: 1 addition & 4 deletions build-mod-plugin.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

# ---------------------------------------------------------------------------------------------------------------------

Expand All @@ -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

# ---------------------------------------------------------------------------------------------------------------------
12 changes: 10 additions & 2 deletions setup/mod-audio/builder.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit b8a8544

Please sign in to comment.