From 992fb8c7a83dab43c8ab807b4d5e630004529cfb Mon Sep 17 00:00:00 2001 From: Daniel Appelt Date: Mon, 16 Nov 2020 20:00:25 +0000 Subject: [PATCH 1/2] Fix or add missing premake workaround --- .../01_workaround-missing-premake.patch | 2 +- .../01_workaround-missing-premake.patch | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 plugins/package/mod-tal-noisemaker/01_workaround-missing-premake.patch diff --git a/plugins-dep/package/camomile/01_workaround-missing-premake.patch b/plugins-dep/package/camomile/01_workaround-missing-premake.patch index cd9c6627..c4a60034 100644 --- a/plugins-dep/package/camomile/01_workaround-missing-premake.patch +++ b/plugins-dep/package/camomile/01_workaround-missing-premake.patch @@ -7,7 +7,7 @@ index 5290d5a..6db0525 100755 fi +if [ ! -f premake ]; then -+ wget https://github.com/kunitoki/juced/raw/master/tools/linux/premake; chmod +x premake ++ mkdir tmp; cd tmp && wget --quiet http://archive.ubuntu.com/ubuntu/pool/universe/p/premake/premake_3.7-1_amd64.deb && dpkg -x premake_3.7-1_amd64.deb . && mv ./usr/bin/premake ../ && cd .. && rm -rf tmp +fi +PREMAKE=$(pwd)/premake + diff --git a/plugins/package/mod-tal-noisemaker/01_workaround-missing-premake.patch b/plugins/package/mod-tal-noisemaker/01_workaround-missing-premake.patch new file mode 100644 index 00000000..c4a60034 --- /dev/null +++ b/plugins/package/mod-tal-noisemaker/01_workaround-missing-premake.patch @@ -0,0 +1,20 @@ +diff --git a/scripts/premake-update.sh b/premake-update.sh +index 5290d5a..6db0525 100755 +--- a/scripts/premake-update.sh ++++ b/scripts/premake-update.sh +@@ -26,9 +26,14 @@ if [ -d ../libs ]; then + cd .. + fi + ++if [ ! -f premake ]; then ++ mkdir tmp; cd tmp && wget --quiet http://archive.ubuntu.com/ubuntu/pool/universe/p/premake/premake_3.7-1_amd64.deb && dpkg -x premake_3.7-1_amd64.deb . && mv ./usr/bin/premake ../ && cd .. && rm -rf tmp ++fi ++PREMAKE=$(pwd)/premake ++ + run_premake() + { +- premake --os $1 --target gnu --cc gcc ++ $PREMAKE --os $1 --target gnu --cc gcc + + if [ $MAC == 1 ]; then + sed -i -e "s|BLDCMD = ar -rcs \$(OUTDIR)/\$(TARGET) \$(OBJECTS) \$(TARGET_ARCH)|BLDCMD = ar -rcs \$(OUTDIR)/\$(TARGET) \$(OBJECTS)|" `find . -name \*.make` From 2ab899fdd9febee90cf4d7559243435ac8e6a18b Mon Sep 17 00:00:00 2001 From: Daniel Appelt Date: Mon, 16 Nov 2020 22:45:07 +0000 Subject: [PATCH 2/2] Add check for existing premake installation --- .../01_workaround-missing-premake.patch | 20 +++++++++++-------- .../01_workaround-missing-premake.patch | 20 +++++++++++-------- .../01_workaround-missing-premake.patch | 20 +++++++++++-------- 3 files changed, 36 insertions(+), 24 deletions(-) diff --git a/plugins-dep/package/camomile/01_workaround-missing-premake.patch b/plugins-dep/package/camomile/01_workaround-missing-premake.patch index c4a60034..92f2f169 100644 --- a/plugins-dep/package/camomile/01_workaround-missing-premake.patch +++ b/plugins-dep/package/camomile/01_workaround-missing-premake.patch @@ -1,20 +1,24 @@ -diff --git a/scripts/premake-update.sh b/premake-update.sh -index 5290d5a..6db0525 100755 +diff --git a/scripts/premake-update.sh b/scripts/premake-update.sh +index 5290d5a..56fdde5 100755 --- a/scripts/premake-update.sh +++ b/scripts/premake-update.sh -@@ -26,9 +26,14 @@ if [ -d ../libs ]; then +@@ -26,9 +26,18 @@ if [ -d ../libs ]; then cd .. fi - -+if [ ! -f premake ]; then -+ mkdir tmp; cd tmp && wget --quiet http://archive.ubuntu.com/ubuntu/pool/universe/p/premake/premake_3.7-1_amd64.deb && dpkg -x premake_3.7-1_amd64.deb . && mv ./usr/bin/premake ../ && cd .. && rm -rf tmp + ++if ! which premake > /dev/null; then ++ if [ ! -f premake ]; then ++ mkdir tmp; cd tmp && wget --quiet http://archive.ubuntu.com/ubuntu/pool/universe/p/premake/premake_3.7-1_amd64.deb && dpkg -x premake_3.7-1_amd64.deb . && mv ./usr/bin/premake ../ && cd .. && rm -rf tmp ++ fi ++ PREMAKE=$(pwd)/premake ++else ++ PREMAKE=premake +fi -+PREMAKE=$(pwd)/premake + run_premake() { - premake --os $1 --target gnu --cc gcc + $PREMAKE --os $1 --target gnu --cc gcc - + if [ $MAC == 1 ]; then sed -i -e "s|BLDCMD = ar -rcs \$(OUTDIR)/\$(TARGET) \$(OBJECTS) \$(TARGET_ARCH)|BLDCMD = ar -rcs \$(OUTDIR)/\$(TARGET) \$(OBJECTS)|" `find . -name \*.make` diff --git a/plugins/package/distrho-ports-labs/01_workaround-missing-premake.patch b/plugins/package/distrho-ports-labs/01_workaround-missing-premake.patch index c4a60034..92f2f169 100644 --- a/plugins/package/distrho-ports-labs/01_workaround-missing-premake.patch +++ b/plugins/package/distrho-ports-labs/01_workaround-missing-premake.patch @@ -1,20 +1,24 @@ -diff --git a/scripts/premake-update.sh b/premake-update.sh -index 5290d5a..6db0525 100755 +diff --git a/scripts/premake-update.sh b/scripts/premake-update.sh +index 5290d5a..56fdde5 100755 --- a/scripts/premake-update.sh +++ b/scripts/premake-update.sh -@@ -26,9 +26,14 @@ if [ -d ../libs ]; then +@@ -26,9 +26,18 @@ if [ -d ../libs ]; then cd .. fi - -+if [ ! -f premake ]; then -+ mkdir tmp; cd tmp && wget --quiet http://archive.ubuntu.com/ubuntu/pool/universe/p/premake/premake_3.7-1_amd64.deb && dpkg -x premake_3.7-1_amd64.deb . && mv ./usr/bin/premake ../ && cd .. && rm -rf tmp + ++if ! which premake > /dev/null; then ++ if [ ! -f premake ]; then ++ mkdir tmp; cd tmp && wget --quiet http://archive.ubuntu.com/ubuntu/pool/universe/p/premake/premake_3.7-1_amd64.deb && dpkg -x premake_3.7-1_amd64.deb . && mv ./usr/bin/premake ../ && cd .. && rm -rf tmp ++ fi ++ PREMAKE=$(pwd)/premake ++else ++ PREMAKE=premake +fi -+PREMAKE=$(pwd)/premake + run_premake() { - premake --os $1 --target gnu --cc gcc + $PREMAKE --os $1 --target gnu --cc gcc - + if [ $MAC == 1 ]; then sed -i -e "s|BLDCMD = ar -rcs \$(OUTDIR)/\$(TARGET) \$(OBJECTS) \$(TARGET_ARCH)|BLDCMD = ar -rcs \$(OUTDIR)/\$(TARGET) \$(OBJECTS)|" `find . -name \*.make` diff --git a/plugins/package/mod-tal-noisemaker/01_workaround-missing-premake.patch b/plugins/package/mod-tal-noisemaker/01_workaround-missing-premake.patch index c4a60034..92f2f169 100644 --- a/plugins/package/mod-tal-noisemaker/01_workaround-missing-premake.patch +++ b/plugins/package/mod-tal-noisemaker/01_workaround-missing-premake.patch @@ -1,20 +1,24 @@ -diff --git a/scripts/premake-update.sh b/premake-update.sh -index 5290d5a..6db0525 100755 +diff --git a/scripts/premake-update.sh b/scripts/premake-update.sh +index 5290d5a..56fdde5 100755 --- a/scripts/premake-update.sh +++ b/scripts/premake-update.sh -@@ -26,9 +26,14 @@ if [ -d ../libs ]; then +@@ -26,9 +26,18 @@ if [ -d ../libs ]; then cd .. fi - -+if [ ! -f premake ]; then -+ mkdir tmp; cd tmp && wget --quiet http://archive.ubuntu.com/ubuntu/pool/universe/p/premake/premake_3.7-1_amd64.deb && dpkg -x premake_3.7-1_amd64.deb . && mv ./usr/bin/premake ../ && cd .. && rm -rf tmp + ++if ! which premake > /dev/null; then ++ if [ ! -f premake ]; then ++ mkdir tmp; cd tmp && wget --quiet http://archive.ubuntu.com/ubuntu/pool/universe/p/premake/premake_3.7-1_amd64.deb && dpkg -x premake_3.7-1_amd64.deb . && mv ./usr/bin/premake ../ && cd .. && rm -rf tmp ++ fi ++ PREMAKE=$(pwd)/premake ++else ++ PREMAKE=premake +fi -+PREMAKE=$(pwd)/premake + run_premake() { - premake --os $1 --target gnu --cc gcc + $PREMAKE --os $1 --target gnu --cc gcc - + if [ $MAC == 1 ]; then sed -i -e "s|BLDCMD = ar -rcs \$(OUTDIR)/\$(TARGET) \$(OBJECTS) \$(TARGET_ARCH)|BLDCMD = ar -rcs \$(OUTDIR)/\$(TARGET) \$(OBJECTS)|" `find . -name \*.make`