| Message ID | 20181211054926.56717-2-aik@ozlabs.ru |
|---|---|
| State | New |
| Headers | show |
| Series | ppc/spapr: Receive and store device tree blob from SLOF | expand |
On Tue, Dec 11, 2018 at 04:49:24PM +1100, Alexey Kardashevskiy wrote: > The libfdt installed in the system is preferred to the dtc submodule by > default. The recent libfdt update added a new symbol - fdt_check_full - > and this breaks compile if there is an older libfdt installed in > the system. AFACT, there's no usage of fdt_check_full in the QMEU tree, so this commit message is wrong. The first usage is introduced in your next patch, so this configure change should just be part of that patch which introduces it. > > This changes the test to force ./configure into using newer libfdt. > > Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> > --- > configure | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/configure b/configure > index 0a3c6a7..e5312da 100755 > --- a/configure > +++ b/configure > @@ -3880,7 +3880,7 @@ if test "$fdt" != "no" ; then > cat > $TMPC << EOF > #include <libfdt.h> > #include <libfdt_env.h> > -int main(void) { fdt_first_subnode(0, 0); return 0; } > +int main(void) { fdt_check_full(NULL, 0); return 0; } > EOF > if compile_prog "" "$fdt_libs" ; then > # system DTC is good - use it > -- > 2.17.1 > Regards, Daniel
On Tue, 11 Dec 2018 16:49:24 +1100 Alexey Kardashevskiy <aik@ozlabs.ru> wrote: > The libfdt installed in the system is preferred to the dtc submodule by > default. The recent libfdt update added a new symbol - fdt_check_full - > and this breaks compile if there is an older libfdt installed in > the system. > > This changes the test to force ./configure into using newer libfdt. > > Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> > --- Yeah I had noticed that also... I agree with Daniel that it should be folded into the next patch. > configure | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/configure b/configure > index 0a3c6a7..e5312da 100755 > --- a/configure > +++ b/configure > @@ -3880,7 +3880,7 @@ if test "$fdt" != "no" ; then > cat > $TMPC << EOF > #include <libfdt.h> > #include <libfdt_env.h> > -int main(void) { fdt_first_subnode(0, 0); return 0; } > +int main(void) { fdt_check_full(NULL, 0); return 0; } > EOF > if compile_prog "" "$fdt_libs" ; then > # system DTC is good - use it
diff --git a/configure b/configure index 0a3c6a7..e5312da 100755 --- a/configure +++ b/configure @@ -3880,7 +3880,7 @@ if test "$fdt" != "no" ; then cat > $TMPC << EOF #include <libfdt.h> #include <libfdt_env.h> -int main(void) { fdt_first_subnode(0, 0); return 0; } +int main(void) { fdt_check_full(NULL, 0); return 0; } EOF if compile_prog "" "$fdt_libs" ; then # system DTC is good - use it
The libfdt installed in the system is preferred to the dtc submodule by default. The recent libfdt update added a new symbol - fdt_check_full - and this breaks compile if there is an older libfdt installed in the system. This changes the test to force ./configure into using newer libfdt. Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)