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 869eedb03617cba09dc1a0e2499cc102b5a62aee..d2e429204d98d99f18c698107ecd36ee9e7bef70 100644 (file)
--- a/build-farm.conf.template
+++ b/build-farm.conf.template
@@ -17,6 +17,9 @@ use warnings;
 
 my $branch = $::branch;
 
+# This could be changed to use the standard layout but in a different place
+my $basedir = "$ENV{HOME}";
+
 # This template assumes that the user running the buildfarm process is "farm"
 my $farm_user_name = getpwuid($<) // die "$0: can't get user name from uid $<: $!\n";
 
@@ -41,9 +44,9 @@ our %conf =(
     tar_log_cmd => undef,
     # If running multiple animals, an explicit common directory for
     # the lockfile so that runs do not conflict. Otherwise, leave unset.
-    global_lock_dir => $ENV{HOME},
+    global_lock_dir => $basedir,
     # this directory must exist before anything will work
-    build_root => "$ENV{HOME}/buildfarm",
+    build_root => "$basedir/buildfarm",
     # set true to do vpath builds
     use_vpath => undef,
 
@@ -104,8 +107,10 @@ our %conf =(
     trigger_include => undef,
 
     # settings for mail notices - default to notifying nobody
+    # (putting the operator of the animal is a good idea)
     # these lists contain addresses to be notified
     # must be complete email addresses, as the email is sent from the server
+    # put single-quote (') around the address string
     mail_events =>{
         all => [], # unconditional
         fail => [], # if this build fails
@@ -119,7 +124,7 @@ our %conf =(
     build_env =>{
         # use a dedicated cache for the build farm. this should give us
         # very high hit rates and slightly faster cache searching.
-        CCACHE_DIR => "$ENV{HOME}/buildfarm/ccache/$branch",
+        CCACHE_DIR => "$basedir/buildfarm/ccache/$branch",
 
         ### set this if you need a proxy setting for the
         # outbound web transaction that reports the results
@@ -134,17 +139,18 @@ our %conf =(
     # previous definitions of variables.  Example:
     # LDFLAGS => '-Wall' will create LDFLAGS = '-Wall'
     makefile_set =>{
-        # comment out if not using ccache
-        CC => 'ccache gcc',
+        # uncomment to use ccache
+        #CC => 'ccache gcc',
         # Required for some tests to pass
         AUTH_PLAINTEXT => 'yes',
         SUPPORT_MAILDIR => 'yes',
         # Other examples. Could use makefile_regex instead.
         #
+       WITH_CONTENT_SCAN => 'yes',
         #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',
@@ -155,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',
     },
 
@@ -183,7 +190,6 @@ our %conf =(
         # May be outdated, please check a current EDITME for
         # for options.
         #q(s/^# (EXPERIMENTAL_CERTNAMES.*)/$1/),
-        #q(s/^# (EXPERIMENTAL_DNSSEC.*)/$1/),
     ],
 
     # The user compiled as the master exim username.
@@ -215,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')
@@ -234,4 +246,10 @@ if ($branch eq 'global')
 #
 ##################################
 
+# Eg:
+#if ($branch eq 'exim-4.90+fixes')
+#{
+#      $conf{makefile_set}{SUPPORT_DANE} = '';
+#}
+
 1;