Skip to contentSkip to conversation

package/thrift: drop unneeded static openssl workaround

PATCH New Fabrice Fontaine 3 participants 3 messages Apr 13, 2019 – Apr 24, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/thrift: drop unneeded static openssl workaround

thrift uses pkg-config to find openssl dependencies such as lz or latomic so drop unneeded workaround

---
 package/thrift/thrift.mk | 2 --
 1 file changed, 2 deletions(-)
package/thrift/thrift.mk +0 -2
index 8a284229a1..6014bbfcdd 100644
@@ -31,8 +31,6 @@ endif
 
 # thrift doesn't use the regular flags BUILD_{STATIC,SHARED}_LIBS
 ifeq ($(BR2_STATIC_LIBS),y)
-# openssl uses zlib, so we need to explicitly link with it when static
-THRIFT_CONF_ENV += LIBS=-lz
 THRIFT_CONF_OPTS += -DWITH_STATIC_LIB=ON -DWITH_BOOST_STATIC=ON -DWITH_SHARED_LIB=OFF
 else ifeq ($(BR2_SHARED_LIBS),y)
 THRIFT_CONF_OPTS += -DWITH_STATIC_LIB=OFF -DWITH_BOOST_STATIC=OFF -DWITH_SHARED_LIB=ON
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/1 package/thrift: drop unneeded static openssl workaround

Quoted 4 lines · Fabrice Fontaine

thrift uses pkg-config to find openssl dependencies such as lz or latomic so drop unneeded workaround

Applied to master, thanks. I've checked, this was already added in the first
commit adding thrift.

Regards,
Arnout

Quoted 18 lines
---
 package/thrift/thrift.mk | 2 --
 1 file changed, 2 deletions(-)
package/thrift/thrift.mk +0 -2
index 8a284229a1..6014bbfcdd 100644
@@ -31,8 +31,6 @@ endif
 
 # thrift doesn't use the regular flags BUILD_{STATIC,SHARED}_LIBS
 ifeq ($(BR2_STATIC_LIBS),y)
-# openssl uses zlib, so we need to explicitly link with it when static
-THRIFT_CONF_ENV += LIBS=-lz
 THRIFT_CONF_OPTS += -DWITH_STATIC_LIB=ON -DWITH_BOOST_STATIC=ON -DWITH_SHARED_LIB=OFF
 else ifeq ($(BR2_SHARED_LIBS),y)
 THRIFT_CONF_OPTS += -DWITH_STATIC_LIB=OFF -DWITH_BOOST_STATIC=OFF -DWITH_SHARED_LIB=ON