diff options
| author | Robin Gareus <robin@gareus.org> | 2020-01-22 00:47:33 +0100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2020-01-25 04:07:42 +0100 |
| commit | 5a841ef4624ef4b776e578af80d2397241754b00 (patch) | |
| tree | 792514a39b03e1f446faf6df7de555019f15d2d6 /tools | |
| parent | 06b2eb1c277c35e653b9117b194eadbb65dcbb66 (diff) | |
Tweaks to build/package scripts for new waf
* Windows: delete waf installed .dll.a files
* Windows: override waf's conf.env.LIBDIR = conf.env.BINDIR
with explicit --libdir
* Windows: fix asm (`x86_64-w64-mingw32-as` -D flag is for
debug messages, -D defines are not available)
* Mac: override waf adding -install_name (and
-Wl,-compatibility_version -Wl,-current_version)
by moving -dynamiclib from linkflags to ldflags
* Mac: Allow libs with compat version number suffix
(not needed anymore, but may help in the future)
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/osx_packaging/osx_build | 2 | ||||
| -rwxr-xr-x | tools/x-win/compile.sh | 3 | ||||
| -rwxr-xr-x | tools/x-win/package.sh | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build index f890cfe971..df6a2864a7 100755 --- a/tools/osx_packaging/osx_build +++ b/tools/osx_packaging/osx_build @@ -472,7 +472,7 @@ while [ true ] ; do strip -u -r -arch all $file &>/dev/null fi - deps=`otool -L $file | awk '{print $1}' | egrep "($GTKSTACK_ROOT|$ARDOURSTACK_ROOT|/opt/|/local/|libs/$STDCPP)" | grep -v 'libjack\.' | grep -v "$(basename $file)"` + deps=`otool -L $file | awk '{print $1}' | egrep "($GTKSTACK_ROOT|$ARDOURSTACK_ROOT|/opt/|/local/|libs/$STDCPP)" | grep -v 'libjack\.' | egrep -v "$(basename $file .dylib).*.dylib"` # echo -n "." for dep in $deps ; do base=`basename $dep` diff --git a/tools/x-win/compile.sh b/tools/x-win/compile.sh index 6f8e141685..00fe2737e2 100755 --- a/tools/x-win/compile.sh +++ b/tools/x-win/compile.sh @@ -81,7 +81,8 @@ DEPSTACK_ROOT="$PREFIX" \ --dist-target=mingw \ --also-include=${PREFIX}/include \ $ARDOURCFG \ - --prefix=${PREFIX} + --prefix=${PREFIX} \ + --libdir=${PREFIX}/lib ./waf ${CONCURRENCY} diff --git a/tools/x-win/package.sh b/tools/x-win/package.sh index 3dbfa6c248..dfbea0978a 100755 --- a/tools/x-win/package.sh +++ b/tools/x-win/package.sh @@ -202,6 +202,7 @@ cp gtk2_ardour/icons/cursor_square/* $DESTDIR/share/${LOWERCASE_DIRNAME}/icons/ # clean build-dir after depoyment echo " === bundle completed, cleaning up" ./waf uninstall +find $DESTDIR -name "*.dll.a" | xargs rm echo " === complete" du -sh $DESTDIR |