* [Buildroot] [PATCH 2/9] package/znc: drop cmake workaround
2021-01-25 21:48 [Buildroot] [PATCH 1/9] package/uvw: drop cmake workaround Fabrice Fontaine
@ 2021-01-25 21:48 ` Fabrice Fontaine
2021-01-25 21:48 ` [Buildroot] [PATCH 3/9] package/i2pd: " Fabrice Fontaine
` (7 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Fabrice Fontaine @ 2021-01-25 21:48 UTC (permalink / raw)
To: buildroot
Drop workaround for cmake < 3.10 (not needed since commit
d4773b610a40be1d3ac7d793033abaf4eb2491ed)
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/znc/znc.mk | 5 -----
1 file changed, 5 deletions(-)
diff --git a/package/znc/znc.mk b/package/znc/znc.mk
index 52a8d78aeb..07fced8407 100644
--- a/package/znc/znc.mk
+++ b/package/znc/znc.mk
@@ -12,11 +12,6 @@ ZNC_CPE_ID_VENDOR = znc
ZNC_DEPENDENCIES = host-pkgconf
ZNC_CONF_OPTS = -DWANT_CYRUS=OFF -DWANT_I18N=OFF -DWANT_PERL=OFF
-# Before CMake 3.10, passing THREADS_PTHREAD_ARG=OFF was needed to
-# disable a try_run() call in the FindThreads tests, which caused a
-# build failure when cross-compiling.
-ZNC_CONF_OPTS += -DTHREADS_PTHREAD_ARG=OFF
-
ifeq ($(BR2_PACKAGE_ICU),y)
ZNC_DEPENDENCIES += icu
ZNC_CONF_OPTS += -DWANT_ICU=ON
--
2.29.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* [Buildroot] [PATCH 3/9] package/i2pd: drop cmake workaround
2021-01-25 21:48 [Buildroot] [PATCH 1/9] package/uvw: drop cmake workaround Fabrice Fontaine
2021-01-25 21:48 ` [Buildroot] [PATCH 2/9] package/znc: " Fabrice Fontaine
@ 2021-01-25 21:48 ` Fabrice Fontaine
2021-01-25 21:48 ` [Buildroot] [PATCH 4/9] package/rabbitmq-c: " Fabrice Fontaine
` (6 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Fabrice Fontaine @ 2021-01-25 21:48 UTC (permalink / raw)
To: buildroot
Drop workaround for cmake < 3.10 (not needed since commit
d4773b610a40be1d3ac7d793033abaf4eb2491ed)
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/i2pd/i2pd.mk | 5 -----
1 file changed, 5 deletions(-)
diff --git a/package/i2pd/i2pd.mk b/package/i2pd/i2pd.mk
index 1371e708b9..ef6a467d71 100644
--- a/package/i2pd/i2pd.mk
+++ b/package/i2pd/i2pd.mk
@@ -16,11 +16,6 @@ I2PD_DEPENDENCIES = \
I2PD_CONF_OPTS += -DWITH_GUI=OFF
-# Before CMake 3.10, passing THREADS_PTHREAD_ARG=OFF was needed to
-# disable a try_run() call in the FindThreads tests, which caused a
-# build failure when cross-compiling.
-I2PD_CONF_OPTS += -DTHREADS_PTHREAD_ARG=OFF
-
ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
I2PD_CONF_OPTS += \
-DHAVE_CXX_ATOMICS_WITHOUT_LIB=OFF \
--
2.29.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* [Buildroot] [PATCH 4/9] package/rabbitmq-c: drop cmake workaround
2021-01-25 21:48 [Buildroot] [PATCH 1/9] package/uvw: drop cmake workaround Fabrice Fontaine
2021-01-25 21:48 ` [Buildroot] [PATCH 2/9] package/znc: " Fabrice Fontaine
2021-01-25 21:48 ` [Buildroot] [PATCH 3/9] package/i2pd: " Fabrice Fontaine
@ 2021-01-25 21:48 ` Fabrice Fontaine
2021-01-25 21:48 ` [Buildroot] [PATCH 5/9] package/xerces: " Fabrice Fontaine
` (5 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Fabrice Fontaine @ 2021-01-25 21:48 UTC (permalink / raw)
To: buildroot
Drop workaround for cmake < 3.10 (not needed since commit
d4773b610a40be1d3ac7d793033abaf4eb2491ed)
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/rabbitmq-c/rabbitmq-c.mk | 5 -----
1 file changed, 5 deletions(-)
diff --git a/package/rabbitmq-c/rabbitmq-c.mk b/package/rabbitmq-c/rabbitmq-c.mk
index e059ff706c..d25673b59b 100644
--- a/package/rabbitmq-c/rabbitmq-c.mk
+++ b/package/rabbitmq-c/rabbitmq-c.mk
@@ -13,11 +13,6 @@ RABBITMQ_C_CONF_OPTS = \
-DBUILD_API_DOCS=OFF \
-DBUILD_TOOLS_DOCS=OFF
-# Before CMake 3.10, passing THREADS_PTHREAD_ARG=OFF was needed to
-# disable a try_run() call in the FindThreads tests, which caused a
-# build failure when cross-compiling.
-RABBITMQ_C_CONF_OPTS += -DTHREADS_PTHREAD_ARG=OFF
-
# BUILD_SHARED_LIBS is handled in pkg-cmake.mk as it is a generic cmake variable
ifeq ($(BR2_SHARED_STATIC_LIBS),y)
RABBITMQ_C_CONF_OPTS += -DBUILD_STATIC_LIBS=ON
--
2.29.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* [Buildroot] [PATCH 5/9] package/xerces: drop cmake workaround
2021-01-25 21:48 [Buildroot] [PATCH 1/9] package/uvw: drop cmake workaround Fabrice Fontaine
` (2 preceding siblings ...)
2021-01-25 21:48 ` [Buildroot] [PATCH 4/9] package/rabbitmq-c: " Fabrice Fontaine
@ 2021-01-25 21:48 ` Fabrice Fontaine
2021-01-25 21:48 ` [Buildroot] [PATCH 6/9] package/poppler: " Fabrice Fontaine
` (4 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Fabrice Fontaine @ 2021-01-25 21:48 UTC (permalink / raw)
To: buildroot
Drop workaround for cmake < 3.10 (not needed since commit
d4773b610a40be1d3ac7d793033abaf4eb2491ed)
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/xerces/xerces.mk | 5 -----
1 file changed, 5 deletions(-)
diff --git a/package/xerces/xerces.mk b/package/xerces/xerces.mk
index d9174b44c7..a3e5361b2e 100644
--- a/package/xerces/xerces.mk
+++ b/package/xerces/xerces.mk
@@ -19,11 +19,6 @@ endef
XERCES_POST_PATCH_HOOKS += XERCES_DISABLE_SAMPLES
-# Before CMake 3.10, passing THREADS_PTHREAD_ARG=OFF was needed to
-# disable a try_run() call in the FindThreads tests, which caused a
-# build failure when cross-compiling.
-XERCES_CONF_OPTS += -DTHREADS_PTHREAD_ARG=OFF
-
ifeq ($(BR2_PACKAGE_ICU),y)
XERCES_DEPENDENCIES += icu
endif
--
2.29.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* [Buildroot] [PATCH 6/9] package/poppler: drop cmake workaround
2021-01-25 21:48 [Buildroot] [PATCH 1/9] package/uvw: drop cmake workaround Fabrice Fontaine
` (3 preceding siblings ...)
2021-01-25 21:48 ` [Buildroot] [PATCH 5/9] package/xerces: " Fabrice Fontaine
@ 2021-01-25 21:48 ` Fabrice Fontaine
2021-01-25 21:48 ` [Buildroot] [PATCH 7/9] package/paho-mqtt-cpp: " Fabrice Fontaine
` (3 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Fabrice Fontaine @ 2021-01-25 21:48 UTC (permalink / raw)
To: buildroot
Drop workaround for cmake < 3.10 (not needed since commit
d4773b610a40be1d3ac7d793033abaf4eb2491ed)
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/poppler/poppler.mk | 3 ---
1 file changed, 3 deletions(-)
diff --git a/package/poppler/poppler.mk b/package/poppler/poppler.mk
index e779a7c9d3..aba8602e06 100644
--- a/package/poppler/poppler.mk
+++ b/package/poppler/poppler.mk
@@ -19,9 +19,6 @@ POPPLER_CONF_OPTS = \
-DBUILD_CPP_TESTS=OFF \
-DENABLE_GTK_DOC=OFF
-# cmake older than 3.10 requires this to avoid try_run() in FindThreads
-POPPLER_CONF_OPTS += -DTHREADS_PTHREAD_ARG=OFF
-
ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
POPPLER_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -latomic"
endif
--
2.29.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* [Buildroot] [PATCH 7/9] package/paho-mqtt-cpp: drop cmake workaround
2021-01-25 21:48 [Buildroot] [PATCH 1/9] package/uvw: drop cmake workaround Fabrice Fontaine
` (4 preceding siblings ...)
2021-01-25 21:48 ` [Buildroot] [PATCH 6/9] package/poppler: " Fabrice Fontaine
@ 2021-01-25 21:48 ` Fabrice Fontaine
2021-01-25 21:48 ` [Buildroot] [PATCH 8/9] package/exiv2: " Fabrice Fontaine
` (2 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Fabrice Fontaine @ 2021-01-25 21:48 UTC (permalink / raw)
To: buildroot
Drop workaround for cmake < 3.10 (not needed since commit
d4773b610a40be1d3ac7d793033abaf4eb2491ed)
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/paho-mqtt-cpp/paho-mqtt-cpp.mk | 4 ----
1 file changed, 4 deletions(-)
diff --git a/package/paho-mqtt-cpp/paho-mqtt-cpp.mk b/package/paho-mqtt-cpp/paho-mqtt-cpp.mk
index bf1c4a27b7..161e53d484 100644
--- a/package/paho-mqtt-cpp/paho-mqtt-cpp.mk
+++ b/package/paho-mqtt-cpp/paho-mqtt-cpp.mk
@@ -11,10 +11,6 @@ PAHO_MQTT_CPP_LICENSE_FILES = epl-v10 edl-v10
PAHO_MQTT_CPP_INSTALL_STAGING = YES
PAHO_MQTT_CPP_DEPENDENCIES = paho-mqtt-c
-# The following CMake variable disables a TRY_RUN call in the -pthread
-# test which is not allowed when cross-compiling (for cmake < 3.10)
-PAHO_MQTT_CPP_CONF_OPTS = -DTHREADS_PTHREAD_ARG=OFF
-
ifeq ($(BR2_PACKAGE_OPENSSL),y)
PAHO_MQTT_CPP_DEPENDENCIES += openssl
PAHO_MQTT_CPP_CONF_OPTS += -DPAHO_WITH_SSL=TRUE
--
2.29.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* [Buildroot] [PATCH 8/9] package/exiv2: drop cmake workaround
2021-01-25 21:48 [Buildroot] [PATCH 1/9] package/uvw: drop cmake workaround Fabrice Fontaine
` (5 preceding siblings ...)
2021-01-25 21:48 ` [Buildroot] [PATCH 7/9] package/paho-mqtt-cpp: " Fabrice Fontaine
@ 2021-01-25 21:48 ` Fabrice Fontaine
2021-01-25 21:48 ` [Buildroot] [PATCH 9/9] package/librtlsdr: " Fabrice Fontaine
2021-01-26 17:04 ` [Buildroot] [PATCH 1/9] package/uvw: " Yann E. MORIN
8 siblings, 0 replies; 10+ messages in thread
From: Fabrice Fontaine @ 2021-01-25 21:48 UTC (permalink / raw)
To: buildroot
Drop workaround for cmake < 3.10 (not needed since commit
d4773b610a40be1d3ac7d793033abaf4eb2491ed)
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/exiv2/exiv2.mk | 4 ----
1 file changed, 4 deletions(-)
diff --git a/package/exiv2/exiv2.mk b/package/exiv2/exiv2.mk
index a898159a70..3d4cf41731 100644
--- a/package/exiv2/exiv2.mk
+++ b/package/exiv2/exiv2.mk
@@ -13,10 +13,6 @@ EXIV2_CPE_ID_VENDOR = exiv2
EXIV2_CONF_OPTS += -DEXIV2_BUILD_SAMPLES=OFF
-# The following CMake variable disables a TRY_RUN call in the -pthread
-# test which is not allowed when cross-compiling.
-EXIV2_CONF_OPTS += -DTHREADS_PTHREAD_ARG=OFF
-
ifeq ($(BR2_PACKAGE_EXIV2_LENSDATA),y)
EXIV2_CONF_OPTS += -DEXIV2_ENABLE_LENSDATA=ON
else
--
2.29.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* [Buildroot] [PATCH 9/9] package/librtlsdr: drop cmake workaround
2021-01-25 21:48 [Buildroot] [PATCH 1/9] package/uvw: drop cmake workaround Fabrice Fontaine
` (6 preceding siblings ...)
2021-01-25 21:48 ` [Buildroot] [PATCH 8/9] package/exiv2: " Fabrice Fontaine
@ 2021-01-25 21:48 ` Fabrice Fontaine
2021-01-26 17:04 ` [Buildroot] [PATCH 1/9] package/uvw: " Yann E. MORIN
8 siblings, 0 replies; 10+ messages in thread
From: Fabrice Fontaine @ 2021-01-25 21:48 UTC (permalink / raw)
To: buildroot
Drop workaround for cmake < 3.10 (not needed since commit
d4773b610a40be1d3ac7d793033abaf4eb2491ed)
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/librtlsdr/librtlsdr.mk | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/package/librtlsdr/librtlsdr.mk b/package/librtlsdr/librtlsdr.mk
index 47586bdfb2..7796d1096a 100644
--- a/package/librtlsdr/librtlsdr.mk
+++ b/package/librtlsdr/librtlsdr.mk
@@ -34,15 +34,4 @@ else
LIBRTLSDR_CONF_OPTS += -DENABLE_ZEROCOPY=OFF
endif
-# In case of static-lib-only builds, CMake's FindThreads.cmake code tries to
-# get the right flags, checking first for -lpthreads, then -lpthread, and lastly
-# for -pthread.
-# The 2 first link checks fail because of undefined symbols: __libc_setup_tls.
-# In the later check, CMake successfully compiles and links the test program,
-# but it also tries to run it, which is wrong when cross-compiling.
-#
-# The following CMake variable only disables the TRY_RUN call in the -pthread
-# test.
-LIBRTLSDR_CONF_OPTS += -DTHREADS_PTHREAD_ARG=OFF
-
$(eval $(cmake-package))
--
2.29.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* [Buildroot] [PATCH 1/9] package/uvw: drop cmake workaround
2021-01-25 21:48 [Buildroot] [PATCH 1/9] package/uvw: drop cmake workaround Fabrice Fontaine
` (7 preceding siblings ...)
2021-01-25 21:48 ` [Buildroot] [PATCH 9/9] package/librtlsdr: " Fabrice Fontaine
@ 2021-01-26 17:04 ` Yann E. MORIN
8 siblings, 0 replies; 10+ messages in thread
From: Yann E. MORIN @ 2021-01-26 17:04 UTC (permalink / raw)
To: buildroot
Fabrice, All,
On 2021-01-25 22:48 +0100, Fabrice Fontaine spake thusly:
> Drop workaround for cmake < 3.10 (not needed since commit
> d4773b610a40be1d3ac7d793033abaf4eb2491ed)
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Series of 9 applied to master, thanks.
Regards,
Yann E. MORIN.
> ---
> package/uvw/uvw.mk | 4 ----
> 1 file changed, 4 deletions(-)
>
> diff --git a/package/uvw/uvw.mk b/package/uvw/uvw.mk
> index 39952caa11..f152d9f1cf 100644
> --- a/package/uvw/uvw.mk
> +++ b/package/uvw/uvw.mk
> @@ -13,8 +13,4 @@ UVW_DEPENDENCIES = libuv
> UVW_LICENSE = MIT
> UVW_LICENSE_FILES = LICENSE
>
> -# The following CMake variable disables a TRY_RUN call in the -pthread
> -# test which is not allowed when cross-compiling (for cmake < 3.10)
> -UVW_CONF_OPTS = -DTHREADS_PTHREAD_ARG=OFF
> -
> $(eval $(cmake-package))
> --
> 2.29.2
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 10+ messages in thread