[PATCH 1/3] newlib: export abs_newlib_basedir for all subdirs
Mike Frysinger
vapier@gentoo.org
Fri Jan 28 00:33:14 GMT 2022
When using the top-level configure script but subdir Makefiles, the
newlib_basedir value gets a bit out of sync: it's relative to where
configure lives, not where the Makefile lives. Move the abs setting
from the top-level configure script into acinclude.m4 so we can rely
on it being available everywhere. Although this commit doesn't use
it anywhere, just lays the groundwork.
---
newlib/Makefile.in | 1 +
newlib/acinclude.m4 | 3 +++
newlib/configure | 9 ++++++---
newlib/configure.ac | 1 -
newlib/libc/Makefile.in | 1 +
newlib/libc/argz/Makefile.in | 1 +
newlib/libc/configure | 8 ++++++--
newlib/libc/ctype/Makefile.in | 1 +
newlib/libc/errno/Makefile.in | 1 +
newlib/libc/iconv/Makefile.in | 1 +
newlib/libc/iconv/ccs/Makefile.in | 1 +
newlib/libc/iconv/ccs/binary/Makefile.in | 1 +
newlib/libc/iconv/ces/Makefile.in | 1 +
newlib/libc/iconv/lib/Makefile.in | 1 +
newlib/libc/locale/Makefile.in | 1 +
newlib/libc/machine/a29k/Makefile.in | 1 +
newlib/libc/machine/aarch64/Makefile.in | 1 +
newlib/libc/machine/amdgcn/Makefile.in | 1 +
newlib/libc/machine/arc/Makefile.in | 1 +
newlib/libc/machine/arm/Makefile.in | 1 +
newlib/libc/machine/bfin/Makefile.in | 1 +
newlib/libc/machine/cr16/Makefile.in | 1 +
newlib/libc/machine/cris/Makefile.in | 1 +
newlib/libc/machine/crx/Makefile.in | 1 +
newlib/libc/machine/csky/Makefile.in | 1 +
newlib/libc/machine/d10v/Makefile.in | 1 +
newlib/libc/machine/d30v/Makefile.in | 1 +
newlib/libc/machine/epiphany/Makefile.in | 1 +
newlib/libc/machine/fr30/Makefile.in | 1 +
newlib/libc/machine/frv/Makefile.in | 1 +
newlib/libc/machine/ft32/Makefile.in | 1 +
newlib/libc/machine/h8300/Makefile.in | 1 +
newlib/libc/machine/h8500/Makefile.in | 1 +
newlib/libc/machine/hppa/Makefile.in | 1 +
newlib/libc/machine/i386/Makefile.in | 1 +
newlib/libc/machine/i960/Makefile.in | 1 +
newlib/libc/machine/iq2000/Makefile.in | 1 +
newlib/libc/machine/lm32/Makefile.in | 1 +
newlib/libc/machine/m32c/Makefile.in | 1 +
newlib/libc/machine/m32r/Makefile.in | 1 +
newlib/libc/machine/m68hc11/Makefile.in | 1 +
newlib/libc/machine/m68k/Makefile.in | 1 +
newlib/libc/machine/m88k/Makefile.in | 1 +
newlib/libc/machine/mep/Makefile.in | 1 +
newlib/libc/machine/microblaze/Makefile.in | 1 +
newlib/libc/machine/mips/Makefile.in | 1 +
newlib/libc/machine/mn10200/Makefile.in | 1 +
newlib/libc/machine/mn10300/Makefile.in | 1 +
newlib/libc/machine/moxie/Makefile.in | 1 +
newlib/libc/machine/msp430/Makefile.in | 1 +
newlib/libc/machine/mt/Makefile.in | 1 +
newlib/libc/machine/nds32/Makefile.in | 1 +
newlib/libc/machine/necv70/Makefile.in | 1 +
newlib/libc/machine/nios2/Makefile.in | 1 +
newlib/libc/machine/nvptx/Makefile.in | 1 +
newlib/libc/machine/or1k/Makefile.in | 1 +
newlib/libc/machine/powerpc/Makefile.in | 1 +
newlib/libc/machine/pru/Makefile.in | 1 +
newlib/libc/machine/riscv/Makefile.in | 1 +
newlib/libc/machine/rl78/Makefile.in | 1 +
newlib/libc/machine/rx/Makefile.in | 1 +
newlib/libc/machine/sh/Makefile.in | 1 +
newlib/libc/machine/sparc/Makefile.in | 1 +
newlib/libc/machine/spu/Makefile.in | 1 +
newlib/libc/machine/tic4x/Makefile.in | 1 +
newlib/libc/machine/tic6x/Makefile.in | 1 +
newlib/libc/machine/tic80/Makefile.in | 1 +
newlib/libc/machine/v850/Makefile.in | 1 +
newlib/libc/machine/visium/Makefile.in | 1 +
newlib/libc/machine/w65/Makefile.in | 1 +
newlib/libc/machine/x86_64/Makefile.in | 1 +
newlib/libc/machine/xc16x/Makefile.in | 1 +
newlib/libc/machine/xstormy16/Makefile.in | 1 +
newlib/libc/machine/z8k/Makefile.in | 1 +
newlib/libc/misc/Makefile.in | 1 +
newlib/libc/posix/Makefile.in | 1 +
newlib/libc/reent/Makefile.in | 1 +
newlib/libc/search/Makefile.in | 1 +
newlib/libc/signal/Makefile.in | 1 +
newlib/libc/ssp/Makefile.in | 1 +
newlib/libc/stdio/Makefile.in | 1 +
newlib/libc/stdio64/Makefile.in | 1 +
newlib/libc/stdlib/Makefile.in | 1 +
newlib/libc/string/Makefile.in | 1 +
newlib/libc/sys/a29khif/Makefile.in | 1 +
newlib/libc/sys/amdgcn/Makefile.in | 1 +
newlib/libc/sys/arm/Makefile.in | 1 +
newlib/libc/sys/d10v/Makefile.in | 1 +
newlib/libc/sys/decstation/Makefile.in | 1 +
newlib/libc/sys/epiphany/Makefile.in | 1 +
newlib/libc/sys/h8300hms/Makefile.in | 1 +
newlib/libc/sys/h8500hms/Makefile.in | 1 +
newlib/libc/sys/linux/Makefile.in | 1 +
newlib/libc/sys/linux/argp/Makefile.in | 1 +
newlib/libc/sys/linux/cmath/Makefile.in | 1 +
newlib/libc/sys/linux/configure | 8 ++++++--
newlib/libc/sys/linux/dl/Makefile.in | 1 +
newlib/libc/sys/linux/iconv/Makefile.in | 1 +
newlib/libc/sys/linux/intl/Makefile.in | 1 +
newlib/libc/sys/linux/linuxthreads/Makefile.in | 1 +
newlib/libc/sys/linux/linuxthreads/configure | 8 ++++++--
newlib/libc/sys/linux/linuxthreads/machine/Makefile.in | 1 +
newlib/libc/sys/linux/linuxthreads/machine/configure | 8 ++++++--
.../libc/sys/linux/linuxthreads/machine/i386/Makefile.in | 1 +
.../libc/sys/linux/linuxthreads/machine/i386/configure | 8 ++++++--
newlib/libc/sys/linux/machine/Makefile.in | 1 +
newlib/libc/sys/linux/machine/configure | 8 ++++++--
newlib/libc/sys/linux/machine/i386/Makefile.in | 1 +
newlib/libc/sys/linux/machine/i386/configure | 8 ++++++--
newlib/libc/sys/linux/net/Makefile.in | 1 +
newlib/libc/sys/m88kbug/Makefile.in | 1 +
newlib/libc/sys/mmixware/Makefile.in | 1 +
newlib/libc/sys/netware/Makefile.in | 1 +
newlib/libc/sys/or1k/Makefile.in | 1 +
newlib/libc/sys/phoenix/Makefile.in | 1 +
newlib/libc/sys/phoenix/configure | 4 ++++
newlib/libc/sys/phoenix/machine/Makefile.in | 1 +
newlib/libc/sys/phoenix/machine/arm/Makefile.in | 1 +
newlib/libc/sys/phoenix/machine/arm/configure | 4 ++++
newlib/libc/sys/phoenix/machine/configure | 4 ++++
newlib/libc/sys/rdos/Makefile.in | 1 +
newlib/libc/sys/rtems/Makefile.in | 1 +
newlib/libc/sys/sh/Makefile.in | 1 +
newlib/libc/sys/sparc64/Makefile.in | 1 +
newlib/libc/sys/sun4/Makefile.in | 1 +
newlib/libc/sys/sysmec/Makefile.in | 1 +
newlib/libc/sys/sysnec810/Makefile.in | 1 +
newlib/libc/sys/sysnecv850/Makefile.in | 1 +
newlib/libc/sys/sysvi386/Makefile.in | 1 +
newlib/libc/sys/sysvnecv70/Makefile.in | 1 +
newlib/libc/sys/tic80/Makefile.in | 1 +
newlib/libc/sys/tirtos/Makefile.in | 1 +
newlib/libc/sys/w65/Makefile.in | 1 +
newlib/libc/sys/z8ksim/Makefile.in | 1 +
newlib/libc/syscalls/Makefile.in | 1 +
newlib/libc/time/Makefile.in | 1 +
newlib/libc/unix/Makefile.in | 1 +
newlib/libc/xdr/Makefile.in | 1 +
newlib/libm/Makefile.in | 1 +
newlib/libm/common/Makefile.in | 1 +
newlib/libm/complex/Makefile.in | 1 +
newlib/libm/configure | 8 ++++++--
newlib/libm/fenv/Makefile.in | 1 +
newlib/libm/machine/aarch64/Makefile.in | 1 +
newlib/libm/machine/arm/Makefile.in | 1 +
newlib/libm/machine/i386/Makefile.in | 1 +
newlib/libm/machine/mips/Makefile.in | 1 +
newlib/libm/machine/nds32/Makefile.in | 1 +
newlib/libm/machine/powerpc/Makefile.in | 1 +
newlib/libm/machine/pru/Makefile.in | 1 +
newlib/libm/machine/riscv/Makefile.in | 1 +
newlib/libm/machine/sparc/Makefile.in | 1 +
newlib/libm/machine/spu/Makefile.in | 1 +
newlib/libm/machine/x86_64/Makefile.in | 1 +
newlib/libm/math/Makefile.in | 1 +
newlib/libm/mathfp/Makefile.in | 1 +
156 files changed, 211 insertions(+), 20 deletions(-)
diff --git a/newlib/acinclude.m4 b/newlib/acinclude.m4
index 755f6e1165f0..888d417943e3 100644
--- a/newlib/acinclude.m4
+++ b/newlib/acinclude.m4
@@ -109,6 +109,9 @@ else
fi
AC_SUBST(newlib_basedir)
+abs_newlib_basedir=`cd "${newlib_basedir}" && pwd`
+AC_SUBST(abs_newlib_basedir)
+
AC_CANONICAL_HOST
AM_INIT_AUTOMAKE([foreign no-installinfo no-dependencies no-dist no-define subdir-objects 1.15.1])
diff --git a/newlib/configure.ac b/newlib/configure.ac
index 13f318922605..3758739ad40a 100644
--- a/newlib/configure.ac
+++ b/newlib/configure.ac
@@ -315,7 +315,6 @@ AM_CONDITIONAL(NEWLIB_HW_FP, test x$newlib_hw_fp = xtrue)
# These get added in the top-level configure.in, except in the case where
# newlib is being built natively.
LIBC_INCLUDE_GREP=`echo ${CC} | grep \/libc\/include`
-abs_newlib_basedir=`cd ${newlib_basedir} && pwd`
if test -z "${LIBC_INCLUDE_GREP}"; then
CC_FOR_NEWLIB="${CC} -I$PWD/targ-include -I${abs_newlib_basedir}/libc/include"
else
--
2.34.1
More information about the Newlib
mailing list