package/uvw: drop cmake workaround
PATCH 1/9 package/uvw: drop cmake workaround
Drop workaround for cmake < 3.10 (not needed since commit d4773b610a40be1d3ac7d793033abaf4eb2491ed)
--- package/uvw/uvw.mk | 4 ---- 1 file changed, 4 deletions(-)
package/uvw/uvw.mk +0 -4
@@ -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))
Signature · 1 line
2.29.2
PATCH 2/9 package/znc: drop cmake workaround
Drop workaround for cmake < 3.10 (not needed since commit d4773b610a40be1d3ac7d793033abaf4eb2491ed)
--- package/znc/znc.mk | 5 ----- 1 file changed, 5 deletions(-)
package/znc/znc.mk +0 -5
@@ -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
Signature · 1 line
2.29.2
PATCH 3/9 package/i2pd: drop cmake workaround
In reply to Fabrice FontaineDrop workaround for cmake < 3.10 (not needed since commit d4773b610a40be1d3ac7d793033abaf4eb2491ed)
--- package/i2pd/i2pd.mk | 5 ----- 1 file changed, 5 deletions(-)
package/i2pd/i2pd.mk +0 -5
@@ -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 \
Signature · 1 line
2.29.2
PATCH 4/9 package/rabbitmq-c: drop cmake workaround
In reply to Fabrice FontaineDrop workaround for cmake < 3.10 (not needed since commit d4773b610a40be1d3ac7d793033abaf4eb2491ed)
--- package/rabbitmq-c/rabbitmq-c.mk | 5 ----- 1 file changed, 5 deletions(-)
package/rabbitmq-c/rabbitmq-c.mk +0 -5
@@ -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
Signature · 1 line
2.29.2
PATCH 5/9 package/xerces: drop cmake workaround
In reply to Fabrice FontaineDrop workaround for cmake < 3.10 (not needed since commit d4773b610a40be1d3ac7d793033abaf4eb2491ed)
--- package/xerces/xerces.mk | 5 ----- 1 file changed, 5 deletions(-)
package/xerces/xerces.mk +0 -5
@@ -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
Signature · 1 line
2.29.2
PATCH 6/9 package/poppler: drop cmake workaround
In reply to Fabrice FontaineDrop workaround for cmake < 3.10 (not needed since commit d4773b610a40be1d3ac7d793033abaf4eb2491ed)
--- package/poppler/poppler.mk | 3 --- 1 file changed, 3 deletions(-)
package/poppler/poppler.mk +0 -3
@@ -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
Signature · 1 line
2.29.2
PATCH 7/9 package/paho-mqtt-cpp: drop cmake workaround
In reply to Fabrice FontaineDrop workaround for cmake < 3.10 (not needed since commit d4773b610a40be1d3ac7d793033abaf4eb2491ed)
--- package/paho-mqtt-cpp/paho-mqtt-cpp.mk | 4 ---- 1 file changed, 4 deletions(-)
package/paho-mqtt-cpp/paho-mqtt-cpp.mk +0 -4
@@ -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
Signature · 1 line
2.29.2
PATCH 8/9 package/exiv2: drop cmake workaround
In reply to Fabrice FontaineDrop workaround for cmake < 3.10 (not needed since commit d4773b610a40be1d3ac7d793033abaf4eb2491ed)
--- package/exiv2/exiv2.mk | 4 ---- 1 file changed, 4 deletions(-)
package/exiv2/exiv2.mk +0 -4
@@ -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
Signature · 1 line
2.29.2
PATCH 9/9 package/librtlsdr: drop cmake workaround
In reply to Fabrice FontaineDrop workaround for cmake < 3.10 (not needed since commit d4773b610a40be1d3ac7d793033abaf4eb2491ed)
--- package/librtlsdr/librtlsdr.mk | 11 ----------- 1 file changed, 11 deletions(-)
package/librtlsdr/librtlsdr.mk +0 -11
@@ -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))
Signature · 1 line
2.29.2
PATCH 1/9 package/uvw: drop cmake workaround
In reply to Fabrice FontaineFabrice, All,
On 2021-01-25 22:48 +0100, Fabrice Fontaine spake thusly:
Quoted 4 lines
Drop workaround for cmake < 3.10 (not needed since commit
d4773b610a40be1d3ac7d793033abaf4eb2491ed)Signed-off-by Fabrice Fontaine <[email protected]>
Series of 9 applied to master, thanks.
Regards,
Yann E. MORIN.
Quoted 24 lines
--- package/uvw/uvw.mk | 4 ---- 1 file changed, 4 deletions(-)package/uvw/uvw.mk +0
-4@@ -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))Signature · 6 lines
2.29.2 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | 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. | '------------------------------^-------^------------------^--------------------'