From: Mike Frysinger <vapier@gentoo.org>
To: newlib@sourceware.org
Subject: [PATCH 4/5] newlib: phoenix: merge machine/ configure scripts up a level
Date: Thu, 10 Feb 2022 03:51:25 -0500 [thread overview]
Message-ID: <20220210085126.21023-5-vapier@gentoo.org> (raw)
In-Reply-To: <20220210085126.21023-1-vapier@gentoo.org>
The machine configure scripts are all effectively stub scripts that
pass the higher level options to its own makefile.
---
newlib/libc/sys/phoenix/Makefile.in | 1 -
newlib/libc/sys/phoenix/configure | 154 +-
newlib/libc/sys/phoenix/configure.ac | 2 +-
.../libc/sys/phoenix/machine/arm/Makefile.am | 10 -
.../libc/sys/phoenix/machine/arm/Makefile.in | 90 +-
.../libc/sys/phoenix/machine/arm/aclocal.m4 | 937 ---
newlib/libc/sys/phoenix/machine/arm/configure | 5478 -----------------
.../libc/sys/phoenix/machine/arm/configure.ac | 13 -
8 files changed, 34 insertions(+), 6651 deletions(-)
delete mode 100644 newlib/libc/sys/phoenix/machine/arm/aclocal.m4
delete mode 100644 newlib/libc/sys/phoenix/machine/arm/configure
delete mode 100644 newlib/libc/sys/phoenix/machine/arm/configure.ac
diff --git a/newlib/libc/sys/phoenix/configure.ac b/newlib/libc/sys/phoenix/configure.ac
index 95b8c26516cf..f7aafc00ab8c 100644
--- a/newlib/libc/sys/phoenix/configure.ac
+++ b/newlib/libc/sys/phoenix/configure.ac
@@ -11,7 +11,7 @@ NEWLIB_CONFIGURE(../../..)
if test -n "${machine_dir}"; then
case ${machine_dir} in
- arm) AC_CONFIG_SUBDIRS(machine/arm) ;;
+ arm) AC_CONFIG_FILES([machine/arm/Makefile]) ;;
esac
fi
PHOENIX_MACHINE_DIR=machine/${machine_dir}
diff --git a/newlib/libc/sys/phoenix/machine/arm/Makefile.am b/newlib/libc/sys/phoenix/machine/arm/Makefile.am
index fd44bd23bac2..28ee11508789 100644
--- a/newlib/libc/sys/phoenix/machine/arm/Makefile.am
+++ b/newlib/libc/sys/phoenix/machine/arm/Makefile.am
@@ -1,18 +1,8 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
LIB_SOURCES = syscall.S
-AM_CFLAGS = -I$(srcdir)/../..
-AM_CCASFLAGS = -I$(srcdir)/../.. $(AM_CPPFLAGS)
-
noinst_LIBRARIES = lib.a
lib_a_SOURCES = $(LIB_SOURCES)
-lib_a_CFLAGS = $(AM_CFLAGS)
-noinst_DATA =
all-local: crt0.o
-
-ACLOCAL_AMFLAGS = -I ../../../../.. -I ../../../../../.. -I ../../../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/phoenix/machine/arm/configure.ac b/newlib/libc/sys/phoenix/machine/arm/configure.ac
deleted file mode 100644
index ab1e0c99c04c..000000000000
--- a/newlib/libc/sys/phoenix/machine/arm/configure.ac
+++ /dev/null
@@ -1,13 +0,0 @@
-dnl This is the newlib/libc/sys/phoenix/machine/arm configure.in file.
-dnl Process this file with autoconf to produce a configure script.
-
-AC_INIT([newlib],[NEWLIB_VERSION])
-AC_CONFIG_SRCDIR([crt0.S])
-
-dnl Can't be done in NEWLIB_CONFIGURE because that confuses automake.
-AC_CONFIG_AUX_DIR(../../../../../..)
-
-NEWLIB_CONFIGURE(../../../../..)
-
-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 ` Mike Frysinger [this message]
2022-02-10 8:51 ` [PATCH 5/5] newlib: phoenix: merge configure up to top-level Mike Frysinger
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-5-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).