* [Buildroot] [PATCH 2/3] package/udisks: add locale dependency
2020-02-13 22:36 [Buildroot] [PATCH 1/3] package/python-pyparted: add locale dependency Fabrice Fontaine
@ 2020-02-13 22:36 ` Fabrice Fontaine
2020-02-14 8:10 ` Peter Korsgaard
2020-02-13 22:36 ` [Buildroot] [PATCH v2,3/3] package/parted: disable on uclibc Fabrice Fontaine
2020-02-14 8:10 ` [Buildroot] [PATCH 1/3] package/python-pyparted: add locale dependency Peter Korsgaard
2 siblings, 1 reply; 6+ messages in thread
From: Fabrice Fontaine @ 2020-02-13 22:36 UTC (permalink / raw)
To: buildroot
Commit b5f0c6efb24826641719c493382211e5d768417b forgot to propagate new
locale dependency from parted to udisks
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/udisks/Config.in | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/package/udisks/Config.in b/package/udisks/Config.in
index 80a905fd9b..f4044b0d0d 100644
--- a/package/udisks/Config.in
+++ b/package/udisks/Config.in
@@ -1,5 +1,6 @@
config BR2_PACKAGE_UDISKS
bool "udisks"
+ depends on BR2_ENABLE_LOCALE # parted
depends on BR2_HOST_GCC_AT_LEAST_4_9 # spidermonkey
depends on BR2_INSTALL_LIBSTDCPP # spidermonkey
depends on BR2_PACKAGE_HAS_UDEV
@@ -49,10 +50,10 @@ comment "udisks needs udev /dev management"
depends on BR2_USE_MMU
depends on !BR2_PACKAGE_HAS_UDEV
-comment "udisks needs a glibc or musl toolchain with C++, wchar, dynamic library, NPTL, gcc >= 4.9"
+comment "udisks needs a glibc or musl toolchain with locale, C++, wchar, dynamic library, NPTL, gcc >= 4.9"
depends on BR2_USE_MMU
depends on BR2_PACKAGE_SPIDERMONKEY_ARCH_SUPPORTS
- depends on BR2_TOOLCHAIN_USES_UCLIBC || \
+ depends on !BR2_ENABLE_LOCALE || BR2_TOOLCHAIN_USES_UCLIBC || \
!BR2_INSTALL_LIBSTDCPP || \
BR2_STATIC_LIBS || \
!BR2_TOOLCHAIN_HAS_THREADS_NPTL || \
--
2.24.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH v2,3/3] package/parted: disable on uclibc
2020-02-13 22:36 [Buildroot] [PATCH 1/3] package/python-pyparted: add locale dependency Fabrice Fontaine
2020-02-13 22:36 ` [Buildroot] [PATCH 2/3] package/udisks: " Fabrice Fontaine
@ 2020-02-13 22:36 ` Fabrice Fontaine
2020-02-14 8:13 ` Peter Korsgaard
2020-02-14 8:10 ` [Buildroot] [PATCH 1/3] package/python-pyparted: add locale dependency Peter Korsgaard
2 siblings, 1 reply; 6+ messages in thread
From: Fabrice Fontaine @ 2020-02-13 22:36 UTC (permalink / raw)
To: buildroot
Like postgreSQL (and imagemagick), parted does not build against uClibc
with locales enabled, due to an uClibc bug, see
http://lists.uclibc.org/pipermail/uclibc/2014-April/048326.html:
In file included from atari.c:42:
atari.c: In function 'atr_part_correct':
atari.c:221:9: error: dereferencing pointer to incomplete type 'struct __uclibc_locale_struct'
return isalnum_l(part->id[0], atr_c_locale)
^~~~~~~~~
So disable parted on uclibc
Fixes:
- http://autobuild.buildroot.org/results/992518d340a9f32a0721d6e66936850c4c3ef2e4
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
Changes v1 -> v2 (after review of Peter Korsgaard):
- Update parted's reverse dependencies
package/parted/Config.in | 6 ++++--
package/python-pyparted/Config.in | 7 +++++--
package/udisks/Config.in | 2 +-
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/package/parted/Config.in b/package/parted/Config.in
index f48b365a2d..a35b30662f 100644
--- a/package/parted/Config.in
+++ b/package/parted/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_PARTED
bool "parted"
depends on BR2_ENABLE_LOCALE
depends on BR2_USE_WCHAR
+ depends on !BR2_TOOLCHAIN_USES_UCLIBC
select BR2_PACKAGE_UTIL_LINUX
select BR2_PACKAGE_UTIL_LINUX_LIBUUID
help
@@ -9,5 +10,6 @@ config BR2_PACKAGE_PARTED
http://www.gnu.org/software/parted/
-comment "parted needs a toolchain w/ locale, wchar"
- depends on !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR
+comment "parted needs a glibc or musl toolchain w/ locale, wchar"
+ depends on BR2_TOOLCHAIN_USES_UCLIBC || \
+ !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR
diff --git a/package/python-pyparted/Config.in b/package/python-pyparted/Config.in
index 60f54a5484..cb7d93f74d 100644
--- a/package/python-pyparted/Config.in
+++ b/package/python-pyparted/Config.in
@@ -2,11 +2,14 @@ config BR2_PACKAGE_PYTHON_PYPARTED
bool "python-pyparted"
depends on BR2_ENABLE_LOCALE # parted
depends on BR2_USE_WCHAR
+ depends on !BR2_TOOLCHAIN_USES_UCLIBC # parted
select BR2_PACKAGE_PARTED
help
Python bindings for GNU parted (libparted).
https://github.com/rhinstaller/pyparted
-comment "pyparted needs a toolchain w/ locale, wchar"
- depends on !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR
+comment "pyparted needs a glibc or musl toolchain w/ locale, wchar"
+ depends on BR2_TOOLCHAIN_USES_UCLIBC || \
+ !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR
+
diff --git a/package/udisks/Config.in b/package/udisks/Config.in
index f4044b0d0d..04a632dd8d 100644
--- a/package/udisks/Config.in
+++ b/package/udisks/Config.in
@@ -9,7 +9,7 @@ config BR2_PACKAGE_UDISKS
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # polkit
depends on BR2_USE_MMU # lvm2
depends on BR2_USE_WCHAR # dbus-glib -> glib2
- depends on !BR2_TOOLCHAIN_USES_UCLIBC # polkit, lvm2
+ depends on !BR2_TOOLCHAIN_USES_UCLIBC # polkit, lvm2, parted
depends on !BR2_STATIC_LIBS # lvm2, spidermonkey
select BR2_PACKAGE_DBUS
select BR2_PACKAGE_DBUS_GLIB
--
2.24.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [Buildroot] [PATCH v2,3/3] package/parted: disable on uclibc
2020-02-13 22:36 ` [Buildroot] [PATCH v2,3/3] package/parted: disable on uclibc Fabrice Fontaine
@ 2020-02-14 8:13 ` Peter Korsgaard
0 siblings, 0 replies; 6+ messages in thread
From: Peter Korsgaard @ 2020-02-14 8:13 UTC (permalink / raw)
To: buildroot
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:
> Like postgreSQL (and imagemagick), parted does not build against uClibc
> with locales enabled, due to an uClibc bug, see
> http://lists.uclibc.org/pipermail/uclibc/2014-April/048326.html:
> In file included from atari.c:42:
> atari.c: In function 'atr_part_correct':
> atari.c:221:9: error: dereferencing pointer to incomplete type 'struct __uclibc_locale_struct'
> return isalnum_l(part->id[0], atr_c_locale)
> ^~~~~~~~~
> So disable parted on uclibc
> Fixes:
> - http://autobuild.buildroot.org/results/992518d340a9f32a0721d6e66936850c4c3ef2e4
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> Changes v1 -> v2 (after review of Peter Korsgaard):
> - Update parted's reverse dependencies
Committed after fixing the white space issues, thanks.
check-package warns about this:
Applying: package/parted: disable on uclibc
package/python-pyparted/Config.in:15: line contains trailing whitespace
package/python-pyparted/Config.in:15: empty line at end of file
92 lines processed
2 warnings generated
Consider adding a post-commit hook with it, E.G. something like:
cat .git/hooks/post-commit
#!/bin/sh
#
# An example hook script that is called after a successful
# commit is made.
#
# To enable this hook, rename this file to "post-commit".
# check-package on added/changed files
git show --no-renames HEAD | \
lsdiff -s | \
awk '{ if ($1 != "-") print substr($2, 3) }' | \
xargs -r ./utils/check-package
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/3] package/python-pyparted: add locale dependency
2020-02-13 22:36 [Buildroot] [PATCH 1/3] package/python-pyparted: add locale dependency Fabrice Fontaine
2020-02-13 22:36 ` [Buildroot] [PATCH 2/3] package/udisks: " Fabrice Fontaine
2020-02-13 22:36 ` [Buildroot] [PATCH v2,3/3] package/parted: disable on uclibc Fabrice Fontaine
@ 2020-02-14 8:10 ` Peter Korsgaard
2 siblings, 0 replies; 6+ messages in thread
From: Peter Korsgaard @ 2020-02-14 8:10 UTC (permalink / raw)
To: buildroot
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:
> Commit b5f0c6efb24826641719c493382211e5d768417b forgot to propagate new
> locale dependency from parted to python-pyparted
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 6+ messages in thread