From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id 139B43858002 for ; Sat, 26 Jun 2021 21:07:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 139B43858002 Received: from vapier.lan (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id 15D9233FA71 for ; Sat, 26 Jun 2021 21:07:52 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH 1/2] sim: bfin: move pkg-config & SDL checks to common code Date: Sat, 26 Jun 2021 17:07:50 -0400 Message-Id: <20210626210751.19269-1-vapier@gentoo.org> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.2 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Jun 2021 21:07:57 -0000 This reduces the unique logic in bfin/configure to make it easier to (eventually) unify it entirely. --- sim/Makefile.in | 6 + sim/aclocal.m4 | 1 + sim/arch-subdir.mk.in | 2 + sim/bfin/Makefile.in | 4 +- sim/bfin/aclocal.m4 | 1 - sim/bfin/configure | 1181 +----------------------------------- sim/bfin/configure.ac | 10 - sim/configure | 285 ++++++++- sim/m4/sim_ac_platform.m4 | 9 + sim/m4/sim_ac_toolchain.m4 | 1 + 10 files changed, 304 insertions(+), 1196 deletions(-) diff --git a/sim/arch-subdir.mk.in b/sim/arch-subdir.mk.in index f145f1a3c6bd..0689dbc29ed1 100644 --- a/sim/arch-subdir.mk.in +++ b/sim/arch-subdir.mk.in @@ -49,6 +49,8 @@ zlibdir = @zlibdir@ LIBINTL = @LIBINTL@ LIBINTL_DEP = @LIBINTL_DEP@ INTL_CFLAGS = @INCINTL@ +SDL_CFLAGS = @SDL_CFLAGS@ +SDL_LIBS = @SDL_LIBS@ COMMON_LIBS = @LIBS@ WARN_CFLAGS = @WARN_CFLAGS@ diff --git a/sim/bfin/Makefile.in b/sim/bfin/Makefile.in index 57b9b5eb0625..f61e1e1206f0 100644 --- a/sim/bfin/Makefile.in +++ b/sim/bfin/Makefile.in @@ -59,8 +59,8 @@ SIM_EXTRA_HW_DEVICES = \ bfin_wp \ eth_phy -SIM_EXTRA_CFLAGS = @SDL_CFLAGS@ -SIM_EXTRA_LIBS = @SDL_LIBS@ -lm +SIM_EXTRA_CFLAGS = $(SDL_CFLAGS) +SIM_EXTRA_LIBS = $(SDL_LIBS) -lm ## COMMON_POST_CONFIG_FRAG diff --git a/sim/bfin/configure.ac b/sim/bfin/configure.ac index ab3bd5b0b99d..6cf5c4879584 100644 --- a/sim/bfin/configure.ac +++ b/sim/bfin/configure.ac @@ -4,14 +4,4 @@ AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config]) SIM_AC_OPTION_DEFAULT_MODEL(bf537) -PKG_PROG_PKG_CONFIG -PKG_CHECK_MODULES(SDL, sdl, [ - AC_CHECK_LIB(dl, dlopen, [ - SDL_CFLAGS="${SDL_CFLAGS} -DHAVE_SDL" - SDL_LIBS="-ldl" - ], [SDL_CFLAGS= SDL_LIBS=]) - ], [:]) -AC_SUBST(SDL_CFLAGS) -AC_SUBST(SDL_LIBS) - SIM_AC_OUTPUT diff --git a/sim/m4/sim_ac_platform.m4 b/sim/m4/sim_ac_platform.m4 index b7573567d24c..2a84a0130a33 100644 --- a/sim/m4/sim_ac_platform.m4 +++ b/sim/m4/sim_ac_platform.m4 @@ -162,4 +162,13 @@ AC_CHECK_LIB(socket, bind) AC_CHECK_LIB(nsl, gethostbyname) AC_CHECK_LIB(m, fabs) AC_CHECK_LIB(m, log2) + +PKG_CHECK_MODULES(SDL, sdl, [dnl + AC_CHECK_LIB(dl, dlopen, [dnl + SDL_CFLAGS="${SDL_CFLAGS} -DHAVE_SDL" + SDL_LIBS="-ldl" + ], [SDL_CFLAGS= SDL_LIBS=]) + ], [:]) +AC_SUBST(SDL_CFLAGS) +AC_SUBST(SDL_LIBS) ]) diff --git a/sim/m4/sim_ac_toolchain.m4 b/sim/m4/sim_ac_toolchain.m4 index 47b992880f07..fdd540606072 100644 --- a/sim/m4/sim_ac_toolchain.m4 +++ b/sim/m4/sim_ac_toolchain.m4 @@ -49,6 +49,7 @@ AC_SUBST(LDFLAGS_FOR_BUILD) AC_SUBST(CFLAGS) AC_CHECK_TOOL(AR, ar) AC_PROG_RANLIB +PKG_PROG_PKG_CONFIG # Require C11 or newer. Autoconf-2.70 provides ac_cv_prog_cc_c11 when using # AC_PROG_CC, but we're still using Autoconf-2.69, and the newest it understands -- 2.31.1