* [Buildroot] [PATCH] cmake: bump to version 3.3.1
@ 2015-09-07 13:36 gustavo.zacarias at free-electrons.com
2015-09-07 14:43 ` Vicente Olivert Riera
0 siblings, 1 reply; 6+ messages in thread
From: gustavo.zacarias at free-electrons.com @ 2015-09-07 13:36 UTC (permalink / raw)
To: buildroot
From: Gustavo Zacarias <gustavo.zacarias@free-electrons.com>
xtensa patch is upstream so there's no need for it any longer.
Signed-off-by: Gustavo Zacarias <gustavo.zacarias@free-electrons.com>
---
...IML-Teach-ABI.h-about-Xtensa-architecture.patch | 30 ----------------------
package/cmake/cmake.hash | 4 +--
package/cmake/cmake.mk | 4 +--
3 files changed, 4 insertions(+), 34 deletions(-)
delete mode 100644 package/cmake/0002-KWIML-Teach-ABI.h-about-Xtensa-architecture.patch
diff --git a/package/cmake/0002-KWIML-Teach-ABI.h-about-Xtensa-architecture.patch b/package/cmake/0002-KWIML-Teach-ABI.h-about-Xtensa-architecture.patch
deleted file mode 100644
index 7d8eec6..0000000
--- a/package/cmake/0002-KWIML-Teach-ABI.h-about-Xtensa-architecture.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From ded79a976e2b63bbfd7a63f27ec00bd071410e27 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Tue, 17 Mar 2015 15:51:04 +0300
-Subject: [PATCH] KWIML: Teach ABI.h about Xtensa architecture
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- Utilities/KWIML/ABI.h.in | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/Utilities/KWIML/ABI.h.in b/Utilities/KWIML/ABI.h.in
-index 21c9139..6300ada 100644
---- a/Utilities/KWIML/ABI.h.in
-+++ b/Utilities/KWIML/ABI.h.in
-@@ -432,6 +432,12 @@ suppression macro @KWIML at _ABI_NO_VERIFY was defined.
- # define @KWIML at _ABI_ENDIAN_ID @KWIML at _ABI_ENDIAN_ID_BIG
- # endif
-
-+/* Xtensa */
-+#elif defined(__XTENSA_EB__)
-+# define @KWIML at _ABI_ENDIAN_ID @KWIML at _ABI_ENDIAN_ID_BIG
-+#elif defined(__XTENSA_EL__)
-+# define @KWIML at _ABI_ENDIAN_ID @KWIML at _ABI_ENDIAN_ID_LITTLE
-+
- /* Unknown CPU */
- #elif !defined(@KWIML at _ABI_NO_ERROR_ENDIAN)
- # error "Byte order of target CPU unknown."
---
-1.8.1.4
-
diff --git a/package/cmake/cmake.hash b/package/cmake/cmake.hash
index 76e03d3..9418b9d 100644
--- a/package/cmake/cmake.hash
+++ b/package/cmake/cmake.hash
@@ -1,2 +1,2 @@
-# Locally calculated
-sha256 45f4d3fa8a2f61cc092ae461aac4cac1bab4ac6706f98274ea7f314dd315c6d0 cmake-3.1.3.tar.gz
+# From http://www.cmake.org/files/v3.3/cmake-3.3.1-SHA-256.txt
+sha256 cd65022c6a0707f1c7112f99e9c981677fdd5518f7ddfa0f778d4cee7113e3d6 cmake-3.3.1.tar.gz
diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk
index 9ca6443..da93fb3 100644
--- a/package/cmake/cmake.mk
+++ b/package/cmake/cmake.mk
@@ -4,8 +4,8 @@
#
################################################################################
-CMAKE_VERSION_MAJOR = 3.1
-CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).3
+CMAKE_VERSION_MAJOR = 3.3
+CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).1
CMAKE_SITE = http://www.cmake.org/files/v$(CMAKE_VERSION_MAJOR)
CMAKE_LICENSE = BSD-3c
CMAKE_LICENSE_FILES = Copyright.txt
--
2.4.6
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH] cmake: bump to version 3.3.1
2015-09-07 13:36 [Buildroot] [PATCH] cmake: bump to version 3.3.1 gustavo.zacarias at free-electrons.com
@ 2015-09-07 14:43 ` Vicente Olivert Riera
2015-09-07 15:10 ` Vicente Olivert Riera
0 siblings, 1 reply; 6+ messages in thread
From: Vicente Olivert Riera @ 2015-09-07 14:43 UTC (permalink / raw)
To: buildroot
Dear Gustavo Zacarias,
On 09/07/2015 02:36 PM, gustavo.zacarias at free-electrons.com wrote:
> From: Gustavo Zacarias <gustavo.zacarias@free-electrons.com>
>
> xtensa patch is upstream so there's no need for it any longer.
>
> Signed-off-by: Gustavo Zacarias <gustavo.zacarias@free-electrons.com>
> ---
> ...IML-Teach-ABI.h-about-Xtensa-architecture.patch | 30 ----------------------
> package/cmake/cmake.hash | 4 +--
> package/cmake/cmake.mk | 4 +--
> 3 files changed, 4 insertions(+), 34 deletions(-)
> delete mode 100644 package/cmake/0002-KWIML-Teach-ABI.h-about-Xtensa-architecture.patch
>
> diff --git a/package/cmake/0002-KWIML-Teach-ABI.h-about-Xtensa-architecture.patch b/package/cmake/0002-KWIML-Teach-ABI.h-about-Xtensa-architecture.patch
> deleted file mode 100644
> index 7d8eec6..0000000
> --- a/package/cmake/0002-KWIML-Teach-ABI.h-about-Xtensa-architecture.patch
> +++ /dev/null
> @@ -1,30 +0,0 @@
> -From ded79a976e2b63bbfd7a63f27ec00bd071410e27 Mon Sep 17 00:00:00 2001
> -From: Max Filippov <jcmvbkbc@gmail.com>
> -Date: Tue, 17 Mar 2015 15:51:04 +0300
> -Subject: [PATCH] KWIML: Teach ABI.h about Xtensa architecture
> -
> -Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
> ----
> - Utilities/KWIML/ABI.h.in | 6 ++++++
> - 1 file changed, 6 insertions(+)
> -
> -diff --git a/Utilities/KWIML/ABI.h.in b/Utilities/KWIML/ABI.h.in
> -index 21c9139..6300ada 100644
> ---- a/Utilities/KWIML/ABI.h.in
> -+++ b/Utilities/KWIML/ABI.h.in
> -@@ -432,6 +432,12 @@ suppression macro @KWIML at _ABI_NO_VERIFY was defined.
> - # define @KWIML at _ABI_ENDIAN_ID @KWIML at _ABI_ENDIAN_ID_BIG
> - # endif
> -
> -+/* Xtensa */
> -+#elif defined(__XTENSA_EB__)
> -+# define @KWIML at _ABI_ENDIAN_ID @KWIML at _ABI_ENDIAN_ID_BIG
> -+#elif defined(__XTENSA_EL__)
> -+# define @KWIML at _ABI_ENDIAN_ID @KWIML at _ABI_ENDIAN_ID_LITTLE
> -+
> - /* Unknown CPU */
> - #elif !defined(@KWIML at _ABI_NO_ERROR_ENDIAN)
> - # error "Byte order of target CPU unknown."
> ---
> -1.8.1.4
> -
> diff --git a/package/cmake/cmake.hash b/package/cmake/cmake.hash
> index 76e03d3..9418b9d 100644
> --- a/package/cmake/cmake.hash
> +++ b/package/cmake/cmake.hash
> @@ -1,2 +1,2 @@
> -# Locally calculated
> -sha256 45f4d3fa8a2f61cc092ae461aac4cac1bab4ac6706f98274ea7f314dd315c6d0 cmake-3.1.3.tar.gz
> +# From http://www.cmake.org/files/v3.3/cmake-3.3.1-SHA-256.txt
> +sha256 cd65022c6a0707f1c7112f99e9c981677fdd5518f7ddfa0f778d4cee7113e3d6 cmake-3.3.1.tar.gz
> diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk
> index 9ca6443..da93fb3 100644
> --- a/package/cmake/cmake.mk
> +++ b/package/cmake/cmake.mk
> @@ -4,8 +4,8 @@
> #
> ################################################################################
>
> -CMAKE_VERSION_MAJOR = 3.1
> -CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).3
> +CMAKE_VERSION_MAJOR = 3.3
> +CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).1
> CMAKE_SITE = http://www.cmake.org/files/v$(CMAKE_VERSION_MAJOR)
> CMAKE_LICENSE = BSD-3c
> CMAKE_LICENSE_FILES = Copyright.txt
>
The host-cmake package is fine, but the target one fails for me at the
configure phase:
-- Could NOT find JsonCpp (missing: JsonCpp_LIBRARY JsonCpp_INCLUDE_DIR)
CMake Error at CMakeLists.txt:399 (message):
CMAKE_USE_SYSTEM_JSONCPP is ON but a JsonCpp is not found!
Call Stack (most recent call first):
CMakeLists.txt:533 (CMAKE_BUILD_UTILITIES)
This is the defconfig I have used:
BR2_mips=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_PACKAGE_CMAKE_CTEST=y
I have tried to fix the problem applying this patch:
diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk
index da93fb3..0f0fd39 100644
--- a/package/cmake/cmake.mk
+++ b/package/cmake/cmake.mk
@@ -20,6 +20,12 @@ CMAKE_CONF_OPTS = \
-DCTEST_USE_XMLRPC=OFF \
-DBUILD_CursesDialog=OFF
+ifeq ($(BR2_PACKAGE_JSONCPP),y)
+CMAKE_CONF_OPTS += -DCMAKE_USE_SYSTEM_JSONCPP=ON
+else
+CMAKE_CONF_OPTS += -DCMAKE_USE_SYSTEM_JSONCPP=OFF
+endif
+
# Get rid of -I* options from $(HOST_CPPFLAGS) to prevent that a
# header available in $(HOST_DIR)/usr/include is used instead of a
# CMake internal header, e.g. lzma* headers of the xz package
But it didn't worked. Perhaps you have a better idea.
Regards,
Vincent.
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH] cmake: bump to version 3.3.1
2015-09-07 14:43 ` Vicente Olivert Riera
@ 2015-09-07 15:10 ` Vicente Olivert Riera
2015-09-07 15:21 ` Samuel Martin
0 siblings, 1 reply; 6+ messages in thread
From: Vicente Olivert Riera @ 2015-09-07 15:10 UTC (permalink / raw)
To: buildroot
Dear Gustavo Zacarias,
On 09/07/2015 03:43 PM, Vicente Olivert Riera wrote:
> Dear Gustavo Zacarias,
> On 09/07/2015 02:36 PM, gustavo.zacarias at free-electrons.com wrote:
>> From: Gustavo Zacarias <gustavo.zacarias@free-electrons.com>
>>
>> xtensa patch is upstream so there's no need for it any longer.
>>
>> Signed-off-by: Gustavo Zacarias <gustavo.zacarias@free-electrons.com>
>> ---
>> ...IML-Teach-ABI.h-about-Xtensa-architecture.patch | 30 ----------------------
>> package/cmake/cmake.hash | 4 +--
>> package/cmake/cmake.mk | 4 +--
>> 3 files changed, 4 insertions(+), 34 deletions(-)
>> delete mode 100644 package/cmake/0002-KWIML-Teach-ABI.h-about-Xtensa-architecture.patch
>>
>> diff --git a/package/cmake/0002-KWIML-Teach-ABI.h-about-Xtensa-architecture.patch b/package/cmake/0002-KWIML-Teach-ABI.h-about-Xtensa-architecture.patch
>> deleted file mode 100644
>> index 7d8eec6..0000000
>> --- a/package/cmake/0002-KWIML-Teach-ABI.h-about-Xtensa-architecture.patch
>> +++ /dev/null
>> @@ -1,30 +0,0 @@
>> -From ded79a976e2b63bbfd7a63f27ec00bd071410e27 Mon Sep 17 00:00:00 2001
>> -From: Max Filippov <jcmvbkbc@gmail.com>
>> -Date: Tue, 17 Mar 2015 15:51:04 +0300
>> -Subject: [PATCH] KWIML: Teach ABI.h about Xtensa architecture
>> -
>> -Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
>> ----
>> - Utilities/KWIML/ABI.h.in | 6 ++++++
>> - 1 file changed, 6 insertions(+)
>> -
>> -diff --git a/Utilities/KWIML/ABI.h.in b/Utilities/KWIML/ABI.h.in
>> -index 21c9139..6300ada 100644
>> ---- a/Utilities/KWIML/ABI.h.in
>> -+++ b/Utilities/KWIML/ABI.h.in
>> -@@ -432,6 +432,12 @@ suppression macro @KWIML at _ABI_NO_VERIFY was defined.
>> - # define @KWIML at _ABI_ENDIAN_ID @KWIML at _ABI_ENDIAN_ID_BIG
>> - # endif
>> -
>> -+/* Xtensa */
>> -+#elif defined(__XTENSA_EB__)
>> -+# define @KWIML at _ABI_ENDIAN_ID @KWIML at _ABI_ENDIAN_ID_BIG
>> -+#elif defined(__XTENSA_EL__)
>> -+# define @KWIML at _ABI_ENDIAN_ID @KWIML at _ABI_ENDIAN_ID_LITTLE
>> -+
>> - /* Unknown CPU */
>> - #elif !defined(@KWIML at _ABI_NO_ERROR_ENDIAN)
>> - # error "Byte order of target CPU unknown."
>> ---
>> -1.8.1.4
>> -
>> diff --git a/package/cmake/cmake.hash b/package/cmake/cmake.hash
>> index 76e03d3..9418b9d 100644
>> --- a/package/cmake/cmake.hash
>> +++ b/package/cmake/cmake.hash
>> @@ -1,2 +1,2 @@
>> -# Locally calculated
>> -sha256 45f4d3fa8a2f61cc092ae461aac4cac1bab4ac6706f98274ea7f314dd315c6d0 cmake-3.1.3.tar.gz
>> +# From http://www.cmake.org/files/v3.3/cmake-3.3.1-SHA-256.txt
>> +sha256 cd65022c6a0707f1c7112f99e9c981677fdd5518f7ddfa0f778d4cee7113e3d6 cmake-3.3.1.tar.gz
>> diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk
>> index 9ca6443..da93fb3 100644
>> --- a/package/cmake/cmake.mk
>> +++ b/package/cmake/cmake.mk
>> @@ -4,8 +4,8 @@
>> #
>> ################################################################################
>>
>> -CMAKE_VERSION_MAJOR = 3.1
>> -CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).3
>> +CMAKE_VERSION_MAJOR = 3.3
>> +CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).1
>> CMAKE_SITE = http://www.cmake.org/files/v$(CMAKE_VERSION_MAJOR)
>> CMAKE_LICENSE = BSD-3c
>> CMAKE_LICENSE_FILES = Copyright.txt
>>
>
> The host-cmake package is fine, but the target one fails for me at the
> configure phase:
>
> -- Could NOT find JsonCpp (missing: JsonCpp_LIBRARY JsonCpp_INCLUDE_DIR)
> CMake Error at CMakeLists.txt:399 (message):
> CMAKE_USE_SYSTEM_JSONCPP is ON but a JsonCpp is not found!
> Call Stack (most recent call first):
> CMakeLists.txt:533 (CMAKE_BUILD_UTILITIES)
>
> This is the defconfig I have used:
>
> BR2_mips=y
> BR2_TOOLCHAIN_EXTERNAL=y
> BR2_PACKAGE_CMAKE_CTEST=y
>
> I have tried to fix the problem applying this patch:
>
> diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk
> index da93fb3..0f0fd39 100644
> --- a/package/cmake/cmake.mk
> +++ b/package/cmake/cmake.mk
> @@ -20,6 +20,12 @@ CMAKE_CONF_OPTS = \
> -DCTEST_USE_XMLRPC=OFF \
> -DBUILD_CursesDialog=OFF
>
> +ifeq ($(BR2_PACKAGE_JSONCPP),y)
> +CMAKE_CONF_OPTS += -DCMAKE_USE_SYSTEM_JSONCPP=ON
> +else
> +CMAKE_CONF_OPTS += -DCMAKE_USE_SYSTEM_JSONCPP=OFF
> +endif
> +
> # Get rid of -I* options from $(HOST_CPPFLAGS) to prevent that a
> # header available in $(HOST_DIR)/usr/include is used instead of a
> # CMake internal header, e.g. lzma* headers of the xz package
>
> But it didn't worked. Perhaps you have a better idea.
>
> Regards,
>
> Vincent.
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
>
ok, I have fixed it. The changes should be done this way:
ifeq ($(BR2_PACKAGE_JSONCPP),y)
CMAKE_CONF_OPTS += -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=ON
else
CMAKE_CONF_OPTS += -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=OFF
endif
or, if you prefer you can add BR2_PACKAGE_JSONCPP to its dependencies
unconditionally. Both ways work.
Regards,
Vincent.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH] cmake: bump to version 3.3.1
2015-09-07 15:10 ` Vicente Olivert Riera
@ 2015-09-07 15:21 ` Samuel Martin
2015-09-07 15:26 ` Vicente Olivert Riera
0 siblings, 1 reply; 6+ messages in thread
From: Samuel Martin @ 2015-09-07 15:21 UTC (permalink / raw)
To: buildroot
Hi Gustavo, Vicente,
On Mon, Sep 7, 2015 at 5:10 PM, Vicente Olivert Riera
<Vincent.Riera@imgtec.com> wrote:
[...]
>>
>> The host-cmake package is fine, but the target one fails for me at the
>> configure phase:
>>
>> -- Could NOT find JsonCpp (missing: JsonCpp_LIBRARY JsonCpp_INCLUDE_DIR)
>> CMake Error at CMakeLists.txt:399 (message):
>> CMAKE_USE_SYSTEM_JSONCPP is ON but a JsonCpp is not found!
>> Call Stack (most recent call first):
>> CMakeLists.txt:533 (CMAKE_BUILD_UTILITIES)
>>
>> This is the defconfig I have used:
>>
>> BR2_mips=y
>> BR2_TOOLCHAIN_EXTERNAL=y
>> BR2_PACKAGE_CMAKE_CTEST=y
>>
>> I have tried to fix the problem applying this patch:
>>
>> diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk
>> index da93fb3..0f0fd39 100644
>> --- a/package/cmake/cmake.mk
>> +++ b/package/cmake/cmake.mk
>> @@ -20,6 +20,12 @@ CMAKE_CONF_OPTS = \
>> -DCTEST_USE_XMLRPC=OFF \
>> -DBUILD_CursesDialog=OFF
>>
>> +ifeq ($(BR2_PACKAGE_JSONCPP),y)
>> +CMAKE_CONF_OPTS += -DCMAKE_USE_SYSTEM_JSONCPP=ON
>> +else
>> +CMAKE_CONF_OPTS += -DCMAKE_USE_SYSTEM_JSONCPP=OFF
>> +endif
>> +
>> # Get rid of -I* options from $(HOST_CPPFLAGS) to prevent that a
>> # header available in $(HOST_DIR)/usr/include is used instead of a
>> # CMake internal header, e.g. lzma* headers of the xz package
>>
>> But it didn't worked. Perhaps you have a better idea.
>>
>> Regards,
>>
>> Vincent.
>> _______________________________________________
>> buildroot mailing list
>> buildroot at busybox.net
>> http://lists.busybox.net/mailman/listinfo/buildroot
>>
>
> ok, I have fixed it. The changes should be done this way:
>
> ifeq ($(BR2_PACKAGE_JSONCPP),y)
> CMAKE_CONF_OPTS += -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=ON
> else
> CMAKE_CONF_OPTS += -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=OFF
This will build a static libjsoncpp bundled within cmake sources.
For host package, we don't care, but for target I think we only use
the system libraries.
So, it should be an unconditional dependency:
CMAKE_DEPENDENCIES += jsoncpp
CMAKE_CONF_OPTS += -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=ON
Regards,
--
Samuel
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH] cmake: bump to version 3.3.1
2015-09-07 15:21 ` Samuel Martin
@ 2015-09-07 15:26 ` Vicente Olivert Riera
2015-09-07 16:24 ` Gustavo Zacarias
0 siblings, 1 reply; 6+ messages in thread
From: Vicente Olivert Riera @ 2015-09-07 15:26 UTC (permalink / raw)
To: buildroot
Dear Samuel Martin,
On 09/07/2015 04:21 PM, Samuel Martin wrote:
> Hi Gustavo, Vicente,
>
> On Mon, Sep 7, 2015 at 5:10 PM, Vicente Olivert Riera
> <Vincent.Riera@imgtec.com> wrote:
> [...]
>>>
>>> The host-cmake package is fine, but the target one fails for me at the
>>> configure phase:
>>>
>>> -- Could NOT find JsonCpp (missing: JsonCpp_LIBRARY JsonCpp_INCLUDE_DIR)
>>> CMake Error at CMakeLists.txt:399 (message):
>>> CMAKE_USE_SYSTEM_JSONCPP is ON but a JsonCpp is not found!
>>> Call Stack (most recent call first):
>>> CMakeLists.txt:533 (CMAKE_BUILD_UTILITIES)
>>>
>>> This is the defconfig I have used:
>>>
>>> BR2_mips=y
>>> BR2_TOOLCHAIN_EXTERNAL=y
>>> BR2_PACKAGE_CMAKE_CTEST=y
>>>
>>> I have tried to fix the problem applying this patch:
>>>
>>> diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk
>>> index da93fb3..0f0fd39 100644
>>> --- a/package/cmake/cmake.mk
>>> +++ b/package/cmake/cmake.mk
>>> @@ -20,6 +20,12 @@ CMAKE_CONF_OPTS = \
>>> -DCTEST_USE_XMLRPC=OFF \
>>> -DBUILD_CursesDialog=OFF
>>>
>>> +ifeq ($(BR2_PACKAGE_JSONCPP),y)
>>> +CMAKE_CONF_OPTS += -DCMAKE_USE_SYSTEM_JSONCPP=ON
>>> +else
>>> +CMAKE_CONF_OPTS += -DCMAKE_USE_SYSTEM_JSONCPP=OFF
>>> +endif
>>> +
>>> # Get rid of -I* options from $(HOST_CPPFLAGS) to prevent that a
>>> # header available in $(HOST_DIR)/usr/include is used instead of a
>>> # CMake internal header, e.g. lzma* headers of the xz package
>>>
>>> But it didn't worked. Perhaps you have a better idea.
>>>
>>> Regards,
>>>
>>> Vincent.
>>> _______________________________________________
>>> buildroot mailing list
>>> buildroot at busybox.net
>>> http://lists.busybox.net/mailman/listinfo/buildroot
>>>
>>
>> ok, I have fixed it. The changes should be done this way:
>>
>> ifeq ($(BR2_PACKAGE_JSONCPP),y)
>> CMAKE_CONF_OPTS += -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=ON
>> else
>> CMAKE_CONF_OPTS += -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=OFF
>
> This will build a static libjsoncpp bundled within cmake sources.
> For host package, we don't care, but for target I think we only use
> the system libraries.
> So, it should be an unconditional dependency:
>
> CMAKE_DEPENDENCIES += jsoncpp
> CMAKE_CONF_OPTS += -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=ON
well, in that case you only need to add jsoncpp to the current
CMAKE_DEPENDENCIES line, and also select BR2_PACKAGE_JSONCPP in the
Config.in:
diff --git a/package/cmake/Config.in b/package/cmake/Config.in
index f3f0f85..5b197e3 100644
--- a/package/cmake/Config.in
+++ b/package/cmake/Config.in
@@ -14,6 +14,7 @@ config BR2_PACKAGE_CMAKE_CTEST
bool "ctest"
select BR2_PACKAGE_CMAKE
select BR2_PACKAGE_ZLIB
+ select BR2_PACKAGE_JSONCPP
select BR2_PACKAGE_LIBCURL
select BR2_PACKAGE_LIBARCHIVE
select BR2_PACKAGE_EXPAT
diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk
index da93fb3..12f4cad 100644
--- a/package/cmake/cmake.mk
+++ b/package/cmake/cmake.mk
@@ -11,7 +11,7 @@ CMAKE_LICENSE = BSD-3c
CMAKE_LICENSE_FILES = Copyright.txt
HOST_CMAKE_DEPENDENCIES = host-pkgconf
-CMAKE_DEPENDENCIES = zlib libcurl libarchive expat bzip2 xz
+CMAKE_DEPENDENCIES = zlib jsoncpp libcurl libarchive expat bzip2 xz
CMAKE_CONF_OPTS = \
-DKWSYS_LFS_WORKS=TRUE \
Regards,
Vincent.
> Regards,
>
>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH] cmake: bump to version 3.3.1
2015-09-07 15:26 ` Vicente Olivert Riera
@ 2015-09-07 16:24 ` Gustavo Zacarias
0 siblings, 0 replies; 6+ messages in thread
From: Gustavo Zacarias @ 2015-09-07 16:24 UTC (permalink / raw)
To: buildroot
On 07/09/15 12:26, Vicente Olivert Riera wrote:
> well, in that case you only need to add jsoncpp to the current
> CMAKE_DEPENDENCIES line, and also select BR2_PACKAGE_JSONCPP in the
> Config.in:
Hi.
Thanks for the feedback, i've respinned into v2.
Actually you need to propagate the gcc version dependency from jsoncpp
as well.
Regards.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-09-07 16:24 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-07 13:36 [Buildroot] [PATCH] cmake: bump to version 3.3.1 gustavo.zacarias at free-electrons.com
2015-09-07 14:43 ` Vicente Olivert Riera
2015-09-07 15:10 ` Vicente Olivert Riera
2015-09-07 15:21 ` Samuel Martin
2015-09-07 15:26 ` Vicente Olivert Riera
2015-09-07 16:24 ` Gustavo Zacarias
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox