From: Dmitry V. Levin <ldv@altlinux.org>
Date: Tue, 30 May 2017 22:44:47 +0000 (+0000)
Subject: scno.am: include config.h before syscallent.h
X-Git-Tag: v4.18~144
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a25d7521ef70224dccb5eba56817047cd6053dca;p=strace

scno.am: include config.h before syscallent.h

This fixes generation of syscallent.i and subsequent scno.h files
on mips where syscallent.h checks macros defined in config.h.

* scno.am (syscallent.i): Add $(top_builddir)/config.h
to prerequisites, include it.
* NEWS: Mention this fix.

Reported-by: David Robins <dbrobins@i4031.net>
---

diff --git a/NEWS b/NEWS
index 8d0d4a5b..7503a4f4 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,7 @@ Noteworthy changes in release ?.?? (????-??-??)
   * When traced command is terminated by a blocked signal, strace unblocks
     that signal to ensure its own termination with the same signal.
   * Fixed corner cases in decoding of old sigaction syscall.
+  * Fixed build with old kernel headers on mips.
 
 Noteworthy changes in release 4.17 (2017-05-24)
 ===============================================
diff --git a/scno.am b/scno.am
index 12745f12..ee3db597 100644
--- a/scno.am
+++ b/scno.am
@@ -28,8 +28,8 @@
 SCNO_CPPFLAGS = $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 		$(ARCH_MFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS)
 
-syscallent.i: $(top_srcdir)/$(OS)/$(ARCH)/syscallent.h
-	$(CPP) -P $(SCNO_CPPFLAGS) $^ -o $@
+syscallent.i: $(top_builddir)/config.h $(top_srcdir)/$(OS)/$(ARCH)/syscallent.h
+	$(CPP) -P $(SCNO_CPPFLAGS) -include $^ -o $@
 
 digits = [[:digit:]][[:digit:]]*
 al_nums = [[:alnum:]_][[:alnum:]_]*