From: Mike Frysinger <vapier@gentoo.org>
To: newlib@sourceware.org
Subject: [PATCH 5/5] newlib: phoenix: merge configure up to top-level
Date: Thu, 10 Feb 2022 03:51:26 -0500 [thread overview]
Message-ID: <20220210085126.21023-6-vapier@gentoo.org> (raw)
In-Reply-To: <20220210085126.21023-1-vapier@gentoo.org>
Merge sys/phoenix/ configure logic into libc/ itself. This kills
off the last lingering script in this tree (other than libc itself).
---
newlib/libc/Makefile.in | 3 +-
newlib/libc/argz/Makefile.in | 3 +-
newlib/libc/configure | 168 +-
newlib/libc/configure.ac | 3 +-
newlib/libc/ctype/Makefile.in | 3 +-
newlib/libc/errno/Makefile.in | 3 +-
newlib/libc/iconv/Makefile.in | 3 +-
newlib/libc/iconv/ccs/Makefile.in | 3 +-
newlib/libc/iconv/ccs/binary/Makefile.in | 3 +-
newlib/libc/iconv/ces/Makefile.in | 3 +-
newlib/libc/iconv/lib/Makefile.in | 3 +-
newlib/libc/locale/Makefile.in | 3 +-
newlib/libc/machine/a29k/Makefile.in | 3 +-
newlib/libc/machine/aarch64/Makefile.in | 3 +-
newlib/libc/machine/amdgcn/Makefile.in | 3 +-
newlib/libc/machine/arc/Makefile.in | 3 +-
newlib/libc/machine/arm/Makefile.in | 3 +-
newlib/libc/machine/bfin/Makefile.in | 3 +-
newlib/libc/machine/cr16/Makefile.in | 3 +-
newlib/libc/machine/cris/Makefile.in | 3 +-
newlib/libc/machine/crx/Makefile.in | 3 +-
newlib/libc/machine/csky/Makefile.in | 3 +-
newlib/libc/machine/d10v/Makefile.in | 3 +-
newlib/libc/machine/d30v/Makefile.in | 3 +-
newlib/libc/machine/epiphany/Makefile.in | 3 +-
newlib/libc/machine/fr30/Makefile.in | 3 +-
newlib/libc/machine/frv/Makefile.in | 3 +-
newlib/libc/machine/ft32/Makefile.in | 3 +-
newlib/libc/machine/h8300/Makefile.in | 3 +-
newlib/libc/machine/h8500/Makefile.in | 3 +-
newlib/libc/machine/hppa/Makefile.in | 3 +-
newlib/libc/machine/i386/Makefile.in | 3 +-
newlib/libc/machine/i960/Makefile.in | 3 +-
newlib/libc/machine/iq2000/Makefile.in | 3 +-
newlib/libc/machine/lm32/Makefile.in | 3 +-
newlib/libc/machine/m32c/Makefile.in | 3 +-
newlib/libc/machine/m32r/Makefile.in | 3 +-
newlib/libc/machine/m68hc11/Makefile.in | 3 +-
newlib/libc/machine/m68k/Makefile.in | 3 +-
newlib/libc/machine/m88k/Makefile.in | 3 +-
newlib/libc/machine/mep/Makefile.in | 3 +-
newlib/libc/machine/microblaze/Makefile.in | 3 +-
newlib/libc/machine/mips/Makefile.in | 3 +-
newlib/libc/machine/mn10200/Makefile.in | 3 +-
newlib/libc/machine/mn10300/Makefile.in | 3 +-
newlib/libc/machine/moxie/Makefile.in | 3 +-
newlib/libc/machine/msp430/Makefile.in | 3 +-
newlib/libc/machine/mt/Makefile.in | 3 +-
newlib/libc/machine/nds32/Makefile.in | 3 +-
newlib/libc/machine/necv70/Makefile.in | 3 +-
newlib/libc/machine/nios2/Makefile.in | 3 +-
newlib/libc/machine/nvptx/Makefile.in | 3 +-
newlib/libc/machine/or1k/Makefile.in | 3 +-
newlib/libc/machine/powerpc/Makefile.in | 3 +-
newlib/libc/machine/pru/Makefile.in | 3 +-
newlib/libc/machine/riscv/Makefile.in | 3 +-
newlib/libc/machine/rl78/Makefile.in | 3 +-
newlib/libc/machine/rx/Makefile.in | 3 +-
newlib/libc/machine/sh/Makefile.in | 3 +-
newlib/libc/machine/sparc/Makefile.in | 3 +-
newlib/libc/machine/spu/Makefile.in | 3 +-
newlib/libc/machine/tic4x/Makefile.in | 3 +-
newlib/libc/machine/tic6x/Makefile.in | 3 +-
newlib/libc/machine/tic80/Makefile.in | 3 +-
newlib/libc/machine/v850/Makefile.in | 3 +-
newlib/libc/machine/visium/Makefile.in | 3 +-
newlib/libc/machine/w65/Makefile.in | 3 +-
newlib/libc/machine/x86_64/Makefile.in | 3 +-
newlib/libc/machine/xc16x/Makefile.in | 3 +-
newlib/libc/machine/xstormy16/Makefile.in | 3 +-
newlib/libc/machine/z8k/Makefile.in | 3 +-
newlib/libc/misc/Makefile.in | 3 +-
newlib/libc/posix/Makefile.in | 3 +-
newlib/libc/reent/Makefile.in | 3 +-
newlib/libc/search/Makefile.in | 3 +-
newlib/libc/signal/Makefile.in | 3 +-
newlib/libc/ssp/Makefile.in | 3 +-
newlib/libc/stdio/Makefile.in | 3 +-
newlib/libc/stdio64/Makefile.in | 3 +-
newlib/libc/stdlib/Makefile.in | 3 +-
newlib/libc/string/Makefile.in | 3 +-
newlib/libc/sys/a29khif/Makefile.in | 3 +-
newlib/libc/sys/amdgcn/Makefile.in | 3 +-
newlib/libc/sys/arm/Makefile.in | 3 +-
newlib/libc/sys/d10v/Makefile.in | 3 +-
newlib/libc/sys/decstation/Makefile.in | 3 +-
newlib/libc/sys/epiphany/Makefile.in | 3 +-
newlib/libc/sys/h8300hms/Makefile.in | 3 +-
newlib/libc/sys/h8500hms/Makefile.in | 3 +-
newlib/libc/sys/m88kbug/Makefile.in | 3 +-
newlib/libc/sys/mmixware/Makefile.in | 3 +-
newlib/libc/sys/netware/Makefile.in | 3 +-
newlib/libc/sys/or1k/Makefile.in | 3 +-
newlib/libc/sys/phoenix/Makefile.am | 2 -
newlib/libc/sys/phoenix/Makefile.in | 97 +-
newlib/libc/sys/phoenix/acinclude.m4 | 10 +
newlib/libc/sys/phoenix/aclocal.m4 | 937 ---
newlib/libc/sys/phoenix/configure | 5504 -----------------
newlib/libc/sys/phoenix/configure.ac | 23 -
.../libc/sys/phoenix/machine/arm/Makefile.in | 32 +-
newlib/libc/sys/rdos/Makefile.in | 3 +-
newlib/libc/sys/rtems/Makefile.in | 3 +-
newlib/libc/sys/sh/Makefile.in | 3 +-
newlib/libc/sys/sparc64/Makefile.in | 3 +-
newlib/libc/sys/sun4/Makefile.in | 3 +-
newlib/libc/sys/sysmec/Makefile.in | 3 +-
newlib/libc/sys/sysnec810/Makefile.in | 3 +-
newlib/libc/sys/sysnecv850/Makefile.in | 3 +-
newlib/libc/sys/sysvi386/Makefile.in | 3 +-
newlib/libc/sys/sysvnecv70/Makefile.in | 3 +-
newlib/libc/sys/tic80/Makefile.in | 3 +-
newlib/libc/sys/tirtos/Makefile.in | 3 +-
newlib/libc/sys/w65/Makefile.in | 3 +-
newlib/libc/sys/z8ksim/Makefile.in | 3 +-
newlib/libc/syscalls/Makefile.in | 3 +-
newlib/libc/time/Makefile.in | 3 +-
newlib/libc/unix/Makefile.in | 3 +-
newlib/libc/xdr/Makefile.in | 3 +-
118 files changed, 319 insertions(+), 6784 deletions(-)
create mode 100644 newlib/libc/sys/phoenix/acinclude.m4
delete mode 100644 newlib/libc/sys/phoenix/aclocal.m4
delete mode 100644 newlib/libc/sys/phoenix/configure
delete mode 100644 newlib/libc/sys/phoenix/configure.ac
diff --git a/newlib/libc/configure.ac b/newlib/libc/configure.ac
index d762eb938ebf..a49fcaa45532 100644
--- a/newlib/libc/configure.ac
+++ b/newlib/libc/configure.ac
@@ -126,7 +126,7 @@ if test -n "${sys_dir}"; then
mmixware) AC_CONFIG_FILES([sys/mmixware/Makefile]) ;;
netware) AC_CONFIG_FILES([sys/netware/Makefile]) ;;
or1k) AC_CONFIG_FILES([sys/or1k/Makefile]) ;;
- phoenix) AC_CONFIG_SUBDIRS(sys/phoenix) ;;
+ phoenix) AC_CONFIG_FILES([sys/phoenix/Makefile]) ;;
rdos) AC_CONFIG_FILES([sys/rdos/Makefile]) ;;
rtems) AC_CONFIG_FILES([sys/rtems/Makefile]) ;;
sh) AC_CONFIG_FILES([sys/sh/Makefile]) ;;
@@ -164,6 +164,7 @@ m4_include([machine/nds32/acinclude.m4])
m4_include([machine/powerpc/acinclude.m4])
m4_include([machine/sh/acinclude.m4])
m4_include([machine/spu/acinclude.m4])
+m4_include([sys/phoenix/acinclude.m4])
LIBC_MACHINE_LIB=
if test -n "${machine_dir}"; then
diff --git a/newlib/libc/sys/phoenix/Makefile.am b/newlib/libc/sys/phoenix/Makefile.am
index d97ef77550c7..ecba00768643 100644
--- a/newlib/libc/sys/phoenix/Makefile.am
+++ b/newlib/libc/sys/phoenix/Makefile.am
@@ -113,8 +113,6 @@ crt0.o: $(PHOENIX_MACHINE_DIR)/crt0.o
$(PHOENIX_MACHINE_DIR)/crt0.o: ; @true
AM_CFLAGS = -I $(srcdir)/../../stdio
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(tooldir)/include/arpa; \
diff --git a/newlib/libc/sys/phoenix/acinclude.m4 b/newlib/libc/sys/phoenix/acinclude.m4
new file mode 100644
index 000000000000..fac0f6f20de2
--- /dev/null
+++ b/newlib/libc/sys/phoenix/acinclude.m4
@@ -0,0 +1,10 @@
+AS_IF([test "$sys_dir" = "phoenix"], [dnl
+ m4_foreach_w([MACHINE], [
+ arm
+ ], [dnl
+ AS_IF(test "${machine_dir}" = MACHINE, AC_CONFIG_FILES([sys/phoenix/machine/]MACHINE[/Makefile]))
+ ])
+
+ PHOENIX_MACHINE_DIR=machine/${machine_dir}
+])
+AC_SUBST(PHOENIX_MACHINE_DIR)
diff --git a/newlib/libc/sys/phoenix/configure.ac b/newlib/libc/sys/phoenix/configure.ac
deleted file mode 100644
index f7aafc00ab8c..000000000000
--- a/newlib/libc/sys/phoenix/configure.ac
+++ /dev/null
@@ -1,23 +0,0 @@
-dnl This is the newlib/libc/sys/phoenix configure.in file.
-dnl Process this file with autoconf to produce a configure script.
-
-AC_INIT([newlib],[NEWLIB_VERSION])
-AC_CONFIG_SRCDIR([phoenix.c])
-
-dnl Can't be done in NEWLIB_CONFIGURE because that confuses automake.
-AC_CONFIG_AUX_DIR(../../../..)
-
-NEWLIB_CONFIGURE(../../..)
-
-if test -n "${machine_dir}"; then
- case ${machine_dir} in
- arm) AC_CONFIG_FILES([machine/arm/Makefile]) ;;
- esac
-fi
-PHOENIX_MACHINE_DIR=machine/${machine_dir}
-AC_SUBST(PHOENIX_MACHINE_DIR)
-
-AM_CONDITIONAL(HAVE_MACHINE_DIR, test x${machine_dir} != x)
-
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
--
2.34.1
next prev parent reply other threads:[~2022-02-10 8:51 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-10 8:51 [PATCH 0/5] newlib: phoenix: kill off all subdir configure scripts Mike Frysinger
2022-02-10 8:51 ` [PATCH 1/5] newlib: phoenix: move some logic from configure to the Makefile Mike Frysinger
2022-02-10 8:51 ` [PATCH 2/5] newlib: phoenix: drop missing machine subdirs Mike Frysinger
2022-02-10 8:51 ` [PATCH 3/5] newlib: phoenix: merge machine/ trampoline up a level Mike Frysinger
2022-02-10 8:51 ` [PATCH 4/5] newlib: phoenix: merge machine/ configure scripts " Mike Frysinger
2022-02-10 8:51 ` Mike Frysinger [this message]
2022-02-15 13:38 ` [PATCH 0/5] newlib: phoenix: kill off all subdir configure scripts Corinna Vinschen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220210085126.21023-6-vapier@gentoo.org \
--to=vapier@gentoo.org \
--cc=newlib@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).