From 129a05f5a6a60be4b2037f2b6d72711cfdbb1908 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Sun, 24 Feb 2019 21:00:34 +0000 Subject: Build everything as PIC by default ; prepare for 2.3.0.2 --- COPYING | 2 +- INSTALL | 2 +- NEWS | 7 +++++++ configure | 21 +++++---------------- doc/index.html | 4 ++-- doc/upgrade.html | 10 ++++++++++ package/info | 2 +- 7 files changed, 27 insertions(+), 21 deletions(-) diff --git a/COPYING b/COPYING index 1629e84..f019bc7 100644 --- a/COPYING +++ b/COPYING @@ -1,4 +1,4 @@ -Copyright (c) 2011-2018 Laurent Bercot +Copyright (c) 2011-2019 Laurent Bercot Permission to use, copy, modify, and distribute this software for any purpose with or without fee is hereby granted, provided that the above diff --git a/INSTALL b/INSTALL index 88d50d4..f61d1ad 100644 --- a/INSTALL +++ b/INSTALL @@ -6,7 +6,7 @@ Build Instructions - A POSIX-compliant C development environment - GNU make version 3.81 or later - - skalibs version 2.7.0.0 or later: http://skarnet.org/software/skalibs/ + - skalibs version 2.8.0.0 or later: http://skarnet.org/software/skalibs/ This software will run on any operating system that implements POSIX.1-2008, available at: diff --git a/NEWS b/NEWS index eb2e00b..5c7a6a6 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,12 @@ Changelog for s6-dns. +In 2.3.0.2 +---------- + + - Adaptation to skalibs-2.8.0.0. + - Everything now builds as PIC by default. + + In 2.3.0.1 ---------- diff --git a/configure b/configure index 9686932..b5d01ee 100755 --- a/configure +++ b/configure @@ -40,7 +40,7 @@ Optional features: --disable-static do not build static libraries [enabled] --disable-allstatic do not prefer linking against static libraries [enabled] --enable-static-libc make entirely static binaries [disabled] - --enable-all-pic build everything as PIC [enabled iff toolchain builds PIE] + --disable-all-pic do not build executables or static libs as PIC [enabled] --enable-slashpackage[=ROOT] assume /package installation at ROOT [disabled] --enable-absolute-paths do not rely on PATH to access this package's binaries, hardcode absolute BINDIR/foobar paths instead [disabled] @@ -143,7 +143,7 @@ sysdeps='$prefix/lib/skalibs/sysdeps' manualsysdeps=false shared=false static=true -allpic=detect +allpic=true slashpackage=false abspath=false sproot= @@ -303,20 +303,6 @@ if [ "x$target" != "x$(cat $sysdeps/target)" ] ; then exit 1 fi -if test $allpic = detect ; then - echo "Checking whether we need to build everything as PIC..." - if $CC_AUTO $CPPFLAGS_AUTO $CPPFLAGS $CPPFLAGS_POST $CFLAGS_AUTO $CFLAGS $CFLAGS_POST -dM -E - < /dev/null | grep -qF __PIE__ ; then - allpic=true - echo " ... yes" - else - allpic=false - echo " ... no" - fi -fi -if $allpic ; then - tryflag CFLAGS_AUTO -fPIC -fi - spawn_lib=$(cat $sysdeps/spawn.lib) socket_lib=$(cat $sysdeps/socket.lib) sysclock_lib=$(cat $sysdeps/sysclock.lib) @@ -324,6 +310,9 @@ tainnow_lib=$(cat $sysdeps/tainnow.lib) timer_lib=$(cat $sysdeps/timer.lib) util_lib=$(cat $sysdeps/util.lib) +if $allpic ; then + tryflag CPPFLAGS_AUTO -fPIC +fi tryflag CFLAGS_AUTO -std=c99 tryflag CFLAGS -fomit-frame-pointer tryflag CFLAGS_AUTO -fno-exceptions diff --git a/doc/index.html b/doc/index.html index 51c6aae..8d7b722 100644 --- a/doc/index.html +++ b/doc/index.html @@ -46,7 +46,7 @@ point in the future.
  • A POSIX-compliant system with a standard C development environment
  • GNU make, version 3.81 or later
  • skalibs version -2.7.0.0 or later
    • +2.8.0.0 or later

    Licensing

    @@ -59,7 +59,7 @@ point in the future.

    Download

      -
    • The current released version of s6-dns is 2.3.0.1.
      • +
    • The current released version of s6-dns is 2.3.0.2.
    • Alternatively, you can checkout a copy of the s6-dns git repository: diff --git a/doc/upgrade.html b/doc/upgrade.html index 6912610..481e4f9 100644 --- a/doc/upgrade.html +++ b/doc/upgrade.html @@ -18,6 +18,16 @@

      What has changed in s6-dns

      +

      in 2.3.0.2

      + +
        +
      • skalibs +dependency bumped to 2.8.0.0.
        • +
      • Everything now builds as PIC by default no matter +the toolchain's settings. Use the --disable-all-pic configure +option to build executables and static libraries as non-PIC.
        • +
      +

      in 2.3.0.1

        diff --git a/package/info b/package/info index ce9f66c..f1c8a95 100644 --- a/package/info +++ b/package/info @@ -1,4 +1,4 @@ package=s6-dns -version=2.3.0.1 +version=2.3.0.2 category=web package_macro_name=S6_DNS -- cgit v1.2.3