diff options
| author | Robin Gareus <robin@gareus.org> | 2015-12-17 20:18:32 +0100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2015-12-17 20:18:32 +0100 |
| commit | fa9c410b5c0af7dcb8b452220c809fc08c7659ba (patch) | |
| tree | 8969c89c69ccac66c55e77dca29f729805b3e9f1 | |
| parent | 803ad98c7c21828688806aa2593d9978ddf1f165 (diff) | |
vin chaud.
get it while it's hot.
| -rwxr-xr-x | tools/linux_packaging/build | 4 | ||||
| -rwxr-xr-x | tools/linux_packaging/stage2.run.in | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build index f397386133..f25cd2fc4a 100755 --- a/tools/linux_packaging/build +++ b/tools/linux_packaging/build @@ -469,8 +469,8 @@ while [ true ] ; do # ignore suil/qt wrappers - the plugin will pull in QT4. if echo $file | grep -qs 'libsuil_.*qt4' ; then continue; fi - # do not include libjack - deps=`LD_LIBRARY_PATH=$OURLIBS${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} ldd $file | awk '{print $3}'` + # do not include libjack, nor libwine + deps=`LD_LIBRARY_PATH=$OURLIBS${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} ldd $file | grep -v libwine.so | awk '{print $3}'` echo -n "." for dep in $deps ; do diff --git a/tools/linux_packaging/stage2.run.in b/tools/linux_packaging/stage2.run.in index ba8e280a3a..a04acc54e6 100755 --- a/tools/linux_packaging/stage2.run.in +++ b/tools/linux_packaging/stage2.run.in @@ -314,7 +314,7 @@ else fi if %REPLACE_WINE%; then - if -z "`which wine`"; then + if test -z "`which wine`"; then echo "" echo "!!! ERROR !!! - 'wine' was not found." echo "" @@ -393,8 +393,7 @@ fi ################################################# if %REPLACE_WINE%; then echo "" - echo "Searching for libwine.so (Windows VST support)" - echo "" + echo "Searching libwine.so (Windows VST support)" # we need to add libwine to ardour's LD_LIBRARY_PATH # libwine itself includes paths to the various system-components # which may be different on each platform. @@ -424,6 +423,7 @@ if %REPLACE_WINE%; then read -p "Press ENTER to exit installer:" BLAH exit 1 fi + echo "Using: $LIBWINE" # this replaces/overwrites the bundled libwine cp -L "$LIBWINE" `pwd`/${BUNDLE_DIR}/lib/libwine.so.1 fi |