| Message ID | 1529533571-22499-1-git-send-email-JoelsonCarl@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v3,1/1] cmocka: new package | expand |
On Wed, Jun 20, 2018, 6:26 PM Joel Carlson <joelsoncarl@gmail.com> wrote: > Signed-off-by: Nimai Mahajan <nimaim@gmail.com> > Signed-off-by: Joel Carlson <JoelsonCarl@gmail.com> > --- > v2 was by Nimai Mahajan, here: http://patchwork.ozlabs.org/patch/500181/ > > Changes v2 -> v3 > - changed from v1.0.1 to v1.1.1 > - added dependency on !BR2_STATIC_LIBS (suggested by Romain) > - added patch to fix build issue for toolchains without stack protection > (issue found by Romain) > - added generation of static library for BR2_SHARED_STATIC_LIBS > --- > Thank you for fixing this up Joel. It kind of fell off my radar. DEVELOPERS | 1 + > package/Config.in | 1 + > ...0001-cmocka-cmake-fix-stack-protect-check.patch | 34 > ++++++++++++++++++++++ > package/cmocka/Config.in | 15 ++++++++++ > package/cmocka/cmocka.hash | 2 ++ > package/cmocka/cmocka.mk | 23 +++++++++++++++ > 6 files changed, 76 insertions(+) > create mode 100644 > package/cmocka/0001-cmocka-cmake-fix-stack-protect-check.patch > create mode 100644 package/cmocka/Config.in > create mode 100644 package/cmocka/cmocka.hash > create mode 100644 package/cmocka/cmocka.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index d22ac52..229a584 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -966,6 +966,7 @@ N: Jeremy Rosen <jeremy.rosen@openwide.fr> > F: package/fxload/ > > N: Joel Carlson <JoelsonCarl@gmail.com> > +F: package/cmocka/ > F: package/flatcc/ > > N: Joel Stanley <joel@jms.id.au> > diff --git a/package/Config.in b/package/Config.in > index a5ecfec..f60af1e 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1501,6 +1501,7 @@ menu "Other" > source "package/clang/Config.in" > source "package/clapack/Config.in" > source "package/classpath/Config.in" > + source "package/cmocka/Config.in" > source "package/cppcms/Config.in" > source "package/cracklib/Config.in" > source "package/dawgdic/Config.in" > diff --git > a/package/cmocka/0001-cmocka-cmake-fix-stack-protect-check.patch > b/package/cmocka/0001-cmocka-cmake-fix-stack-protect-check.patch > new file mode 100644 > index 0000000..c7a2c27 > --- /dev/null > +++ b/package/cmocka/0001-cmocka-cmake-fix-stack-protect-check.patch > @@ -0,0 +1,34 @@ > +From f9a964edde4011adf88902018cbb87723d78d0a2 Mon Sep 17 00:00:00 2001 > +From: Joel Carlson <JoelsonCarl@gmail.com> > +Date: Wed, 20 Jun 2018 14:35:13 -0600 > +Subject: [PATCH 1/1] cmocka cmake: fix stack protect check > + > +The cmake check for if -fstack-protect is supported needs to use > +CMAKE_REQUIRED_FLAGS and not CMAKE_REQUIRED_DEFINITIONS. > + > +Signed-off-by: Joel Carlson <JoelsonCarl@gmail.com> > +--- > +Upstream status: submitted to cmocka mailing list > + > + cmake/Modules/CheckCCompilerFlagSSP.cmake | 6 +++--- > + 1 file changed, 3 insertions(+), 3 deletions(-) > + > +diff --git a/cmake/Modules/CheckCCompilerFlagSSP.cmake > b/cmake/Modules/CheckCCompilerFlagSSP.cmake > +index 2fe4395..ed34eb3 100644 > +--- a/cmake/Modules/CheckCCompilerFlagSSP.cmake > ++++ b/cmake/Modules/CheckCCompilerFlagSSP.cmake > +@@ -19,8 +19,8 @@ > + include(CheckCSourceCompiles) > + > + function(CHECK_C_COMPILER_FLAG_SSP _FLAG _RESULT) > +- set(SAFE_CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS}") > +- set(CMAKE_REQUIRED_DEFINITIONS "${_FLAG}") > ++ set(SAFE_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}") > ++ set(CMAKE_REQUIRED_FLAGS "${_FLAG}") > + check_c_source_compiles("int main(int argc, char **argv) { char > buffer[256]; return buffer[argc]=0;}" ${_RESULT}) > +- set(CMAKE_REQUIRED_DEFINITIONS "${SAFE_CMAKE_REQUIRED_DEFINITIONS}") > ++ set(CMAKE_REQUIRED_FLAGS "${SAFE_CMAKE_REQUIRED_FLAGS}") > + endfunction(CHECK_C_COMPILER_FLAG_SSP) > +-- > +2.7.4 > + > diff --git a/package/cmocka/Config.in b/package/cmocka/Config.in > new file mode 100644 > index 0000000..cf49d0f > --- /dev/null > +++ b/package/cmocka/Config.in > @@ -0,0 +1,15 @@ > +config BR2_PACKAGE_CMOCKA > + bool cmocka > + depends on !BR2_STATIC_LIBS > + help > + cmocka is an elegant unit testing framework for C with support > + for mock objects. It only requires the standard C library, > + works on a range of computing platforms (including embedded) > + and with different compilers. It is a fork of Google's very > + popular cmockery unit testing framework to fix bugs and > + support it in the future. > + > + https://cmocka.org > + > +comment "cmocka needs a toolchain w/ dynamic library" > + depends on BR2_STATIC_LIBS > diff --git a/package/cmocka/cmocka.hash b/package/cmocka/cmocka.hash > new file mode 100644 > index 0000000..1de4a12 > --- /dev/null > +++ b/package/cmocka/cmocka.hash > @@ -0,0 +1,2 @@ > +# Locally computed: > +sha256 f02ef48a7039aa77191d525c5b1aee3f13286b77a13615d11bc1148753fc0389 > cmocka-1.1.1.tar.xz > diff --git a/package/cmocka/cmocka.mk b/package/cmocka/cmocka.mk > new file mode 100644 > index 0000000..64f5a4a > --- /dev/null > +++ b/package/cmocka/cmocka.mk > @@ -0,0 +1,23 @@ > > +################################################################################ > +# > +# cmocka > +# > > +################################################################################ > + > +CMOCKA_VERSION = 1.1.1 > +CMOCKA_SOURCE = cmocka-$(CMOCKA_VERSION).tar.xz > +CMOCKA_SITE = https://cmocka.org/files/1.1 > +CMOCKA_LICENSE = Apache-2.0 > +CMOCKA_LICENSE_FILES = COPYING > +CMOCKA_INSTALL_STAGING = YES > + > +# cmocka only supports out of source builds > +CMOCKA_SUPPORTS_IN_SOURCE_BUILD = NO > + > +# cmocka always builds a shared library, but you can optionally build a > static > +# library as well > +ifeq ($(BR2_SHARED_STATIC_LIBS),y) > +CMOCKA_CONF_OPTS += -DWITH_STATIC_LIB=ON > +endif > + > +$(eval $(cmake-package)) > -- > 2.7.4 > > <div class="gmail_quote"><div dir="ltr">On Wed, Jun 20, 2018, 6:26 PM Joel Carlson <<a href="mailto:joelsoncarl@gmail.com">joelsoncarl@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Signed-off-by: Nimai Mahajan <<a href="mailto:nimaim@gmail.com" target="_blank">nimaim@gmail.com</a>><br> Signed-off-by: Joel Carlson <<a href="mailto:JoelsonCarl@gmail.com" target="_blank">JoelsonCarl@gmail.com</a>><br> ---<br> v2 was by Nimai Mahajan, here: <a href="http://patchwork.ozlabs.org/patch/500181/" rel="noreferrer" target="_blank">http://patchwork.ozlabs.org/patch/500181/</a><br> <br> Changes v2 -> v3<br> - changed from v1.0.1 to v1.1.1<br> - added dependency on !BR2_STATIC_LIBS (suggested by Romain)<br> - added patch to fix build issue for toolchains without stack protection<br> (issue found by Romain)<br> - added generation of static library for BR2_SHARED_STATIC_LIBS<br> ---<br></blockquote></div><div><br></div><div>Thank you for fixing this up Joel. It kind of fell off my radar.</div><div><br></div><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> DEVELOPERS | 1 +<br> package/Config.in | 1 +<br> ...0001-cmocka-cmake-fix-stack-protect-check.patch | 34 ++++++++++++++++++++++<br> package/cmocka/Config.in | 15 ++++++++++<br> package/cmocka/cmocka.hash | 2 ++<br> package/cmocka/<a href="http://cmocka.mk" rel="noreferrer" target="_blank">cmocka.mk</a> | 23 +++++++++++++++<br> 6 files changed, 76 insertions(+)<br> create mode 100644 package/cmocka/0001-cmocka-cmake-fix-stack-protect-check.patch<br> create mode 100644 package/cmocka/Config.in<br> create mode 100644 package/cmocka/cmocka.hash<br> create mode 100644 package/cmocka/<a href="http://cmocka.mk" rel="noreferrer" target="_blank">cmocka.mk</a><br> <br> diff --git a/DEVELOPERS b/DEVELOPERS<br> index d22ac52..229a584 100644<br> --- a/DEVELOPERS<br> +++ b/DEVELOPERS<br> @@ -966,6 +966,7 @@ N: Jeremy Rosen <<a href="mailto:jeremy.rosen@openwide.fr" target="_blank">jeremy.rosen@openwide.fr</a>><br> F: package/fxload/<br> <br> N: Joel Carlson <<a href="mailto:JoelsonCarl@gmail.com" target="_blank">JoelsonCarl@gmail.com</a>><br> +F: package/cmocka/<br> F: package/flatcc/<br> <br> N: Joel Stanley <<a href="mailto:joel@jms.id.au" target="_blank">joel@jms.id.au</a>><br> diff --git a/package/Config.in b/package/Config.in<br> index a5ecfec..f60af1e 100644<br> --- a/package/Config.in<br> +++ b/package/Config.in<br> @@ -1501,6 +1501,7 @@ menu "Other"<br> source "package/clang/Config.in"<br> source "package/clapack/Config.in"<br> source "package/classpath/Config.in"<br> + source "package/cmocka/Config.in"<br> source "package/cppcms/Config.in"<br> source "package/cracklib/Config.in"<br> source "package/dawgdic/Config.in"<br> diff --git a/package/cmocka/0001-cmocka-cmake-fix-stack-protect-check.patch b/package/cmocka/0001-cmocka-cmake-fix-stack-protect-check.patch<br> new file mode 100644<br> index 0000000..c7a2c27<br> --- /dev/null<br> +++ b/package/cmocka/0001-cmocka-cmake-fix-stack-protect-check.patch<br> @@ -0,0 +1,34 @@<br> +From f9a964edde4011adf88902018cbb87723d78d0a2 Mon Sep 17 00:00:00 2001<br> +From: Joel Carlson <<a href="mailto:JoelsonCarl@gmail.com" target="_blank">JoelsonCarl@gmail.com</a>><br> +Date: Wed, 20 Jun 2018 14:35:13 -0600<br> +Subject: [PATCH 1/1] cmocka cmake: fix stack protect check<br> +<br> +The cmake check for if -fstack-protect is supported needs to use<br> +CMAKE_REQUIRED_FLAGS and not CMAKE_REQUIRED_DEFINITIONS.<br> +<br> +Signed-off-by: Joel Carlson <<a href="mailto:JoelsonCarl@gmail.com" target="_blank">JoelsonCarl@gmail.com</a>><br> +---<br> +Upstream status: submitted to cmocka mailing list<br> +<br> + cmake/Modules/CheckCCompilerFlagSSP.cmake | 6 +++---<br> + 1 file changed, 3 insertions(+), 3 deletions(-)<br> +<br> +diff --git a/cmake/Modules/CheckCCompilerFlagSSP.cmake b/cmake/Modules/CheckCCompilerFlagSSP.cmake<br> +index 2fe4395..ed34eb3 100644<br> +--- a/cmake/Modules/CheckCCompilerFlagSSP.cmake<br> ++++ b/cmake/Modules/CheckCCompilerFlagSSP.cmake<br> +@@ -19,8 +19,8 @@<br> + include(CheckCSourceCompiles)<br> + <br> + function(CHECK_C_COMPILER_FLAG_SSP _FLAG _RESULT)<br> +- set(SAFE_CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS}")<br> +- set(CMAKE_REQUIRED_DEFINITIONS "${_FLAG}")<br> ++ set(SAFE_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")<br> ++ set(CMAKE_REQUIRED_FLAGS "${_FLAG}")<br> + check_c_source_compiles("int main(int argc, char **argv) { char buffer[256]; return buffer[argc]=0;}" ${_RESULT})<br> +- set(CMAKE_REQUIRED_DEFINITIONS "${SAFE_CMAKE_REQUIRED_DEFINITIONS}")<br> ++ set(CMAKE_REQUIRED_FLAGS "${SAFE_CMAKE_REQUIRED_FLAGS}")<br> + endfunction(CHECK_C_COMPILER_FLAG_SSP)<br> +-- <br> +2.7.4<br> +<br> diff --git a/package/cmocka/Config.in b/package/cmocka/Config.in<br> new file mode 100644<br> index 0000000..cf49d0f<br> --- /dev/null<br> +++ b/package/cmocka/Config.in<br> @@ -0,0 +1,15 @@<br> +config BR2_PACKAGE_CMOCKA<br> + bool cmocka<br> + depends on !BR2_STATIC_LIBS<br> + help<br> + cmocka is an elegant unit testing framework for C with support<br> + for mock objects. It only requires the standard C library,<br> + works on a range of computing platforms (including embedded)<br> + and with different compilers. It is a fork of Google's very<br> + popular cmockery unit testing framework to fix bugs and<br> + support it in the future.<br> +<br> + <a href="https://cmocka.org" rel="noreferrer" target="_blank">https://cmocka.org</a><br> +<br> +comment "cmocka needs a toolchain w/ dynamic library"<br> + depends on BR2_STATIC_LIBS<br> diff --git a/package/cmocka/cmocka.hash b/package/cmocka/cmocka.hash<br> new file mode 100644<br> index 0000000..1de4a12<br> --- /dev/null<br> +++ b/package/cmocka/cmocka.hash<br> @@ -0,0 +1,2 @@<br> +# Locally computed:<br> +sha256 f02ef48a7039aa77191d525c5b1aee3f13286b77a13615d11bc1148753fc0389 cmocka-1.1.1.tar.xz<br> diff --git a/package/cmocka/<a href="http://cmocka.mk" rel="noreferrer" target="_blank">cmocka.mk</a> b/package/cmocka/<a href="http://cmocka.mk" rel="noreferrer" target="_blank">cmocka.mk</a><br> new file mode 100644<br> index 0000000..64f5a4a<br> --- /dev/null<br> +++ b/package/cmocka/<a href="http://cmocka.mk" rel="noreferrer" target="_blank">cmocka.mk</a><br> @@ -0,0 +1,23 @@<br> +################################################################################<br> +#<br> +# cmocka<br> +#<br> +################################################################################<br> +<br> +CMOCKA_VERSION = 1.1.1<br> +CMOCKA_SOURCE = cmocka-$(CMOCKA_VERSION).tar.xz<br> +CMOCKA_SITE = <a href="https://cmocka.org/files/1.1" rel="noreferrer" target="_blank">https://cmocka.org/files/1.1</a><br> +CMOCKA_LICENSE = Apache-2.0<br> +CMOCKA_LICENSE_FILES = COPYING<br> +CMOCKA_INSTALL_STAGING = YES<br> +<br> +# cmocka only supports out of source builds<br> +CMOCKA_SUPPORTS_IN_SOURCE_BUILD = NO<br> +<br> +# cmocka always builds a shared library, but you can optionally build a static<br> +# library as well<br> +ifeq ($(BR2_SHARED_STATIC_LIBS),y)<br> +CMOCKA_CONF_OPTS += -DWITH_STATIC_LIB=ON<br> +endif<br> +<br> +$(eval $(cmake-package))<br> -- <br> 2.7.4<br> <br> </blockquote></div>
On Wed, Jun 20, 2018 at 4:26 PM, Joel Carlson <joelsoncarl@gmail.com> wrote: > Signed-off-by: Nimai Mahajan <nimaim@gmail.com> > Signed-off-by: Joel Carlson <JoelsonCarl@gmail.com> > --- > v2 was by Nimai Mahajan, here: http://patchwork.ozlabs.org/patch/500181/ > > Changes v2 -> v3 > - changed from v1.0.1 to v1.1.1 > - added dependency on !BR2_STATIC_LIBS (suggested by Romain) > - added patch to fix build issue for toolchains without stack protection > (issue found by Romain) > - added generation of static library for BR2_SHARED_STATIC_LIBS > --- > DEVELOPERS | 1 + > package/Config.in | 1 + > ...0001-cmocka-cmake-fix-stack-protect-check.patch | 34 ++++++++++++++++++++++ > package/cmocka/Config.in | 15 ++++++++++ > package/cmocka/cmocka.hash | 2 ++ > package/cmocka/cmocka.mk | 23 +++++++++++++++ > 6 files changed, 76 insertions(+) > create mode 100644 package/cmocka/0001-cmocka-cmake-fix-stack-protect-check.patch > create mode 100644 package/cmocka/Config.in > create mode 100644 package/cmocka/cmocka.hash > create mode 100644 package/cmocka/cmocka.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index d22ac52..229a584 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -966,6 +966,7 @@ N: Jeremy Rosen <jeremy.rosen@openwide.fr> > F: package/fxload/ > > N: Joel Carlson <JoelsonCarl@gmail.com> > +F: package/cmocka/ > F: package/flatcc/ > > N: Joel Stanley <joel@jms.id.au> > diff --git a/package/Config.in b/package/Config.in > index a5ecfec..f60af1e 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1501,6 +1501,7 @@ menu "Other" > source "package/clang/Config.in" > source "package/clapack/Config.in" > source "package/classpath/Config.in" > + source "package/cmocka/Config.in" > source "package/cppcms/Config.in" > source "package/cracklib/Config.in" > source "package/dawgdic/Config.in" > diff --git a/package/cmocka/0001-cmocka-cmake-fix-stack-protect-check.patch b/package/cmocka/0001-cmocka-cmake-fix-stack-protect-check.patch > new file mode 100644 > index 0000000..c7a2c27 > --- /dev/null > +++ b/package/cmocka/0001-cmocka-cmake-fix-stack-protect-check.patch > @@ -0,0 +1,34 @@ > +From f9a964edde4011adf88902018cbb87723d78d0a2 Mon Sep 17 00:00:00 2001 > +From: Joel Carlson <JoelsonCarl@gmail.com> > +Date: Wed, 20 Jun 2018 14:35:13 -0600 > +Subject: [PATCH 1/1] cmocka cmake: fix stack protect check > + > +The cmake check for if -fstack-protect is supported needs to use > +CMAKE_REQUIRED_FLAGS and not CMAKE_REQUIRED_DEFINITIONS. > + > +Signed-off-by: Joel Carlson <JoelsonCarl@gmail.com> > +--- > +Upstream status: submitted to cmocka mailing list Note: this is now committed to the cmocka master branch as commit d677b564c2193a5cd381925c2eeaad6b23c6af2f > + > + cmake/Modules/CheckCCompilerFlagSSP.cmake | 6 +++--- > + 1 file changed, 3 insertions(+), 3 deletions(-) > + > +diff --git a/cmake/Modules/CheckCCompilerFlagSSP.cmake b/cmake/Modules/CheckCCompilerFlagSSP.cmake > +index 2fe4395..ed34eb3 100644 > +--- a/cmake/Modules/CheckCCompilerFlagSSP.cmake > ++++ b/cmake/Modules/CheckCCompilerFlagSSP.cmake > +@@ -19,8 +19,8 @@ > + include(CheckCSourceCompiles) > + > + function(CHECK_C_COMPILER_FLAG_SSP _FLAG _RESULT) > +- set(SAFE_CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS}") > +- set(CMAKE_REQUIRED_DEFINITIONS "${_FLAG}") > ++ set(SAFE_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}") > ++ set(CMAKE_REQUIRED_FLAGS "${_FLAG}") > + check_c_source_compiles("int main(int argc, char **argv) { char buffer[256]; return buffer[argc]=0;}" ${_RESULT}) > +- set(CMAKE_REQUIRED_DEFINITIONS "${SAFE_CMAKE_REQUIRED_DEFINITIONS}") > ++ set(CMAKE_REQUIRED_FLAGS "${SAFE_CMAKE_REQUIRED_FLAGS}") > + endfunction(CHECK_C_COMPILER_FLAG_SSP) > +-- > +2.7.4 > + [snip]
Hello, On Wed, 20 Jun 2018 16:26:11 -0600, Joel Carlson wrote: > Signed-off-by: Nimai Mahajan <nimaim@gmail.com> > Signed-off-by: Joel Carlson <JoelsonCarl@gmail.com> > --- > v2 was by Nimai Mahajan, here: http://patchwork.ozlabs.org/patch/500181/ Applied to master, thanks. Thomas
diff --git a/DEVELOPERS b/DEVELOPERS index d22ac52..229a584 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -966,6 +966,7 @@ N: Jeremy Rosen <jeremy.rosen@openwide.fr> F: package/fxload/ N: Joel Carlson <JoelsonCarl@gmail.com> +F: package/cmocka/ F: package/flatcc/ N: Joel Stanley <joel@jms.id.au> diff --git a/package/Config.in b/package/Config.in index a5ecfec..f60af1e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1501,6 +1501,7 @@ menu "Other" source "package/clang/Config.in" source "package/clapack/Config.in" source "package/classpath/Config.in" + source "package/cmocka/Config.in" source "package/cppcms/Config.in" source "package/cracklib/Config.in" source "package/dawgdic/Config.in" diff --git a/package/cmocka/0001-cmocka-cmake-fix-stack-protect-check.patch b/package/cmocka/0001-cmocka-cmake-fix-stack-protect-check.patch new file mode 100644 index 0000000..c7a2c27 --- /dev/null +++ b/package/cmocka/0001-cmocka-cmake-fix-stack-protect-check.patch @@ -0,0 +1,34 @@ +From f9a964edde4011adf88902018cbb87723d78d0a2 Mon Sep 17 00:00:00 2001 +From: Joel Carlson <JoelsonCarl@gmail.com> +Date: Wed, 20 Jun 2018 14:35:13 -0600 +Subject: [PATCH 1/1] cmocka cmake: fix stack protect check + +The cmake check for if -fstack-protect is supported needs to use +CMAKE_REQUIRED_FLAGS and not CMAKE_REQUIRED_DEFINITIONS. + +Signed-off-by: Joel Carlson <JoelsonCarl@gmail.com> +--- +Upstream status: submitted to cmocka mailing list + + cmake/Modules/CheckCCompilerFlagSSP.cmake | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/cmake/Modules/CheckCCompilerFlagSSP.cmake b/cmake/Modules/CheckCCompilerFlagSSP.cmake +index 2fe4395..ed34eb3 100644 +--- a/cmake/Modules/CheckCCompilerFlagSSP.cmake ++++ b/cmake/Modules/CheckCCompilerFlagSSP.cmake +@@ -19,8 +19,8 @@ + include(CheckCSourceCompiles) + + function(CHECK_C_COMPILER_FLAG_SSP _FLAG _RESULT) +- set(SAFE_CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS}") +- set(CMAKE_REQUIRED_DEFINITIONS "${_FLAG}") ++ set(SAFE_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}") ++ set(CMAKE_REQUIRED_FLAGS "${_FLAG}") + check_c_source_compiles("int main(int argc, char **argv) { char buffer[256]; return buffer[argc]=0;}" ${_RESULT}) +- set(CMAKE_REQUIRED_DEFINITIONS "${SAFE_CMAKE_REQUIRED_DEFINITIONS}") ++ set(CMAKE_REQUIRED_FLAGS "${SAFE_CMAKE_REQUIRED_FLAGS}") + endfunction(CHECK_C_COMPILER_FLAG_SSP) +-- +2.7.4 + diff --git a/package/cmocka/Config.in b/package/cmocka/Config.in new file mode 100644 index 0000000..cf49d0f --- /dev/null +++ b/package/cmocka/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_CMOCKA + bool cmocka + depends on !BR2_STATIC_LIBS + help + cmocka is an elegant unit testing framework for C with support + for mock objects. It only requires the standard C library, + works on a range of computing platforms (including embedded) + and with different compilers. It is a fork of Google's very + popular cmockery unit testing framework to fix bugs and + support it in the future. + + https://cmocka.org + +comment "cmocka needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/package/cmocka/cmocka.hash b/package/cmocka/cmocka.hash new file mode 100644 index 0000000..1de4a12 --- /dev/null +++ b/package/cmocka/cmocka.hash @@ -0,0 +1,2 @@ +# Locally computed: +sha256 f02ef48a7039aa77191d525c5b1aee3f13286b77a13615d11bc1148753fc0389 cmocka-1.1.1.tar.xz diff --git a/package/cmocka/cmocka.mk b/package/cmocka/cmocka.mk new file mode 100644 index 0000000..64f5a4a --- /dev/null +++ b/package/cmocka/cmocka.mk @@ -0,0 +1,23 @@ +################################################################################ +# +# cmocka +# +################################################################################ + +CMOCKA_VERSION = 1.1.1 +CMOCKA_SOURCE = cmocka-$(CMOCKA_VERSION).tar.xz +CMOCKA_SITE = https://cmocka.org/files/1.1 +CMOCKA_LICENSE = Apache-2.0 +CMOCKA_LICENSE_FILES = COPYING +CMOCKA_INSTALL_STAGING = YES + +# cmocka only supports out of source builds +CMOCKA_SUPPORTS_IN_SOURCE_BUILD = NO + +# cmocka always builds a shared library, but you can optionally build a static +# library as well +ifeq ($(BR2_SHARED_STATIC_LIBS),y) +CMOCKA_CONF_OPTS += -DWITH_STATIC_LIB=ON +endif + +$(eval $(cmake-package))