Attachment #183636 for bug #218104




BROKEN_powerpc64=	Does not build

GNU_CONFIGURE=	yes
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




--- configure.ac.orig	2016-01-08 22:05:48 UTC
+++ configure.ac
@@ -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])

 
 AM_GNU_GETTEXT_VERSION([0.18])
 AM_GNU_GETTEXT([external])
@@ -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

Line 0 Link Here

(-)audacity-new/files/patch-include_audacity_Types.h (+11 lines)
	1	--- include/audacity/Types.h.orig 2017-03-13 21:02:21 UTC
	2	+++ include/audacity/Types.h
	3	@@ -70,7 +70,7 @@ public:
	4	sampleCount ( int v ) : value { v } {}
	5	sampleCount ( unsigned v ) : value { v } {}
	6	sampleCount ( long v ) : value { v } {}
	7	- sampleCount ( unsigned long v ) : value { v } {}
	8	+ sampleCount ( unsigned long v ) : value { static_cast<type>(v) } {}
	9
	10	// Beware implicit conversions from floating point values!
	11	// Otherwise the meaning of binary operators with sampleCount change




--- 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.

Return to bug 218104

Lines 21-32 Link Here

(-)audacity-new/Makefile (-2 / +1 lines)
21	BROKEN_powerpc64= Does not build	21	BROKEN_powerpc64= Does not build
22		22
23	GNU_CONFIGURE= yes	23	GNU_CONFIGURE= yes
24	USES= autoreconf compiler:gcc-c++11-lib cpe desktop-file-utils gettext-tools gmake iconv libtool pkgconfig shared-mime-info shebangfix dos2unix	24	USES= autoreconf compiler:c++11-lib cpe desktop-file-utils gettext-tools gmake iconv libtool pkgconfig shared-mime-info shebangfix dos2unix localbase
25	NLS_USES= gettext-runtime	25	NLS_USES= gettext-runtime
26	NLS_CONFIGURE_ENABLE= nls	26	NLS_CONFIGURE_ENABLE= nls
27	NLS_CONFIGURE_WITH= libintl-prefix="${LOCALBASE}"	27	NLS_CONFIGURE_WITH= libintl-prefix="${LOCALBASE}"
28	OPTIONS_SUB= yes	28	OPTIONS_SUB= yes
29	USE_GCC= 4.9+
30	USE_WX= 3.0+	29	USE_WX= 3.0+
31	WX_COMPS= wx	30	WX_COMPS= wx
32	INSTALLS_ICONS= yes	31	INSTALLS_ICONS= yes

Lines 1-6 Link Here

(-)audacity-new/files/patch-configure.ac (-2 / +24 lines)
1	--- configure.ac.orig 2016-01-08 22:05:48 UTC	1	--- configure.ac.orig 2016-01-08 22:05:48 UTC
2	+++ configure.ac	2	+++ configure.ac
3	@@ -43,6 +43,7 @@ AC_CONFIG_MACRO_DIR([m4])	3	@@ -43,6 +43,7 @@
4		4
5	AM_INIT_AUTOMAKE([1.9 dist-xz foreign no-dist-gzip subdir-objects -Wall -Wno-override tar-ustar])	5	AM_INIT_AUTOMAKE([1.9 dist-xz foreign no-dist-gzip subdir-objects -Wall -Wno-override tar-ustar])
6	AM_MAINTAINER_MODE([disable])	6	AM_MAINTAINER_MODE([disable])
Lines 8-14 Link Here
8		8
9	AM_GNU_GETTEXT_VERSION([0.18])	9	AM_GNU_GETTEXT_VERSION([0.18])
10	AM_GNU_GETTEXT([external])	10	AM_GNU_GETTEXT([external])
11	@@ -690,6 +691,7 @@ AC_CONFIG_FILES([	11	@@ -235,20 +236,7 @@
		12	dnl Solaris builds, by defining HAVE_ALLOCA_H
		13	AC_CHECK_HEADERS_ONCE(alloca.h)
		14
		15	-
		16	-dnl Enable C++ 11 support. Use gnu++11 on GCC since wxWidgets uses extensions
		17	-if test "${ax_cv_c_compiler_vendor}" = "gnu"; then
		18	-
		19	- dnl GCC < 4.9 has known bugs (#1397) and can't be used
		20	- AX_GCC_VERSION_ATLEAST(4,9,0,[gcc_ok=yes], [gcc_ok=no])
		21	- if test x$gcc_ok = xno; then
		22	- AC_MSG_ERROR([Audacity requires at least GCC 4.9])
		23	- fi
		24	-
		25	- CXXFLAGS="${CXXFLAGS} --std=gnu++11"
		26	-else
		27	- CXXFLAGS="${CXXFLAGS} --std=c++11"
		28	-fi
		29	+CXXFLAGS="${CXXFLAGS} --std=c++11"
		30
		31	dnl --------------------------------------------------------------------------
		32	dnl We would like warnings enabled on the builds, but different compilers need
		33	@@ -704,6 +692,7 @@
12	Makefile	34	Makefile
13	help/Makefile	35	help/Makefile
14	images/Makefile	36	images/Makefile

Line 0 Link Here

(-)audacity-new/files/patch-src_Audacity.h (+16 lines)
	1	--- src/Audacity.h.orig 2017-06-16 13:26:40 UTC
	2	+++ src/Audacity.h
	3	@@ -24,13 +24,6 @@
	4	#ifndef __AUDACITY_H__
	5	#define __AUDACITY_H__
	6
	7	-// If building with GNU compiler, then must be 4.9 or later.
	8	-// TODO: This would be much nicer as a standalone test in configure.ac
	9	-#if !defined(__APPLE__) && defined __GNUC__ && ( __GNUC__ < 4 \|\| (__GNUC__ == 4 && __GNUC_MINOR__ < 9))
	10	-#error insufficient compiler
	11	-#endif
	12	-
	13	-
	14	// We only do alpha builds and release versions.
	15	// Most of the time we're in development, so IS_ALPHA should be defined
	16	// to 1.