| Message ID | 1454443064-14269-10-git-send-email-fhunleth@troodon-software.com |
|---|---|
| State | Accepted |
| Headers | show |
Hi Frank, All, Le 02/02/2016 20:57, Frank Hunleth a écrit : > This version includes C++ code, so also add dependency on a C++ > compiler. > > Signed-off-by: Frank Hunleth <fhunleth@troodon-software.com> > --- > package/erlang-p1-stringprep/Config.in | 4 ++++ > package/erlang-p1-stringprep/erlang-p1-stringprep.mk | 2 +- > 2 files changed, 5 insertions(+), 1 deletion(-) > > diff --git a/package/erlang-p1-stringprep/Config.in b/package/erlang-p1-stringprep/Config.in > index 3ef77ed..bc4d139 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 Now BR2_PACKAGE_ERLANG_P1_STRINGPREP denpends on C++, so the dependency must be propagated to ejabberd. With that fixed: Reviewed-by: Romain Naour <romain.naour@gmail.com> Best regards, Romain > > diff --git a/package/erlang-p1-stringprep/erlang-p1-stringprep.mk b/package/erlang-p1-stringprep/erlang-p1-stringprep.mk > index 60c80bc..001c205 100644 > --- a/package/erlang-p1-stringprep/erlang-p1-stringprep.mk > +++ b/package/erlang-p1-stringprep/erlang-p1-stringprep.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -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 >
Dear Frank Hunleth, On Tue, 2 Feb 2016 14:57:35 -0500, Frank Hunleth wrote: > This version includes C++ code, so also add dependency on a C++ > compiler. > > Signed-off-by: Frank Hunleth <fhunleth@troodon-software.com> > --- > package/erlang-p1-stringprep/Config.in | 4 ++++ > package/erlang-p1-stringprep/erlang-p1-stringprep.mk | 2 +- > 2 files changed, 5 insertions(+), 1 deletion(-) Applied to next, but after doing the following changes: [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.] Thomas
diff --git a/package/erlang-p1-stringprep/Config.in b/package/erlang-p1-stringprep/Config.in index 3ef77ed..bc4d139 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 60c80bc..001c205 100644 --- a/package/erlang-p1-stringprep/erlang-p1-stringprep.mk +++ b/package/erlang-p1-stringprep/erlang-p1-stringprep.mk @@ -4,7 +4,7 @@ # ################################################################################ -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
This version includes C++ code, so also add dependency on a C++ compiler. Signed-off-by: Frank Hunleth <fhunleth@troodon-software.com> --- package/erlang-p1-stringprep/Config.in | 4 ++++ package/erlang-p1-stringprep/erlang-p1-stringprep.mk | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)