* [Buildroot] [PATCH 1/1] package/mpd: fix iconv detection w/ libiconv installed
@ 2022-04-27 5:27 Andreas Ziegler
2022-04-27 19:26 ` Arnout Vandecappelle
0 siblings, 1 reply; 5+ messages in thread
From: Andreas Ziegler @ 2022-04-27 5:27 UTC (permalink / raw)
To: buildroot; +Cc: Andreas Ziegler, Jörg Krause
Fix build failures caused by meson failing to properly detect iconv() when
libiconv is installed and a missing link dependency.
Upstream pull request:
https://github.com/MusicPlayerDaemon/MPD/pull/1515
Fixes the following build failures:
http://autobuild.buildroot.net/results/7a0/7a0fe4e9248ed96a5c4934361de16e0b59a51d50/
Signed-off-by: Andreas Ziegler <br015@umbiko.net>
---
...detection-when-libiconv-is-installed.patch | 71 +++++++++++++++++++
1 file changed, 71 insertions(+)
create mode 100644 package/mpd/0002-fix-iconv-detection-when-libiconv-is-installed.patch
diff --git a/package/mpd/0002-fix-iconv-detection-when-libiconv-is-installed.patch b/package/mpd/0002-fix-iconv-detection-when-libiconv-is-installed.patch
new file mode 100644
index 0000000000..6121bc9740
--- /dev/null
+++ b/package/mpd/0002-fix-iconv-detection-when-libiconv-is-installed.patch
@@ -0,0 +1,71 @@
+From 3882a5a263caa681778a21b1f5f13a1b64536796 Mon Sep 17 00:00:00 2001
+From: aeolio <git@aeolio.de>
+Date: Wed, 20 Apr 2022 16:10:39 +0200
+Subject: [PATCH 1/2] src/lib/icu: fix iconv() detection when libiconv is
+ installed
+
+---
+ src/lib/icu/meson.build | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/src/lib/icu/meson.build b/src/lib/icu/meson.build
+index 59215e704b..972c1fda3f 100644
+--- a/src/lib/icu/meson.build
++++ b/src/lib/icu/meson.build
+@@ -12,17 +12,23 @@ if is_windows
+ icu_sources += 'Win32.cxx'
+ endif
+
++iconv_dep = []
+ if icu_dep.found()
+ icu_sources += [
+ 'Util.cxx',
+ 'Init.cxx',
+ ]
+ elif not get_option('iconv').disabled()
+- have_iconv = compiler.has_function('iconv', prefix : '#include <iconv.h>')
+- conf.set('HAVE_ICONV', have_iconv)
++ # an installed iconv library will make the builtin iconf() unavailable,
++ # so search for the library first and pass it as (possible) dependency
++ iconv_dep = compiler.find_library('libiconv', required: false)
++ have_iconv = compiler.has_function('iconv',
++ dependencies: iconv_dep,
++ prefix : '#include <iconv.h>')
+ if not have_iconv and get_option('iconv').enabled()
+ error('iconv() not available')
+ endif
++ conf.set('HAVE_ICONV', have_iconv)
+ endif
+
+ icu = static_library(
+@@ -31,6 +37,7 @@ icu = static_library(
+ include_directories: inc,
+ dependencies: [
+ icu_dep,
++ iconv_dep,
+ fmt_dep,
+ ],
+ )
+
+From ee39af34199aa875e109f7002a401d6ebbd66c22 Mon Sep 17 00:00:00 2001
+From: aeolio <git@aeolio.de>
+Date: Sun, 24 Apr 2022 04:14:17 +0000
+Subject: [PATCH 2/2] fix typo in comment
+
+---
+ src/lib/icu/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lib/icu/meson.build b/src/lib/icu/meson.build
+index 972c1fda3f..6e489876b8 100644
+--- a/src/lib/icu/meson.build
++++ b/src/lib/icu/meson.build
+@@ -19,7 +19,7 @@ if icu_dep.found()
+ 'Init.cxx',
+ ]
+ elif not get_option('iconv').disabled()
+- # an installed iconv library will make the builtin iconf() unavailable,
++ # an installed iconv library will make the builtin iconv() unavailable,
+ # so search for the library first and pass it as (possible) dependency
+ iconv_dep = compiler.find_library('libiconv', required: false)
+ have_iconv = compiler.has_function('iconv',
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [Buildroot] [PATCH 1/1] package/mpd: fix iconv detection w/ libiconv installed
2022-04-27 5:27 [Buildroot] [PATCH 1/1] package/mpd: fix iconv detection w/ libiconv installed Andreas Ziegler
@ 2022-04-27 19:26 ` Arnout Vandecappelle
2022-04-28 6:10 ` [Buildroot] [PATCH v2 " Andreas Ziegler
0 siblings, 1 reply; 5+ messages in thread
From: Arnout Vandecappelle @ 2022-04-27 19:26 UTC (permalink / raw)
To: Andreas Ziegler, buildroot; +Cc: Jörg Krause
On 27/04/2022 07:27, Andreas Ziegler wrote:
> Fix build failures caused by meson failing to properly detect iconv() when
> libiconv is installed and a missing link dependency.
>
> Upstream pull request:
> https://github.com/MusicPlayerDaemon/MPD/pull/1515
>
> Fixes the following build failures:
> http://autobuild.buildroot.net/results/7a0/7a0fe4e9248ed96a5c4934361de16e0b59a51d50/
>
> Signed-off-by: Andreas Ziegler <br015@umbiko.net>
> ---
> ...detection-when-libiconv-is-installed.patch | 71 +++++++++++++++++++
> 1 file changed, 71 insertions(+)
> create mode 100644 package/mpd/0002-fix-iconv-detection-when-libiconv-is-installed.patch
>
> diff --git a/package/mpd/0002-fix-iconv-detection-when-libiconv-is-installed.patch b/package/mpd/0002-fix-iconv-detection-when-libiconv-is-installed.patch
> new file mode 100644
> index 0000000000..6121bc9740
> --- /dev/null
> +++ b/package/mpd/0002-fix-iconv-detection-when-libiconv-is-installed.patch
> @@ -0,0 +1,71 @@
> +From 3882a5a263caa681778a21b1f5f13a1b64536796 Mon Sep 17 00:00:00 2001
> +From: aeolio <git@aeolio.de>
> +Date: Wed, 20 Apr 2022 16:10:39 +0200
> +Subject: [PATCH 1/2] src/lib/icu: fix iconv() detection when libiconv is
Remove the N/M (git format-patch -N).
> + installed
> +
Add a Signed-off-by line for yourself. This is a short way for you to
assert that you are entitled to contribute the patch under the upstream
project's license. See http://elinux.org/Developer_Certificate_Of_Origin
for more details.
> +---
> + src/lib/icu/meson.build | 11 +++++++++--
> + 1 file changed, 9 insertions(+), 2 deletions(-)
> +
> +diff --git a/src/lib/icu/meson.build b/src/lib/icu/meson.build
> +index 59215e704b..972c1fda3f 100644
> +--- a/src/lib/icu/meson.build
> ++++ b/src/lib/icu/meson.build
> +@@ -12,17 +12,23 @@ if is_windows
> + icu_sources += 'Win32.cxx'
> + endif
> +
> ++iconv_dep = []
> + if icu_dep.found()
> + icu_sources += [
> + 'Util.cxx',
> + 'Init.cxx',
> + ]
> + elif not get_option('iconv').disabled()
> +- have_iconv = compiler.has_function('iconv', prefix : '#include <iconv.h>')
> +- conf.set('HAVE_ICONV', have_iconv)
> ++ # an installed iconv library will make the builtin iconf() unavailable,
> ++ # so search for the library first and pass it as (possible) dependency
> ++ iconv_dep = compiler.find_library('libiconv', required: false)
> ++ have_iconv = compiler.has_function('iconv',
> ++ dependencies: iconv_dep,
> ++ prefix : '#include <iconv.h>')
> + if not have_iconv and get_option('iconv').enabled()
> + error('iconv() not available')
> + endif
> ++ conf.set('HAVE_ICONV', have_iconv)
> + endif
> +
> + icu = static_library(
> +@@ -31,6 +37,7 @@ icu = static_library(
> + include_directories: inc,
> + dependencies: [
> + icu_dep,
> ++ iconv_dep,
> + fmt_dep,
> + ],
> + )
> +
> +From ee39af34199aa875e109f7002a401d6ebbd66c22 Mon Sep 17 00:00:00 2001
> +From: aeolio <git@aeolio.de>
> +Date: Sun, 24 Apr 2022 04:14:17 +0000
> +Subject: [PATCH 2/2] fix typo in comment
Only one patch per patch file please. Though I don't see why you even need
this patch.
Regards,
Arnout
> +
> +---
> + src/lib/icu/meson.build | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/src/lib/icu/meson.build b/src/lib/icu/meson.build
> +index 972c1fda3f..6e489876b8 100644
> +--- a/src/lib/icu/meson.build
> ++++ b/src/lib/icu/meson.build
> +@@ -19,7 +19,7 @@ if icu_dep.found()
> + 'Init.cxx',
> + ]
> + elif not get_option('iconv').disabled()
> +- # an installed iconv library will make the builtin iconf() unavailable,
> ++ # an installed iconv library will make the builtin iconv() unavailable,
> + # so search for the library first and pass it as (possible) dependency
> + iconv_dep = compiler.find_library('libiconv', required: false)
> + have_iconv = compiler.has_function('iconv',
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 5+ messages in thread* [Buildroot] [PATCH v2 1/1] package/mpd: fix iconv detection w/ libiconv installed
2022-04-27 19:26 ` Arnout Vandecappelle
@ 2022-04-28 6:10 ` Andreas Ziegler
2022-04-30 18:49 ` Arnout Vandecappelle
2022-05-27 19:38 ` Peter Korsgaard
0 siblings, 2 replies; 5+ messages in thread
From: Andreas Ziegler @ 2022-04-28 6:10 UTC (permalink / raw)
To: buildroot; +Cc: Andreas Ziegler, Jörg Krause
Fix build failures caused by meson failing to properly detect iconv() when
libiconv is installed and a missing link dependency.
Upstream pull request:
https://github.com/MusicPlayerDaemon/MPD/pull/1515
Fixes the following build failures:
http://autobuild.buildroot.net/results/7a0/7a0fe4e9248ed96a5c4934361de16e0b59a51d50/
Signed-off-by: Andreas Ziegler <br015@umbiko.net>
---
changes v1->v2:
extract patch from git w/o numbering, fix typo, add signed-off-by
...iconv-detection-when-libiconv-is-ins.patch | 55 +++++++++++++++++++
1 file changed, 55 insertions(+)
create mode 100644 package/mpd/0002-src-lib-icu-fix-iconv-detection-when-libiconv-is-ins.patch
diff --git a/package/mpd/0002-src-lib-icu-fix-iconv-detection-when-libiconv-is-ins.patch b/package/mpd/0002-src-lib-icu-fix-iconv-detection-when-libiconv-is-ins.patch
new file mode 100644
index 0000000000..63742c0cbe
--- /dev/null
+++ b/package/mpd/0002-src-lib-icu-fix-iconv-detection-when-libiconv-is-ins.patch
@@ -0,0 +1,55 @@
+From 3882a5a263caa681778a21b1f5f13a1b64536796 Mon Sep 17 00:00:00 2001
+From: aeolio <git@aeolio.de>
+Date: Wed, 20 Apr 2022 16:10:39 +0200
+Subject: [PATCH] src/lib/icu: fix iconv() detection when libiconv is installed
+
+Signed-off-by: aeolio <git@aeolio.de>
+
+Fix typo in comment
+
+Signed-off-by: Andreas Ziegler <br015@umbiko.net>
+---
+ src/lib/icu/meson.build | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/src/lib/icu/meson.build b/src/lib/icu/meson.build
+index 59215e704..972c1fda3 100644
+--- a/src/lib/icu/meson.build
++++ b/src/lib/icu/meson.build
+@@ -12,17 +12,23 @@ if is_windows
+ icu_sources += 'Win32.cxx'
+ endif
+
++iconv_dep = []
+ if icu_dep.found()
+ icu_sources += [
+ 'Util.cxx',
+ 'Init.cxx',
+ ]
+ elif not get_option('iconv').disabled()
+- have_iconv = compiler.has_function('iconv', prefix : '#include <iconv.h>')
+- conf.set('HAVE_ICONV', have_iconv)
++ # an installed iconv library will make the builtin iconv() unavailable,
++ # so search for the library first and pass it as (possible) dependency
++ iconv_dep = compiler.find_library('libiconv', required: false)
++ have_iconv = compiler.has_function('iconv',
++ dependencies: iconv_dep,
++ prefix : '#include <iconv.h>')
+ if not have_iconv and get_option('iconv').enabled()
+ error('iconv() not available')
+ endif
++ conf.set('HAVE_ICONV', have_iconv)
+ endif
+
+ icu = static_library(
+@@ -31,6 +37,7 @@ icu = static_library(
+ include_directories: inc,
+ dependencies: [
+ icu_dep,
++ iconv_dep,
+ fmt_dep,
+ ],
+ )
+--
+2.34.1
+
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [Buildroot] [PATCH v2 1/1] package/mpd: fix iconv detection w/ libiconv installed
2022-04-28 6:10 ` [Buildroot] [PATCH v2 " Andreas Ziegler
@ 2022-04-30 18:49 ` Arnout Vandecappelle
2022-05-27 19:38 ` Peter Korsgaard
1 sibling, 0 replies; 5+ messages in thread
From: Arnout Vandecappelle @ 2022-04-30 18:49 UTC (permalink / raw)
To: Andreas Ziegler, buildroot; +Cc: Jörg Krause
On 28/04/2022 08:10, Andreas Ziegler wrote:
> Fix build failures caused by meson failing to properly detect iconv() when
> libiconv is installed and a missing link dependency.
>
> Upstream pull request:
> https://github.com/MusicPlayerDaemon/MPD/pull/1515
>
> Fixes the following build failures:
> http://autobuild.buildroot.net/results/7a0/7a0fe4e9248ed96a5c4934361de16e0b59a51d50/
>
> Signed-off-by: Andreas Ziegler <br015@umbiko.net>
> ---
> changes v1->v2:
> extract patch from git w/o numbering, fix typo, add signed-off-by
>
> ...iconv-detection-when-libiconv-is-ins.patch | 55 +++++++++++++++++++
> 1 file changed, 55 insertions(+)
> create mode 100644 package/mpd/0002-src-lib-icu-fix-iconv-detection-when-libiconv-is-ins.patch
>
> diff --git a/package/mpd/0002-src-lib-icu-fix-iconv-detection-when-libiconv-is-ins.patch b/package/mpd/0002-src-lib-icu-fix-iconv-detection-when-libiconv-is-ins.patch
> new file mode 100644
> index 0000000000..63742c0cbe
> --- /dev/null
> +++ b/package/mpd/0002-src-lib-icu-fix-iconv-detection-when-libiconv-is-ins.patch
> @@ -0,0 +1,55 @@
> +From 3882a5a263caa681778a21b1f5f13a1b64536796 Mon Sep 17 00:00:00 2001
> +From: aeolio <git@aeolio.de>
> +Date: Wed, 20 Apr 2022 16:10:39 +0200
> +Subject: [PATCH] src/lib/icu: fix iconv() detection when libiconv is installed
> +
> +Signed-off-by: aeolio <git@aeolio.de>
> +
> +Fix typo in comment
I've also put the upstream link in the patch itself, and applied to master,
thanks.
Regards,
Arnout
> +
> +Signed-off-by: Andreas Ziegler <br015@umbiko.net>
> +---
> + src/lib/icu/meson.build | 11 +++++++++--
> + 1 file changed, 9 insertions(+), 2 deletions(-)
> +
> +diff --git a/src/lib/icu/meson.build b/src/lib/icu/meson.build
> +index 59215e704..972c1fda3 100644
> +--- a/src/lib/icu/meson.build
> ++++ b/src/lib/icu/meson.build
> +@@ -12,17 +12,23 @@ if is_windows
> + icu_sources += 'Win32.cxx'
> + endif
> +
> ++iconv_dep = []
> + if icu_dep.found()
> + icu_sources += [
> + 'Util.cxx',
> + 'Init.cxx',
> + ]
> + elif not get_option('iconv').disabled()
> +- have_iconv = compiler.has_function('iconv', prefix : '#include <iconv.h>')
> +- conf.set('HAVE_ICONV', have_iconv)
> ++ # an installed iconv library will make the builtin iconv() unavailable,
> ++ # so search for the library first and pass it as (possible) dependency
> ++ iconv_dep = compiler.find_library('libiconv', required: false)
> ++ have_iconv = compiler.has_function('iconv',
> ++ dependencies: iconv_dep,
> ++ prefix : '#include <iconv.h>')
> + if not have_iconv and get_option('iconv').enabled()
> + error('iconv() not available')
> + endif
> ++ conf.set('HAVE_ICONV', have_iconv)
> + endif
> +
> + icu = static_library(
> +@@ -31,6 +37,7 @@ icu = static_library(
> + include_directories: inc,
> + dependencies: [
> + icu_dep,
> ++ iconv_dep,
> + fmt_dep,
> + ],
> + )
> +--
> +2.34.1
> +
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [Buildroot] [PATCH v2 1/1] package/mpd: fix iconv detection w/ libiconv installed
2022-04-28 6:10 ` [Buildroot] [PATCH v2 " Andreas Ziegler
2022-04-30 18:49 ` Arnout Vandecappelle
@ 2022-05-27 19:38 ` Peter Korsgaard
1 sibling, 0 replies; 5+ messages in thread
From: Peter Korsgaard @ 2022-05-27 19:38 UTC (permalink / raw)
To: Andreas Ziegler; +Cc: Jörg Krause, buildroot
>>>>> "Andreas" == Andreas Ziegler <br015@umbiko.net> writes:
> Fix build failures caused by meson failing to properly detect iconv() when
> libiconv is installed and a missing link dependency.
> Upstream pull request:
> https://github.com/MusicPlayerDaemon/MPD/pull/1515
> Fixes the following build failures:
> http://autobuild.buildroot.net/results/7a0/7a0fe4e9248ed96a5c4934361de16e0b59a51d50/
> Signed-off-by: Andreas Ziegler <br015@umbiko.net>
> ---
> changes v1->v2:
> extract patch from git w/o numbering, fix typo, add signed-off-by
Committed to 2022.02.x, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-05-27 19:39 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-27 5:27 [Buildroot] [PATCH 1/1] package/mpd: fix iconv detection w/ libiconv installed Andreas Ziegler
2022-04-27 19:26 ` Arnout Vandecappelle
2022-04-28 6:10 ` [Buildroot] [PATCH v2 " Andreas Ziegler
2022-04-30 18:49 ` Arnout Vandecappelle
2022-05-27 19:38 ` Peter Korsgaard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.