From: Mike Frysinger <vapier@gentoo.org>
To: gdb-patches@sourceware.org
Subject: [PATCH] sim: don't hardcode -ldl for SDL support
Date: Fri, 4 Nov 2022 07:44:51 +0700 [thread overview]
Message-ID: <20221104004451.22534-1-vapier@gentoo.org> (raw)
Since we use AC_SEARCH_LIBS to find dlopen, we don't need to hardcode
-ldl when using SDL ourselves.
---
sim/arch-subdir.mk.in | 1 -
sim/bfin/Makefile.in | 1 -
sim/configure | 14 +++++++++-----
sim/m4/sim_ac_platform.m4 | 12 ++++++++----
4 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/sim/arch-subdir.mk.in b/sim/arch-subdir.mk.in
index bd047c97687c..616e06ec453f 100644
--- a/sim/arch-subdir.mk.in
+++ b/sim/arch-subdir.mk.in
@@ -54,7 +54,6 @@ DEPMODE = @CCDEPMODE@
DEPDIR = @DEPDIR@
SDL_CFLAGS = @SDL_CFLAGS@
-SDL_LIBS = @SDL_LIBS@
TERMCAP_LIB = @TERMCAP_LIB@
READLINE_LIB = @READLINE_LIB@
READLINE_CFLAGS = @READLINE_CFLAGS@
diff --git a/sim/bfin/Makefile.in b/sim/bfin/Makefile.in
index 62f7b71ded1a..5a36be78c3f1 100644
--- a/sim/bfin/Makefile.in
+++ b/sim/bfin/Makefile.in
@@ -60,7 +60,6 @@ SIM_EXTRA_HW_DEVICES = \
eth_phy
SIM_EXTRA_CFLAGS = $(SDL_CFLAGS)
-SIM_EXTRA_LIBS = $(SDL_LIBS)
## COMMON_POST_CONFIG_FRAG
diff --git a/sim/m4/sim_ac_platform.m4 b/sim/m4/sim_ac_platform.m4
index 74ac7fe14d45..467987e11e7e 100644
--- a/sim/m4/sim_ac_platform.m4
+++ b/sim/m4/sim_ac_platform.m4
@@ -154,19 +154,23 @@ AC_SEARCH_LIBS([dlopen], [dl])
if test "${ac_cv_lib_dl_dlopen}" = "yes"; then
PKG_CHECK_MODULES(SDL, sdl2, [dnl
SDL_CFLAGS="${SDL_CFLAGS} -DHAVE_SDL=2"
- SDL_LIBS="-ldl"
], [
PKG_CHECK_MODULES(SDL, sdl, [dnl
SDL_CFLAGS="${SDL_CFLAGS} -DHAVE_SDL=1"
- SDL_LIBS="-ldl"
], [:])
])
+ dnl If we use SDL, we need dlopen support.
+ AS_IF([test -n "$SDL_CFLAGS"], [dnl
+ AS_IF([test "$ac_cv_search_dlopen" = no], [dnl
+ AC_MSG_WARN([SDL support requires dlopen support])
+ ])
+ ])
else
SDL_CFLAGS=
- SDL_LIBS=
fi
+dnl We dlopen the libs at runtime, so never pass down SDL_LIBS.
+SDL_LIBS=
AC_SUBST(SDL_CFLAGS)
-AC_SUBST(SDL_LIBS)
dnl In the Cygwin environment, we need some additional flags.
AC_CACHE_CHECK([for cygwin], sim_cv_os_cygwin,
--
2.38.1
reply other threads:[~2022-11-04 0:44 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20221104004451.22534-1-vapier@gentoo.org \
--to=vapier@gentoo.org \
--cc=gdb-patches@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).