Skip to contentSkip to conversation

package/libssh: drop cmake workaround

PATCH New Fabrice Fontaine 2 participants 2 messages Jan 4, 2021 – Jan 25, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/libssh: drop cmake workaround

Drop workaround for cmake < 3.10 (not needed since commit d4773b610a40be1d3ac7d793033abaf4eb2491ed)

---
 package/libssh/libssh.mk | 3 ---
 1 file changed, 3 deletions(-)
package/libssh/libssh.mk +0 -3
index 67e3ad9f91..15b1302a01 100644
@@ -16,9 +16,6 @@ LIBSSH_CONF_OPTS = \
 	-DWITH_STACK_PROTECTOR=OFF \
 	-DWITH_EXAMPLES=OFF
 
-# cmake older than 3.10 require this to avoid try_run() in FindThreads
-LIBSSH_CONF_OPTS += -DTHREADS_PTHREAD_ARG=OFF
-
 ifeq ($(BR2_PACKAGE_LIBSSH_SERVER),y)
 LIBSSH_CONF_OPTS += -DWITH_SERVER=ON
 else
Signature · 1 line
2.29.2
#1 lore raw

PATCH 1/1 package/libssh: drop cmake workaround

Quoted 7 lines · On Mon, 4 Jan 2021 18:12:31 +0100 Fabrice Fontaine…

Drop workaround for cmake < 3.10 (not needed since commit d4773b610a40be1d3ac7d793033abaf4eb2491ed)

---
 package/libssh/libssh.mk | 3 ---
 1 file changed, 3 deletions(-)

Applied to master, thanks.

However, a quick git grep shows:

package/exiv2/exiv2.mk:EXIV2_CONF_OPTS += -DTHREADS_PTHREAD_ARG=OFF package/i2pd/i2pd.mk:# Before CMake 3.10, passing THREADS_PTHREAD_ARG=OFF was needed to package/i2pd/i2pd.mk:I2PD_CONF_OPTS += -DTHREADS_PTHREAD_ARG=OFF package/librtlsdr/librtlsdr.mk:LIBRTLSDR_CONF_OPTS += -DTHREADS_PTHREAD_ARG=OFF package/paho-mqtt-cpp/paho-mqtt-cpp.mk:PAHO_MQTT_CPP_CONF_OPTS = -DTHREADS_PTHREAD_ARG=OFF package/poppler/poppler.mk:POPPLER_CONF_OPTS += -DTHREADS_PTHREAD_ARG=OFF package/rabbitmq-c/rabbitmq-c.mk:# Before CMake 3.10, passing THREADS_PTHREAD_ARG=OFF was needed to package/rabbitmq-c/rabbitmq-c.mk:RABBITMQ_C_CONF_OPTS += -DTHREADS_PTHREAD_ARG=OFF package/uvw/uvw.mk:UVW_CONF_OPTS = -DTHREADS_PTHREAD_ARG=OFF package/xerces/xerces.mk:# Before CMake 3.10, passing THREADS_PTHREAD_ARG=OFF was needed to package/xerces/xerces.mk:XERCES_CONF_OPTS += -DTHREADS_PTHREAD_ARG=OFF package/znc/znc.mk:# Before CMake 3.10, passing THREADS_PTHREAD_ARG=OFF was needed to package/znc/znc.mk:ZNC_CONF_OPTS += -DTHREADS_PTHREAD_ARG=OFF

So there's perhaps some more cleaning that is possible ?

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com