summaryrefslogtreecommitdiffstats
path: root/package/erlang-p1-stringprep
diff options
context:
space:
mode:
authorPeter Korsgaard <peter@korsgaard.com>2016-03-02 21:25:00 +0100
committerPeter Korsgaard <peter@korsgaard.com>2016-03-02 21:25:00 +0100
commit28cd1ed30aa4959c744ee37a6070cf22a66fb31f (patch)
treefe08f3fdff6fe458a3a21cf814f12ed6c7ba54e4 /package/erlang-p1-stringprep
parent13222c07293becaefc69c46c8f90b04ddc7023d9 (diff)
parent2dfabd10d1e484d84c0e6b5a58ab43d131ca3230 (diff)
downloadbuildroot-28cd1ed30aa4959c744ee37a6070cf22a66fb31f.tar.gz
buildroot-28cd1ed30aa4959c744ee37a6070cf22a66fb31f.zip
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/erlang-p1-stringprep')
-rw-r--r--package/erlang-p1-stringprep/Config.in4
-rw-r--r--package/erlang-p1-stringprep/erlang-p1-stringprep.mk6
2 files changed, 7 insertions, 3 deletions
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))
OpenPOWER on IntegriCloud