Attachment 183636 Details for Bug 218104 – patch to make audacity compile with clang

[patch] patch to make audacity compile with clang

audacity.txt (text/plain), 3.77 KB, created by Jack on 2017-06-19 23:57:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jack

Created: 2017-06-19 23:57:49 UTC

Size: 3.77 KB

patch

obsolete

>diff -urN audacity/Makefile audacity-new/Makefile
>--- audacity/Makefile	2017-06-19 16:53:56.249779000 -0700
>+++ audacity-new/Makefile	2017-06-19 15:57:47.116997000 -0700
>@@ -21,12 +21,11 @@
> BROKEN_powerpc64=	Does not build
> 
> GNU_CONFIGURE=	yes
>-USES=		autoreconf compiler:gcc-c++11-lib cpe desktop-file-utils gettext-tools gmake iconv libtool pkgconfig shared-mime-info shebangfix dos2unix
>+USES=		autoreconf compiler:c++11-lib cpe desktop-file-utils gettext-tools gmake iconv libtool pkgconfig shared-mime-info shebangfix dos2unix localbase
> NLS_USES=	gettext-runtime
> NLS_CONFIGURE_ENABLE=	nls
> NLS_CONFIGURE_WITH=	libintl-prefix="${LOCALBASE}"
> OPTIONS_SUB=	yes
>-USE_GCC=	4.9+
> USE_WX=		3.0+
> WX_COMPS=	wx
> INSTALLS_ICONS=	yes
>diff -urN audacity/files/patch-configure.ac audacity-new/files/patch-configure.ac
>--- audacity/files/patch-configure.ac	2017-06-19 16:53:56.253813000 -0700
>+++ audacity-new/files/patch-configure.ac	2017-06-19 16:06:33.347763000 -0700
>@@ -1,6 +1,6 @@
> --- configure.ac.orig	2016-01-08 22:05:48 UTC
> +++ configure.ac
>-@@ -43,6 +43,7 @@ AC_CONFIG_MACRO_DIR([m4])
>+@@ -43,6 +43,7 @@
>  
>  AM_INIT_AUTOMAKE([1.9 dist-xz foreign no-dist-gzip subdir-objects -Wall -Wno-override tar-ustar])
>  AM_MAINTAINER_MODE([disable])
>@@ -8,7 +8,29 @@
>  
>  AM_GNU_GETTEXT_VERSION([0.18])
>  AM_GNU_GETTEXT([external])
>-@@ -690,6 +691,7 @@ AC_CONFIG_FILES([
>+@@ -235,20 +236,7 @@
>+ dnl Solaris builds, by defining HAVE_ALLOCA_H
>+ AC_CHECK_HEADERS_ONCE(alloca.h)
>+ 
>+-
>+-dnl Enable C++ 11 support. Use gnu++11 on GCC since wxWidgets uses extensions
>+-if test "${ax_cv_c_compiler_vendor}" = "gnu"; then
>+-
>+-    dnl GCC < 4.9 has known bugs (#1397) and can't be used
>+-    AX_GCC_VERSION_ATLEAST(4,9,0,[gcc_ok=yes], [gcc_ok=no])
>+-    if test x$gcc_ok = xno; then
>+-        AC_MSG_ERROR([Audacity requires at least GCC 4.9])
>+-    fi
>+-
>+-    CXXFLAGS="${CXXFLAGS} --std=gnu++11"
>+-else
>+-    CXXFLAGS="${CXXFLAGS} --std=c++11"
>+-fi
>++CXXFLAGS="${CXXFLAGS} --std=c++11"
>+ 
>+ dnl --------------------------------------------------------------------------
>+ dnl We would like warnings enabled on the builds, but different compilers need
>+@@ -704,6 +692,7 @@
>     Makefile
>     help/Makefile
>     images/Makefile
>diff -urN audacity/files/patch-include_audacity_Types.h audacity-new/files/patch-include_audacity_Types.h
>--- audacity/files/patch-include_audacity_Types.h	1969-12-31 16:00:00.000000000 -0800
>+++ audacity-new/files/patch-include_audacity_Types.h	2017-06-19 15:56:30.856183000 -0700
>@@ -0,0 +1,11 @@
>+--- include/audacity/Types.h.orig	2017-03-13 21:02:21 UTC
>++++ include/audacity/Types.h
>+@@ -70,7 +70,7 @@ public:
>+    sampleCount ( int v ) : value { v } {}
>+    sampleCount ( unsigned v ) : value { v } {}
>+    sampleCount ( long v ) : value { v } {}
>+-   sampleCount ( unsigned long v ) : value { v } {}
>++   sampleCount ( unsigned long v ) : value { static_cast<type>(v) } {}
>+ 
>+    // Beware implicit conversions from floating point values!
>+    // Otherwise the meaning of binary operators with sampleCount change
>diff -urN audacity/files/patch-src_Audacity.h audacity-new/files/patch-src_Audacity.h
>--- audacity/files/patch-src_Audacity.h	1969-12-31 16:00:00.000000000 -0800
>+++ audacity-new/files/patch-src_Audacity.h	2017-06-19 15:56:30.856329000 -0700
>@@ -0,0 +1,16 @@
>+--- src/Audacity.h.orig	2017-06-16 13:26:40 UTC
>++++ src/Audacity.h
>+@@ -24,13 +24,6 @@
>+ #ifndef __AUDACITY_H__
>+ #define __AUDACITY_H__
>+ 
>+-// If building with GNU compiler, then must be 4.9 or later.
>+-// TODO: This would be much nicer as a standalone test in configure.ac
>+-#if !defined(__APPLE__) && defined __GNUC__ && ( __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 9))
>+-#error insufficient compiler
>+-#endif
>+-
>+-
>+ // We only do alpha builds and release versions.
>+ // Most of the time we're in development, so IS_ALPHA should be defined
>+ // to 1.

Actions: View | Diff

Attachments on bug 218104: 181176 | 181177 | 183543 | 183551 | 183636 | 183697 | 183724