2013-06-06 01:53:30 +02:00
|
|
|
################################################################################
|
2012-06-12 18:40:32 +02:00
|
|
|
#
|
|
|
|
|
# cjson
|
|
|
|
|
#
|
2013-06-06 01:53:30 +02:00
|
|
|
################################################################################
|
2013-06-06 01:53:25 +02:00
|
|
|
|
package: remove 'v' prefix from github-fetched packages
On Github, a large number of projects name their tag vXYZ (i.e v3.0,
v0.1, etc.). In some packages we do:
<pkg>_VERSION = v0.3
<pkg>_SITE = $(call github foo,bar,$(<pkg>_VERSION))
And in some other packages we do:
<pkg>_VERSION = 0.3
<pkg>_SITE = $(call github foo,bar,v$(<pkg>_VERSION))
I.e in one case we consider the version to be v0.3, in the other case
we consider 0.3 to be the version.
The problem with v0.3 is that when used in conjunction with
release-monitoring.org, it doesn't work very well, because
release-monitoring.org has the concept of "version prefix" and using
that they drop the "v" prefix for the version.
Therefore, a number of packages in Buildroot have a version that
doesn't match with release-monitoring.org because Buildroot has 'v0.3'
and release-monitoring.org has '0.3'.
Since really the version number of 0.3, is makes sense to update our
packages to drop this 'v'.
This commit only addresses the (common) case of github packages where
the prefix is simply 'v'. Other cases will be handled by separate
commits. Also, there are a few cases that couldn't be handled
mechanically that aren't covered by this commit.
Signed-off-by: Victor Huesca <victor.huesca@bootlin.com>
[Arnout: don't change flatbuffers, json-for-modern-cpp, libpagekite,
python-scapy3k, softether]
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2019-06-12 08:42:06 +02:00
|
|
|
CJSON_VERSION = 1.7.12
|
|
|
|
|
CJSON_SITE = $(call github,DaveGamble,cjson,v$(CJSON_VERSION))
|
2012-06-12 18:40:32 +02:00
|
|
|
CJSON_INSTALL_STAGING = YES
|
.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
|
|
|
CJSON_LICENSE = MIT
|
|
|
|
|
CJSON_LICENSE_FILES = LICENSE
|
2017-02-28 23:26:07 +01:00
|
|
|
# Set ENABLE_CUSTOM_COMPILER_FLAGS to OFF in particular to disable
|
|
|
|
|
# -fstack-protector-strong which depends on BR2_TOOLCHAIN_HAS_SSP
|
2017-02-19 12:29:22 +01:00
|
|
|
CJSON_CONF_OPTS += \
|
2017-02-28 23:26:07 +01:00
|
|
|
-DENABLE_CJSON_TEST=OFF \
|
|
|
|
|
-DENABLE_CUSTOM_COMPILER_FLAGS=OFF
|
2012-06-12 18:40:32 +02:00
|
|
|
|
2018-01-03 22:30:44 +01:00
|
|
|
# If BUILD_SHARED_AND_STATIC_LIBS is set to OFF, cjson uses the
|
|
|
|
|
# standard BUILD_SHARED_LIBS option which is passed by the
|
|
|
|
|
# cmake-package infrastructure.
|
2017-12-31 17:29:33 +01:00
|
|
|
ifeq ($(BR2_SHARED_STATIC_LIBS),y)
|
|
|
|
|
CJSON_CONF_OPTS += -DBUILD_SHARED_AND_STATIC_LIBS=ON
|
|
|
|
|
else
|
|
|
|
|
CJSON_CONF_OPTS += -DBUILD_SHARED_AND_STATIC_LIBS=OFF
|
|
|
|
|
endif
|
|
|
|
|
|
2016-12-03 20:47:45 +01:00
|
|
|
$(eval $(cmake-package))
|
