diff options
| author | Frank Hunleth <fhunleth@troodon-software.com> | 2016-02-02 14:57:35 -0500 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2016-02-20 18:51:16 +0100 |
| commit | 861ebf9111ab432857d6fbd98680bbf4996cfd07 (patch) | |
| tree | ea7cf2044c97ca21e4e3ca368262d8f4f766b6c6 | |
| parent | a42e850b05341a5883fd2d3af85ba90898b0872c (diff) | |
| download | buildroot-861ebf9111ab432857d6fbd98680bbf4996cfd07.tar.gz buildroot-861ebf9111ab432857d6fbd98680bbf4996cfd07.zip | |
erlang-p1-stringprep: bump to version 1.0.0
This version includes C++ code, so also add dependency on a C++
compiler.
Signed-off-by: Frank Hunleth <fhunleth@troodon-software.com>
[Thomas:
- propagate new C++ dependency to ejabberd, as noticed by
Romain Naour
- fix license information and license files. Not all the code is
under the TCL license, in fact most of the code is under the
Apache-2.0 license, and some additional license files have been
added to clarify this.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
| -rw-r--r-- | package/ejabberd/Config.in | 5 | ||||
| -rw-r--r-- | package/erlang-p1-stringprep/Config.in | 4 | ||||
| -rw-r--r-- | package/erlang-p1-stringprep/erlang-p1-stringprep.mk | 6 |
3 files changed, 10 insertions, 5 deletions
diff --git a/package/ejabberd/Config.in b/package/ejabberd/Config.in index 7b4e99b791..5d176c3af6 100644 --- a/package/ejabberd/Config.in +++ b/package/ejabberd/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_EJABBERD bool "ejabberd" depends on BR2_PACKAGE_ERLANG + depends on BR2_INSTALL_LIBSTDCPP # stringprep select BR2_PACKAGE_ERLANG_LAGER select BR2_PACKAGE_ERLANG_P1_CACHE_TAB select BR2_PACKAGE_ERLANG_P1_ICONV @@ -18,5 +19,5 @@ config BR2_PACKAGE_EJABBERD http://www.ejabberd.im -comment "ejabberd needs erlang" - depends on !BR2_PACKAGE_ERLANG +comment "ejabberd needs erlang, toolchain w/ C++" + depends on !BR2_PACKAGE_ERLANG || !BR2_INSTALL_LIBSTDCPP diff --git a/package/erlang-p1-stringprep/Config.in b/package/erlang-p1-stringprep/Config.in index 3ef77ed601..bc4d1394ef 100644 --- a/package/erlang-p1-stringprep/Config.in +++ b/package/erlang-p1-stringprep/Config.in @@ -1,5 +1,9 @@ +comment "erlang-p1-stringprep needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP + config BR2_PACKAGE_ERLANG_P1_STRINGPREP bool "erlang-p1-stringprep" + depends on BR2_INSTALL_LIBSTDCPP help Erlang interface to stringprep diff --git a/package/erlang-p1-stringprep/erlang-p1-stringprep.mk b/package/erlang-p1-stringprep/erlang-p1-stringprep.mk index 60c80bc06e..0a5a1f548d 100644 --- a/package/erlang-p1-stringprep/erlang-p1-stringprep.mk +++ b/package/erlang-p1-stringprep/erlang-p1-stringprep.mk @@ -4,9 +4,9 @@ # ################################################################################ -ERLANG_P1_STRINGPREP_VERSION = 3c64023 +ERLANG_P1_STRINGPREP_VERSION = 1.0.0 ERLANG_P1_STRINGPREP_SITE = $(call github,processone,stringprep,$(ERLANG_P1_STRINGPREP_VERSION)) -ERLANG_P1_STRINGPREP_LICENSE = TCL -ERLANG_P1_STRINGPREP_LICENSE_FILES = LICENSE.TCL +ERLANG_P1_STRINGPREP_LICENSE = TCL (tools/*.tcl), Apache-2.0 (rest) +ERLANG_P1_STRINGPREP_LICENSE_FILES = LICENSE.ALL LICENSE.TCL LICENSE.txt $(eval $(rebar-package)) |
