From 5806a4315623edda5c2181ed2d8f6cc77ef975b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Mon, 21 May 2018 11:35:55 +0200 Subject: [PATCH] distrho-ports: Share scripts and libs for re-use MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upcoming distrho-ports-extra needs them Signed-off-by: Andreas Müller --- .../distrho/distrho-ports.bb | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/recipes-misc/recipes-multimedia/distrho/distrho-ports.bb b/recipes-misc/recipes-multimedia/distrho/distrho-ports.bb index 93802977..dd89def5 100644 --- a/recipes-misc/recipes-multimedia/distrho/distrho-ports.bb +++ b/recipes-misc/recipes-multimedia/distrho/distrho-ports.bb @@ -44,18 +44,18 @@ DEPENDS += " \ ladspa-sdk \ " -do_configure_prepend() { +do_configure() { # reconfigure? if [ ! -f ${LV2-TURTLE-BUILD-DATA} ] ; then - # manipulate scripts to keep lv2_ttl_generator-calls in script for lv2-postinst-helper - sed -i 's|$GEN ./$FILE|echo "lv2-ttl-generator `pwd`/$FILE" >> ${LV2-TURTLE-BUILD-DATA}|g' `find ${S} -name *.sh` + # keep unmodified scripts + cp -r ${S}/scripts ${WORKDIR} + # manipulate scripts to keep lv2_ttl_generator-calls in script for lv2-postinst-helper + sed -i 's|$GEN ./$FILE|echo "lv2-ttl-generator `pwd`/$FILE" >> ${LV2-TURTLE-BUILD-DATA}|g' `find ${S}/scripts -name *.sh` else rm -f ${LV2-TURTLE-BUILD-DATA} fi -} -# platforms supporting sse2 can override this -do_configure() { + # platforms supporting sse2 can override this (NOOPTIMIZATIONS) NOOPTIMIZATIONS=1 ${S}/scripts/premake-update.sh linux } @@ -73,6 +73,12 @@ do_install() { for file in `find ${WORKDIR}/linuxsynths-vex-patches -mindepth 1 -maxdepth 1` ; do cp -rf $file ${D}${libdir}/lv2/ done + + # install scripts for distro-ports-extra (and abuse libdir to ensure is is found in sysroot) + install -d ${D}/${libdir}/distrho-ports-build + cp -rf ${WORKDIR}/scripts ${D}${libdir}/distrho-ports-build/ + cp -rf ${S}/libs ${D}${libdir}/distrho-ports-build/ + rm -f ${D}${libdir}/distrho-ports-build/libs/lv2_ttl_generator } PACKAGES =+ "${PN}-presets" @@ -85,5 +91,11 @@ FILES_${PN} += " \ FILES_${PN}-presets = "${libdir}/lv2/*.preset.lv2" +# dummy pack scripts for distrho-ports-extra +FILES_${PN}-staticdev += " \ + ${libdir}/distrho-ports-build \ +" +RDEPENDS_${PN}-staticdev = "bash perl" + # Have not found what causes stripping - debugging of plugins is unlikely INSANE_SKIP_${PN} = "already-stripped"