From 985e4f5f9e7d7c85cf0ef8c04f7883e8918bc83d Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Mon, 15 Dec 2014 23:58:21 +0000
Subject:  Test _XOPEN_SOURCE=700, fix include order in Makefile

---
 Makefile            |  2 +-
 configure           | 18 ++++++++++++++----
 package/targets.mak | 15 ++++++++-------
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index c8ff735..73d9cbb 100644
--- a/Makefile
+++ b/Makefile
@@ -9,8 +9,8 @@ it: all
 
 CC = $(error Please use ./configure first)
 
-include package/targets.mak
 -include config.mak
+include package/targets.mak
 include package/deps.mak
 
 version_m := $(basename $(version))
diff --git a/configure b/configure
index efe87d4..0647be0 100755
--- a/configure
+++ b/configure
@@ -119,7 +119,7 @@ tryldflag () {
 
 CC_AUTO="$CC"
 CFLAGS_AUTO="$CFLAGS"
-CPPFLAGS_AUTO="-D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=600 -O2 $CPPFLAGS"
+CPPFLAGS_AUTO="-D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -O2 $CPPFLAGS"
 LDFLAGS_AUTO="$LDFLAGS"
 LDFLAGS_NOSHARED=
 prefix=
@@ -344,9 +344,19 @@ if $allstatic ; then
   vpathd=
 fi
   echo "vpath lib%.so$vpathd"
-echo
-$static || echo "STATIC_LIBS :="
-$shared || echo "SHARED_LIBS :="
+echo "STATIC_LIBS :="
+echo "SHARED_LIBS :="
+if $static ; then
+  echo "DO_STATIC := 1"
+else
+  echo "DO_STATIC :="
+fi
+if $shared ; then
+  echo "DO_SHARED := 1"
+else
+  echo "DO_SHARED :="
+fi
+
 exec 1>&3 3>&-
 echo "  ... done."
 
diff --git a/package/targets.mak b/package/targets.mak
index 9387792..2373458 100644
--- a/package/targets.mak
+++ b/package/targets.mak
@@ -1,4 +1,4 @@
-BIN_TARGETS = \
+BIN_TARGETS := \
 s6-ftrigrd \
 s6-ftrig-listen1 \
 s6-ftrig-listen \
@@ -26,11 +26,12 @@ s6-softlimit \
 s6-tai64n \
 s6-tai64nlocal
 
-LIBEXEC_TARGETS = \
-s6lockd-helper
+LIBEXEC_TARGETS := s6lockd-helper
 
-SHARED_LIBS = \
-libs6.so
+ifdef DO_SHARED
+SHARED_LIBS := libs6.so
+endif
 
-STATIC_LIBS = \
-libs6.a
+ifdef DO_STATIC
+STATIC_LIBS := libs6.a
+endif
-- 
cgit v1.3.1