← Back to branch summary

~ubuntu-branches/ubuntu/wily/trafficserver/wily

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Package Import Robot
  • Author(s): Arno Töll
  • Date: 2011-12-11 00:45:45 UTC
  • mfrom: (5.1.3 sid)
  • Revision ID: package-import@ubuntu.com-20111211004545-5h7wnetmocctwqp0
Tags: 3.0.2-1
* New upstream release
  + Includes former Debian specific patch which makes sure the upstream
    configure script does not override any -O flags passed by the user
    anymore.
* Adapt to dpkg 1.16.1 API changes regarding build flags. This enables
  hardening build flags. This means, trafficserver is now being built with
  -fstack-protector and other security related build flags.
* Add dpkg-dev (>= 1.16.1~) to build-depends to make sure our buildflags are
  properly supported. That's guaranteed for Testing, but might be helpful to
  know for backporters.
* Fix several issues in the DEP-5 syntax. Unfortunately there is no way to
  express that a file is subject to different license agreements so far.
* Do not install the upstream changelog twice anymore
* Finally run regression checks again, now as build failures are sorted out.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
32
32
# Version number is calculated as MAJOR * 1000000 + MINOR * 1000 + MICRO
33
33
# Version string is in the form of MAJOR.MINOR.MICRO[sufix]
34
34
#
35
 
m4_define([TS_VERSION_S],[3.0.1])
 
35
m4_define([TS_VERSION_S],[3.0.2])
36
36
m4_define([TS_VERSION_N],[3000000])
37
37
 
38
38
AC_INIT([Apache Traffic Server], TS_VERSION_S(), [dev@trafficserver.apache.org], [trafficserver],[http://trafficserver.apache.org])
485
485
CFLAGS="${REAL_CFLAGS}"
486
486
CXXFLAGS="${REAL_CXXFLAGS}"
487
487
 
 
488
AC_MSG_CHECKING([checking whether to auto-set compile optimizing flags])
 
489
has_optimizer_flags=`$as_echo "$CFLAGS $CXXFLAGS" | ${AWK} '/-x?O.?/{print "no"}'`
 
490
AS_IF([test "x${has_optimizer_flags}" = "xno"],
 
491
        [ optimizing_flags='' ],
 
492
        [
 
493
                has_optimizer_flags='yes'
 
494
                optimizing_flags='-O3'
 
495
        ]
 
496
)
 
497
AC_MSG_RESULT([${has_optimizer_flags} ${optimizing_flags}])
 
498
 
488
499
base_cc=`basename $CC`
489
500
# These are shortcuts used in combination for the compiler options below
490
501
case $host_os in
509
520
      # TODO: We should try to eliminate more of these -wd exclusions.
510
521
      common_opt="-pipe -Wall -wd111 -wd279 -wd383 -wd522 -wd444 -wd873 -wd981 -wd1418 -wd1419 -wd1572 -wd1720 -wd2256 -wd2259"
511
522
      debug_opt="-ggdb3 $common_opt"
512
 
      release_opt="-g $common_opt -O2 -axsse4.2 -fno-strict-aliasing"
 
523
      release_opt="-g $common_opt $optimization_flags -axsse4.2 -fno-strict-aliasing"
513
524
      cxx_opt="-Wno-invalid-offsetof"
514
525
    else # gcc
515
526
    # This is useful for finding odd conversions
516
527
    #    common_opt="-pipe -Wall -Werror -Wconversion -Wno-sign-conversion"
517
528
      common_opt="-pipe -Wall -Werror"
518
529
      debug_opt="-ggdb3 $common_opt"
519
 
      release_opt="-g $common_opt -O3 -feliminate-unused-debug-symbols -fno-strict-aliasing"
 
530
      release_opt="-g $common_opt $optimizing_flags -feliminate-unused-debug-symbols -fno-strict-aliasing"
520
531
      cxx_opt="-Wno-invalid-offsetof"
521
532
    fi
522
533
    ;;
523
534
  darwin*)
524
535
    common_opt="-pipe -Wall -Werror"
525
536
    debug_opt="-ggdb3 $common_opt"
526
 
    release_opt="-g $common_opt -O3 -feliminate-unused-debug-symbols -fno-strict-aliasing"
 
537
    release_opt="-g $common_opt $optimizing_flags -feliminate-unused-debug-symbols -fno-strict-aliasing"
527
538
    cxx_opt="-Wno-invalid-offsetof"
528
539
    TS_ADDTO(CPPFLAGS, [-I/opt/local/include])
529
540
    TS_ADDTO(LDFLAGS, [-L/opt/local/lib])
531
542
  freebsd*|kfreebsd*)
532
543
    common_opt="-pipe -Wall -Werror"
533
544
    debug_opt="-ggdb3 $common_opt"
534
 
    release_opt="-g $common_opt -O3 -feliminate-unused-debug-symbols -fno-strict-aliasing"
 
545
    release_opt="-g $common_opt $optimizing_flags -feliminate-unused-debug-symbols -fno-strict-aliasing"
535
546
    cxx_opt="-Wno-invalid-offsetof"
536
547
    TS_ADDTO(LDFLAGS, [-L/usr/local/lib])
537
548
    ;;
539
550
    if test "x${base_cc}" = "xcc"; then
540
551
      common_opt="-mt -m64 -D__WORDSIZE=64" # FIXME: arch should be detected
541
552
      debug_opt="-g $common_opt"
542
 
      release_opt="-g $common_opt -xO3"
 
553
      release_opt="-g $common_opt $optimizing_flags"
543
554
      cxx_opt="-library=stlport4"
544
555
      cxx_dbg="+w2"
545
556
      cxx_rel="-erroff"
552
563
    else # gcc
553
564
      common_opt="-pipe -Wall -Werror"
554
565
      debug_opt="-ggdb3 $common_opt"
555
 
      release_opt="-g $common_opt -O3 -feliminate-unused-debug-symbols -fno-strict-aliasing"
 
566
      release_opt="-g $common_opt $optimizing_flags -feliminate-unused-debug-symbols -fno-strict-aliasing"
556
567
      cxx_opt="-Wno-invalid-offsetof"
557
568
    fi
558
569
    TS_ADDTO(LDFLAGS, [-L/lib])
561
572
  *)
562
573
    common_opt="-pipe -Wall -Werror"
563
574
    debug_opt="-ggdb3 $common_opt"
564
 
    release_opt="-g $common_opt -O3 -feliminate-unused-debug-symbols -fno-strict-aliasing"
 
575
    release_opt="-g $common_opt $optimizing_flags -feliminate-unused-debug-symbols -fno-strict-aliasing"
565
576
    cxx_opt="-Wno-invalid-offsetof"
566
577
    ;;
567
578
esac