Revert "Move -stc=c99 to CFLAGS restricted to only 4.next"

[buildfarm-client.git] / build-farm.conf.template

diff --git a/build-farm.conf.template b/build-farm.conf.template
index eb856176dc96c4982e33651fd59523ae7880b6b5..d2e429204d98d99f18c698107ecd36ee9e7bef70 100644 (file)
--- a/build-farm.conf.template
+++ b/build-farm.conf.template
@@ -150,7 +150,7 @@ our %conf =(
         #SUPPORT_TLS => 'yes',
         #  Enable the proper libs here or see in makefile_regex
         #  for use of pkg-config
-        #USE_GNUTLS => 'yes'
+        #USE_GNUTLS => 'yes',
         #TLS_LIBS => '-lssl -lcrypto',
         #
         #LOOKUP_LDAP => 'yes',
@@ -161,19 +161,20 @@ our %conf =(
         #LOOKUP_PGSQL => 'yes',
         #SUPPORT_PROXY => 'yes',
         #SUPPORT_SOCKS => 'yes',
-        #EXPERIMENTAL_SPF => 'yes',
-        #EXPERIMENTAL_DANE => 'yes',
+        #SUPPORT_SPF => 'yes',
+        #SUPPORT_DANE => 'yes',
     },
     # Settings to add to Local/Makefile. These will add to variables that
     # are already defined earlier in the Makefile.  Example:
     # LDFLAGS => '-Wall'  will create  LDFLAGS+='-Wall'
     makefile_add =>{
         # Show all warnings and errors
-        CFLAGS => '-Wall -Werror=format-security',
+       # Some platforms need the c99 setting enabled
+        CFLAGS => '-std=c99 -Wall -Wno-parentheses -Werror=format-security',
         # Or enable debugging flags
         #CFLAGS => '-g -Wall',
         #LFLAGS => '-g',
-        # If set EXPERIMENTAL_SPF above, add it to the linker:
+        # If set SUPPORT_SPF above, add it to the linker:
         #LDFLAGS => '-lspf2',
     },
 
@@ -220,6 +221,12 @@ our %conf =(
         qw()
     ],
 
+    # Configuration tuning for test suite ./configure
+    test_configure_env => {},
+    test_configure_args => [],
+    # Configuration tuning for test suite run
+    # eg. test_run_args = '-FLAVOUR openssl_1_1_1',
+    test_run_args => '',       
 );
 
 if ($branch eq 'global')
@@ -239,4 +246,10 @@ if ($branch eq 'global')
 #
 ##################################
 
+# Eg:
+#if ($branch eq 'exim-4.90+fixes')
+#{
+#      $conf{makefile_set}{SUPPORT_DANE} = '';
+#}
+
 1;