← Back to branch summary

~ubuntu-branches/debian/sid/subversion/sid

« back to all changes in this revision

Viewing changes to build/ac-macros/compiler.m4

  • Committer: Package Import Robot
  • Author(s): James McCoy
  • Date: 2015-08-07 21:32:47 UTC
  • mfrom: (0.2.15) (4.1.7 experimental)
  • Revision ID: package-import@ubuntu.com-20150807213247-ozyewtmgsr6tkewl
Tags: 1.9.0-1
http://bugs.debian.org/791844
* Upload to unstable
* New upstream release.
  + Security fixes
    - CVE-2015-3184: Mixed anonymous/authenticated path-based authz with
      httpd 2.4
    - CVE-2015-3187: svn_repos_trace_node_locations() reveals paths hidden
      by authz
* Add >= 2.7 requirement for python-all-dev Build-Depends, needed to run
  tests.
* Remove Build-Conflicts against ruby-test-unit.  (Closes: #791844)
* Remove patches/apache_module_dependency in favor of expressing the
  dependencies in authz_svn.load/dav_svn.load.
* Build-Depend on apache2-dev (>= 2.4.16) to ensure ap_some_authn_required()
  is available when building mod_authz_svn and Depend on apache2-bin (>=
  2.4.16) for runtime support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
build/ac-macros/compiler.m4
61
61
  CFLAGS_KEEP="$CFLAGS"
62
62
  CFLAGS=""
63
63
 
64
 
  dnl Find flags to force C90 mode
65
 
                dnl gcc and clang
66
 
  SVN_CFLAGS_ADD_IFELSE([-std=c90],[],[
67
 
    SVN_CFLAGS_ADD_IFELSE([-std=c89],[],[
68
 
      SVN_CFLAGS_ADD_IFELSE([-ansi])
 
64
  if test "$GCC" = "yes"; then
 
65
    dnl Find flags to force C90 mode
 
66
                  dnl gcc and clang
 
67
    SVN_CFLAGS_ADD_IFELSE([-std=c90],[],[
 
68
      SVN_CFLAGS_ADD_IFELSE([-std=c89],[],[
 
69
        SVN_CFLAGS_ADD_IFELSE([-ansi])
 
70
      ])
69
71
    ])
70
 
  ])
 
72
  fi
71
73
 
72
74
  CMODEFLAGS="$CFLAGS"
 
75
  CFLAGS=""
 
76
 
 
77
  if test "$GCC" = "yes"; then
 
78
    dnl Find flags to silence all warnings
 
79
    SVN_CFLAGS_ADD_IFELSE([-w])
 
80
  fi
 
81
 
 
82
  CNOWARNFLAGS="$CFLAGS"
73
83
  CFLAGS="$CFLAGS_KEEP"
 
84
 
74
85
  AC_SUBST(CMODEFLAGS)
 
86
  AC_SUBST(CNOWARNFLAGS)
75
87
  AC_SUBST(CMAINTAINERFLAGS)
 
88
  AC_SUBST(CUSERFLAGS)
76
89
 
77
 
  dnl Tell clang to not accept unknown warning flags
78
 
  SVN_CFLAGS_ADD_IFELSE([-Werror=unknown-warning-option])
 
90
  if test "$GCC" = "yes"; then
 
91
    dnl Tell clang to not accept unknown warning flags
 
92
    SVN_CFLAGS_ADD_IFELSE([-Werror=unknown-warning-option])
 
93
  fi
79
94
])
80
95
 
81
96
 
84
99
  CXXFLAGS_KEEP="$CXXFLAGS"
85
100
  CXXFLAGS=""
86
101
 
87
 
  dnl Find flags to force C++98 mode
88
 
                dnl g++ and clang++
89
 
  SVN_CXXFLAGS_ADD_IFELSE([-std=c++98])
 
102
  if test "$GXX" = "yes"; then
 
103
    dnl Find flags to force C++98 mode
 
104
                  dnl g++ and clang++
 
105
    SVN_CXXFLAGS_ADD_IFELSE([-std=c++98])
 
106
  fi
90
107
 
91
108
  CXXMODEFLAGS="$CXXFLAGS"
 
109
  CXXFLAGS=""
 
110
 
 
111
  if test "$GXX" = "yes"; then
 
112
    dnl Find flags to silence all warnings
 
113
    SVN_CXXFLAGS_ADD_IFELSE([-w])
 
114
  fi
 
115
 
 
116
  CXXNOWARNFLAGS="$CXXFLAGS"
92
117
  CXXFLAGS="$CXXFLAGS_KEEP"
 
118
 
93
119
  AC_SUBST(CXXMODEFLAGS)
 
120
  AC_SUBST(CXXNOWARNFLAGS)
94
121
  AC_SUBST(CXXMAINTAINERFLAGS)
 
122
  AC_SUBST(CXXUSERFLAGS)
95
123
 
96
 
  dnl Tell clang++ to not accept unknown warning flags
97
 
  SVN_CXXFLAGS_ADD_IFELSE([-Werror=unknown-warning-option])
 
124
  if test "$GXX" = "yes"; then
 
125
    dnl Tell clang++ to not accept unknown warning flags
 
126
    SVN_CXXFLAGS_ADD_IFELSE([-Werror=unknown-warning-option])
 
127
  fi
98
128
])