1*4882a593SmuzhiyunFrom ac9d057895f1e61f63cbecafcc3e3820fdb10f84 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Luca Saiu <positron@gnu.org> 3*4882a593SmuzhiyunDate: Fri, 30 Apr 2021 22:42:57 +0200 4*4882a593SmuzhiyunSubject: [PATCH] tentatively change --cppflags to omit -I prefix on 5*4882a593Smuzhiyun cross-compilation 6*4882a593Smuzhiyun 7*4882a593SmuzhiyunThe autoconf macros defined from jitter --cppflags get automatically changed, of 8*4882a593Smuzhiyuncourse. 9*4882a593Smuzhiyun 10*4882a593Smuzhiyun* configure.ac (JITTER_CROSS_COMPILING): New substitution. 11*4882a593Smuzhiyun 12*4882a593Smuzhiyun* bin/jitter-config.in.m4sh (main loop) <--cppflags>: Introduce conditional on 13*4882a593Smuzhiyunthe new substitution. 14*4882a593Smuzhiyun 15*4882a593SmuzhiyunSuggested by Romain Naour, after his difficulties with building GNU poke with 16*4882a593Smuzhiyunbuildroot. 17*4882a593Smuzhiyun 18*4882a593Smuzhiyun(cherry picked from commit 428406c7b8d4c20f3472d41ed57c12c1a88ad37e) 19*4882a593Smuzhiyun[Romain: 20*4882a593Smuzhiyun patch jitter-config.in instead of jitter-config.in.m4sh since 21*4882a593Smuzhiyun there is an issue while converting the M4sh m4sh script ( .in.m4sh ) 22*4882a593Smuzhiyun into a portable shell script ( .in ) ready to be processed by aclocal 23*4882a593Smuzhiyun for @-substitutions.] 24*4882a593Smuzhiyun 25*4882a593SmuzhiyunSigned-off-by: Romain Naour <romain.naour@gmail.com> 26*4882a593Smuzhiyun--- 27*4882a593Smuzhiyun jitter/bin/jitter-config.in | 10 +++++++--- 28*4882a593Smuzhiyun jitter/configure.ac | 1 + 29*4882a593Smuzhiyun 2 files changed, 8 insertions(+), 3 deletions(-) 30*4882a593Smuzhiyun 31*4882a593Smuzhiyundiff --git a/jitter/bin/jitter-config.in b/jitter/bin/jitter-config.in 32*4882a593Smuzhiyunindex 5e124f0..4bc508d 100644 33*4882a593Smuzhiyun--- a/jitter/bin/jitter-config.in 34*4882a593Smuzhiyun+++ b/jitter/bin/jitter-config.in 35*4882a593Smuzhiyun@@ -999,10 +999,14 @@ while test "$#" != "0"; do 36*4882a593Smuzhiyun --cppflags) 37*4882a593Smuzhiyun no_option_argument 38*4882a593Smuzhiyun append_to_output cppflags 39*4882a593Smuzhiyun- # Append a -I argument. This is defined separately from the rest, 40*4882a593Smuzhiyun- # as the installation prefix can be decided very late, at Jitter 41*4882a593Smuzhiyun+ # Unless cross-compiling, append a -I argument referring the 42*4882a593Smuzhiyun+ # installation path. This is defined separately from the rest, as 43*4882a593Smuzhiyun+ # the installation prefix can be decided very late, at Jitter 44*4882a593Smuzhiyun # installation time. 45*4882a593Smuzhiyun- output="$output -I $includedir";; 46*4882a593Smuzhiyun+ # (When cross-compiling this would be difficult to do correctly.) 47*4882a593Smuzhiyun+ if test "x@JITTER_CROSS_COMPILING@" != 'xyes'; then 48*4882a593Smuzhiyun+ output="$output -I $includedir" 49*4882a593Smuzhiyun+ fi;; 50*4882a593Smuzhiyun --ldadd) 51*4882a593Smuzhiyun no_option_argument 52*4882a593Smuzhiyun append_to_output ldadd;; 53*4882a593Smuzhiyundiff --git a/jitter/configure.ac b/jitter/configure.ac 54*4882a593Smuzhiyunindex 21d6937..fb12349 100644 55*4882a593Smuzhiyun--- a/jitter/configure.ac 56*4882a593Smuzhiyun+++ b/jitter/configure.ac 57*4882a593Smuzhiyun@@ -308,6 +308,7 @@ else 58*4882a593Smuzhiyun AC_MSG_RESULT([yes, cross-compiling from $build to $host .]) 59*4882a593Smuzhiyun jitter_cross_compiling=yes 60*4882a593Smuzhiyun fi 61*4882a593Smuzhiyun+AC_SUBST([JITTER_CROSS_COMPILING], [$jitter_cross_compiling]) 62*4882a593Smuzhiyun 63*4882a593Smuzhiyun # I never test on weird systems not supporting shebangs. 64*4882a593Smuzhiyun AC_SYS_INTERPRETER 65*4882a593Smuzhiyun-- 66*4882a593Smuzhiyun2.31.1 67*4882a593Smuzhiyun 68