package/mc: fix build with NLS
PATCH 1/2 package/mc: fix build with NLS
gettext is an optional dependency since version 4.8.24 and
https://github.com/MidnightCommander/mc/commit/f30e6ff283f4bc86177e4360de94dad794678395
Fixes:
- http://autobuild.buildroot.org/results/0e72b0b5b7d7009bd5ad5f15917e94c86e99131b
--- package/mc/mc.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
package/mc/mc.mk +2 -1
@@ -9,7 +9,8 @@ MC_SOURCE = mc-$(MC_VERSION).tar.xz MC_SITE = http://ftp.midnight-commander.org MC_LICENSE = GPL-3.0+ MC_LICENSE_FILES = COPYING -MC_DEPENDENCIES = libglib2 host-pkgconf +MC_DEPENDENCIES = libglib2 host-pkgconf $(TARGET_NLS_DEPENDENCIES) +MC_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) ifeq ($(BR2_PACKAGE_GPM),y) MC_CONF_OPTS += --with-gpm-mouse
Signature · 1 line
2.25.1
PATCH 2/2 package/mc: do not install mc.lib twice
Fixes:
- http://autobuild.buildroot.org/results/1fded9bacffdc57fea9cb151ed889f48ceb5ff8d
--- ...Makefile-am-install-mc-lib-only-once.patch | 60 +++++++++++++++++++ package/mc/mc.mk | 2 + 2 files changed, 62 insertions(+) create mode 100644 package/mc/0001-Ticket-4070-misc-Makefile-am-install-mc-lib-only-once.patch
package/mc/0001-Ticket-4070-misc-Makefile-am-install-mc-lib-only-once.patch new file +60 -0
@@ -0,0 +1,60 @@ +From afb09f7cd7024484845ade25e15b8b93d6cf2d2c Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich <[email protected]> +Date: Tue, 3 Mar 2020 09:26:12 +0000 +Subject: [PATCH] Ticket #4070: misc/Makefile.am: install mc.lib only once. + +Before the change mc.lib was installed twice due to being +in two _DATA variables: + +dist_pkgdata_DATA = \ + mc.lib + +pkgdata_DATA = \ + $(dist_pkgdata_DATA) \ + $(PKGDATA_OUT) + +This causes occasional install failures when two parallel +`/usr/bin/install` calls race in installing the file: + +$ make -j20 DESTDIR=/var/tmp/portage/app-misc/mc-4.8.24/image install +... + /usr/lib/portage/python3.6/ebuild-helpers/xattr/install \ + -c -m 644 mc.lib '/var/tmp/portage/app-misc/mc-4.8.24/image/usr/share/mc' + /usr/lib/portage/python3.6/ebuild-helpers/xattr/install \ + -c -m 644 mc.lib mc.charsets '/var/tmp/portage/app-misc/mc-4.8.24/image/usr/share/mc' +... + /usr/bin/install: cannot create regular file + '/var/tmp/portage/app-misc/mc-4.8.24/image/usr/share/mc/mc.lib': File exists + +After the change mc.lib is present only in dist_pkgdata_DATA. + +Signed-off-by: Sergei Trofimovich <[email protected]> +Signed-off-by: Andrew Borodin <[email protected]> + +Signed-off-by: Fabrice Fontaine <[email protected]> +[Retrieved from: +https://github.com/MidnightCommander/mc/commit/afb09f7cd7024484845ade25e15b8b93d6cf2d2c] +--- + misc/Makefile.am | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/misc/Makefile.am b/misc/Makefile.am +index 8ed1826136..24f4a0e1ad 100644 +--- a/misc/Makefile.am ++++ b/misc/Makefile.am +@@ -17,7 +17,6 @@ dist_pkgdata_DATA = \ + mc.lib + + pkgdata_DATA = \ +- $(dist_pkgdata_DATA) \ + $(PKGDATA_OUT) + + SCRIPTS_IN = \ +@@ -54,7 +53,6 @@ EXTRA_DIST = \ + $(LIBFILES_SCRIPT) \ + $(SCRIPTS_IN) \ + $(noinst_DATA) \ +- $(dist_pkgdata_DATA) \ + $(PKGDATA_IN) + + install-data-hook:
package/mc/mc.mk +2 -0
@@ -11,6 +11,8 @@ MC_LICENSE = GPL-3.0+ MC_LICENSE_FILES = COPYING MC_DEPENDENCIES = libglib2 host-pkgconf $(TARGET_NLS_DEPENDENCIES) MC_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) +# We're patching misc/Makefile.am +MC_AUTORECONF = YES ifeq ($(BR2_PACKAGE_GPM),y) MC_CONF_OPTS += --with-gpm-mouse
Signature · 1 line
2.25.1
PATCH 1/2 package/mc: fix build with NLS
In reply to Fabrice FontaineFabrice, All,
On 2020-04-20 22:16 +0200, Fabrice Fontaine spake thusly:
Quoted 7 lines
gettext is an optional dependency since version 4.8.24 and
https://github.com/MidnightCommander/mc/commit/f30e6ff283f4bc86177e4360de94dad794678395Fixes:
- http://autobuild.buildroot.org/results/0e72b0b5b7d7009bd5ad5f15917e94c86e99131bSigned-off-by Fabrice Fontaine <[email protected]>
Both patches applied to master, thanks.
Regards,
Yann E. MORIN.
Quoted 25 lines
--- package/mc/mc.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)package/mc/mc.mk +2
-1@@ -9,7 +9,8 @@ MC_SOURCE = mc-$(MC_VERSION).tar.xz MC_SITE = http://ftp.midnight-commander.org MC_LICENSE = GPL-3.0+ MC_LICENSE_FILES = COPYING -MC_DEPENDENCIES = libglib2 host-pkgconf +MC_DEPENDENCIES = libglib2 host-pkgconf $(TARGET_NLS_DEPENDENCIES) +MC_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) ifeq ($(BR2_PACKAGE_GPM),y) MC_CONF_OPTS += --with-gpm-mouseSignature · 6 lines
2.25.1 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'