diff options
| author | Loïc Bartoletti <lbartoletti@FreeBSD.org> | 2020-10-12 06:26:20 +0000 |
|---|---|---|
| committer | Loïc Bartoletti <lbartoletti@FreeBSD.org> | 2020-10-12 06:26:20 +0000 |
| commit | cb9482f344ed8ee3e2e694fecf7519e994a648d0 (patch) | |
| tree | e333824935428dbaf979cd8fc1a6b025f4e0249e | |
| parent | Unbreak the build with -fno-common (Clang 11, GCC 10): looks like that (diff) | |
audio/ardour6: Fix broken 32-bit build
This fixes the Intel 32-bit build.
Modification of the original wscript file is no longer necessary.
Setting mmx and 3dnow compiler flags is not really needed.
Setting 3dnow can even be considered as a bug as this is a AMD only extension.
The build_host_supports_sse flag is only used to throw a warning if the set configuration doesn't match with the build machines configuration.
The warning can be ignored.
The build requires a SSE capable CPU (>=i686) which was also the case in previous versions.
PR: 250206
Submitted by: Michael Beer (maintainer)
Notes
Notes:
svn path=/head/; revision=552098
| -rw-r--r-- | audio/ardour6/Makefile | 8 | ||||
| -rw-r--r-- | audio/ardour6/files/patch-wscript | 25 |
2 files changed, 5 insertions, 28 deletions
diff --git a/audio/ardour6/Makefile b/audio/ardour6/Makefile index f932b00da2a0..2e2b3d1a5a86 100644 --- a/audio/ardour6/Makefile +++ b/audio/ardour6/Makefile @@ -3,7 +3,7 @@ PORTNAME= ardour6 PORTVERSION= 6.3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= https://github.com/beerml/ardour_releases/raw/master/ # The original master side points to the latest release only: @@ -41,6 +41,7 @@ LIB_DEPENDS= libserd-0.so:devel/serd \ libcurl.so:ftp/curl \ libogg.so:audio/libogg \ libFLAC.so:audio/flac \ + libSoundTouch.so:audio/soundtouch \ libwebsockets.so:net/libwebsockets USES= compiler:c++11-lang desktop-file-utils gettext gnome \ @@ -105,9 +106,10 @@ post-install: .include <bsd.port.pre.mk> .if ${ARCH} == "i386" -WITH_ARCH_FLAGS= --arch='-msse -mfpmath=sse' --dist-target=i386 +# only support for i686 or better +WITH_ARCH_FLAGS= --arch='-msse -mfpmath=sse -march=i686 -DARCH_X86' --dist-target=i686 .elif ${ARCH} == "amd64" -WITH_ARCH_FLAGS= --arch='-msse -mfpmath=sse' --dist-target=x86_64 +WITH_ARCH_FLAGS= --arch='-msse -mfpmath=sse -DARCH_X86' --dist-target=x86_64 .elif ${ARCH:Mpowerpc*} LLD_UNSAFE= yes .endif diff --git a/audio/ardour6/files/patch-wscript b/audio/ardour6/files/patch-wscript deleted file mode 100644 index bb8aeb50d316..000000000000 --- a/audio/ardour6/files/patch-wscript +++ /dev/null @@ -1,25 +0,0 @@ ---- wscript.orig 2020-07-08 18:34:29 UTC -+++ wscript -@@ -502,7 +502,7 @@ int main() { return 0; }''', - c_flags.append("-Qunused-arguments") - cxx_flags.append("-Qunused-arguments") - -- if (re.search ("(i[0-9]86|x86_64|AMD64)", cpu) != None) and conf.env['build_target'] != 'none': -+ if (re.search ("(i[0-9]86|x86_64|amd64|AMD64)", cpu) != None) and conf.env['build_target'] != 'none': - - # - # ARCH_X86 means anything in the x86 family from i386 to x86_64 -@@ -534,6 +534,13 @@ int main() { return 0; }''', - compiler_flags.append ("-march=i586") - elif cpu == "i686": - compiler_flags.append ("-march=i686") -+ -+ else : -+ # and cpu == 'amd64' : -+ # this is 20yo tech and present in all 64bit cpus -+ build_host_supports_sse = True -+ compiler_flags.append ("-mmmx") -+ compiler_flags.append ("-m3dnow") - - if not is_clang and ((conf.env['build_target'] == 'i686') or (conf.env['build_target'] == 'x86_64')) and build_host_supports_sse: - compiler_flags.extend ([ flags_dict['sse'], flags_dict['fpmath-sse'], flags_dict['xmmintrinsics'] ]) |