kumquat-buildroot/package/localedef/localedef.mk

23 lines
692 B
Makefile
Raw Normal View History

################################################################################
#
# localedef
#
################################################################################
LOCALEDEF_VERSION = 2.14.1-r17443-ptx1
.mk files: bulk aligment and whitespace cleanup of assignments The Buildroot coding style defines one space around make assignments and does not align the assignment symbols. This patch does a bulk fix of offending packages. The package infrastructures (or more in general assignments to calculated variable names, like $(2)_FOO) are not touched. Alignment of line continuation characters (\) is kept as-is. The sed command used to do this replacement is: find * -name "*.mk" | xargs sed -i \ -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*$#\1 \2#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\]\+\)$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\ \t]\+\s*\\\)\s*$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\(\s*\\\)#\1 \2\3#' Brief explanation of this command: ^\([A-Z0-9a-z_]\+\) a regular variable at the beginning of the line \([?:+]\?=\) any assignment character =, :=, ?=, += \([^\\]\+\) any string not containing a line continuation \([^\\ \t]\+\s*\\\) string, optional whitespace, followed by a line continuation character \(\s*\\\) optional whitespace, followed by a line continuation character Hence, the first subexpression handles empty assignments, the second handles regular assignments, the third handles regular assignments with line continuation, and the fourth empty assignments with line continuation. This expression was tested on following test text: (initial tab not included) FOO = spaces before FOO = spaces before and after FOO = tab before FOO = tab and spaces before FOO = tab after FOO = tab and spaces after FOO = spaces and tab after FOO = \ FOO = bar \ FOO = bar space \ FOO = \ GENIMAGE_DEPENDENCIES = host-pkgconf libconfuse FOO += spaces before FOO ?= spaces before and after FOO := FOO = FOO = FOO = FOO = $(MAKE1) CROSS_COMPILE=$(TARGET_CROSS) -C AT91BOOTSTRAP3_DEFCONFIG = \ AXEL_DISABLE_I18N=--i18n=0 After this bulk change, following manual fixups were done: - fix line continuation alignment in cegui06 and spice (the sed expression leaves the number of whitespace between the value and line continuation character intact, but the whitespace before that could have changed, causing misalignment. - qt5base was reverted, as this package uses extensive alignment which actually makes the code more readable. Finally, the end result was manually reviewed. Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Cc: Yann E. Morin <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-07 09:06:03 +02:00
LOCALEDEF_SOURCE = localedef-eglibc-$(LOCALEDEF_VERSION).tar.bz2
LOCALEDEF_SITE = http://www.pengutronix.de/software/ptxdist/temporary-src
HOST_LOCALEDEF_CONF_OPTS += \
--prefix=/usr \
--with-glibc=./eglibc
host-localdef fails under gcc5 Building host-localdef fails under gcc5.1 reporting multiple definitions and undefined references: argp-help.o: In function `argp_fmtstream_write': argp-help.c:(.text+0x1dc0): multiple definition of `argp_fmtstream_write' argp-fmtstream.o:argp-fmtstream.c:(.text+0x750): first defined here argp-help.o: In function `argp_fmtstream_puts': argp-help.c:(.text+0x1e10): multiple definition of `argp_fmtstream_puts' argp-fmtstream.o:argp-fmtstream.c:(.text+0x810): first defined here argp-help.o: In function `argp_fmtstream_putc': argp-help.c:(.text+0x1e80): multiple definition of `argp_fmtstream_putc' argp-fmtstream.o:argp-fmtstream.c:(.text+0x7b0): first defined here argp-help.o: In function `argp_fmtstream_set_lmargin': argp-help.c:(.text+0x1ed0): multiple definition of `argp_fmtstream_set_lmargin' argp-fmtstream.o:argp-fmtstream.c:(.text+0x590): first defined here argp-help.o: In function `argp_fmtstream_set_rmargin': argp-help.c:(.text+0x1f00): multiple definition of `argp_fmtstream_set_rmargin' argp-fmtstream.o:argp-fmtstream.c:(.text+0x5c0): first defined here argp-help.o: In function `argp_fmtstream_set_wmargin': argp-help.c:(.text+0x1f30): multiple definition of `argp_fmtstream_set_wmargin' argp-fmtstream.o:argp-fmtstream.c:(.text+0x5f0): first defined here argp-help.o: In function `argp_fmtstream_point': argp-help.c:(.text+0x1f60): multiple definition of `argp_fmtstream_point' argp-fmtstream.o:argp-fmtstream.c:(.text+0x620): first defined here charmap.o: In function `cmlr_open.constprop.2': charmap.c:(.text+0x230a): undefined reference to `charmap_hash' charmap.o: In function `charmap_read': charmap.c:(.text+0x2397): undefined reference to `charmap_hash' locfile.o: In function `locfile_read': locfile.c:(.text+0x2e4): undefined reference to `locfile_hash' locfile.c:(.text+0x8f4): undefined reference to `locfile_hash' locfile.c:(.text+0x9b3): undefined reference to `locfile_hash' locfile.c:(.text+0xa36): undefined reference to `locfile_hash' collect2: error: ld returned 1 exit status Makefile:58: recipe for target 'localedef' failed Ref: http://permalink.gmane.org/gmane.comp.embedded.ptxdist.devel/12950 Signed-off-by: Stephen Agate <stephen.agate@talktalk.net> Reviewed-by: Romain Naour <romain.naour@openwide.fr> Tested-by: Romain Naour <romain.naour@openwide.fr> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2015-08-31 23:50:47 +02:00
HOST_LOCALEDEF_CONF_ENV = CFLAGS="$(HOST_CFLAGS) -fgnu89-inline"
# The makefile does not implement an install target
define HOST_LOCALEDEF_INSTALL_CMDS
$(INSTALL) -D -m 0755 $(@D)/localedef $(HOST_DIR)/usr/bin/localedef
endef
$(eval $(host-autotools-package))