public inbox for buildroot@busybox.net
 help / color / mirror / Atom feed
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 1/1] package/fluidsynth: fix static build with readline
Date: Fri, 10 Jan 2020 19:26:34 +0100	[thread overview]
Message-ID: <20200110182634.3887115-1-fontaine.fabrice@gmail.com> (raw)

Fixes:
 - http://autobuild.buildroot.org/results/88609eefe55af2ca50d43e17d3424b923528b07a

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 ....txt-use-pkg-config-to-find-readline.patch | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 package/fluidsynth/0001-CMakeLists.txt-use-pkg-config-to-find-readline.patch

diff --git a/package/fluidsynth/0001-CMakeLists.txt-use-pkg-config-to-find-readline.patch b/package/fluidsynth/0001-CMakeLists.txt-use-pkg-config-to-find-readline.patch
new file mode 100644
index 0000000000..2b685e4aad
--- /dev/null
+++ b/package/fluidsynth/0001-CMakeLists.txt-use-pkg-config-to-find-readline.patch
@@ -0,0 +1,49 @@
+From c538c9fa7e392ce16c3354696e7dc7781a78a300 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Fri, 10 Jan 2020 08:49:51 +0100
+Subject: [PATCH] CMakeLists.txt: use pkg-config to find readline
+
+Use pkg_check_modules to find readline dependencies such as ncurses and
+fallback on current mechanism.
+
+This will fix the following build failure when building statically:
+
+/home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /home/buildroot/autobuild/instance-1/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libreadline.a(display.o): in function `cr':
+display.c:(.text+0x1a0): undefined reference to `tputs'
+
+Fixes:
+ - http://autobuild.buildroot.org/results/88609eefe55af2ca50d43e17d3424b923528b07a
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Upstream status: https://github.com/FluidSynth/fluidsynth/pull/606] 
+---
+ CMakeLists.txt | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d4956b1..3747faa 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -629,12 +629,15 @@ endif ( enable-oboe )
+ unset ( WITH_READLINE CACHE )
+ unset ( READLINE_LIBS CACHE )
+ if ( enable-readline )
+-  find_package ( Readline )
+-  set ( FOUND_READLINE ${HAVE_READLINE} )
+-  if ( HAVE_READLINE )
++  pkg_check_modules ( READLINE readline )
++  if ( NOT READLINE_FOUND )
++    find_package ( Readline )
++    set ( READLINE_FOUND ${HAVE_READLINE} )
++  endif ( NOT READLINE_FOUND )
++  if ( READLINE_FOUND )
+     set ( WITH_READLINE 1 )
+     set ( READLINE_LIBS ${READLINE_LIBRARIES} )
+-  endif ( HAVE_READLINE )
++  endif ( READLINE_FOUND )
+ endif ( enable-readline )
+ 
+ unset ( ENABLE_MIXER_THREADS CACHE )
+-- 
+2.24.1
+
-- 
2.24.1

             reply	other threads:[~2020-01-10 18:26 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-10 18:26 Fabrice Fontaine [this message]
2020-01-17 21:27 ` [Buildroot] [PATCH 1/1] package/fluidsynth: fix static build with readline Julien Olivain
2020-04-19 20:04 ` Thomas Petazzoni

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=20200110182634.3887115-1-fontaine.fabrice@gmail.com \
    --to=fontaine.fabrice@gmail.com \
    --cc=buildroot@busybox.net \
    /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