Skip to contentSkip to conversation

openssl: drop libdl from pc file

PATCH New Gustavo Zacarias 2 participants 2 messages Jul 19, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 openssl: drop libdl from pc file

Fixes:
http://autobuild.buildroot.net/results/2a2/2a274e2dbffd268a391b0e8a15dae5a759b870a1/

---
 package/openssl/openssl.mk | 8 ++++++++
 1 file changed, 8 insertions(+)
package/openssl/openssl.mk +8 -0
index 743ca52..30e1748 100644
@@ -115,6 +115,14 @@ define OPENSSL_INSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/bin/c_rehash
 endef
 
+# libdl has no business in a static build
+ifeq ($(BR2_PREFER_STATIC_LIB),y)
+define OPENSSL_FIXUP_STATIC_PKGCONFIG
+	$(SED) 's/-ldl//' $(STAGING_DIR)/usr/lib/pkgconfig/openssl.pc
+endef
+endif
+OPENSSL_POST_INSTALL_STAGING_HOOKS += OPENSSL_FIXUP_STATIC_PKGCONFIG
+
 ifneq ($(BR2_PREFER_STATIC_LIB),y)
 # libraries gets installed read only, so strip fails
 define OPENSSL_INSTALL_FIXUPS_SHARED
Signature · 1 line
1.8.5.5
#1 lore raw

PATCH 1/1 openssl: drop libdl from pc file

Dear Gustavo Zacarias,

package/openssl/openssl.mk define OPENSSL_INSTALL_TARGET_CMDS · line 124

Quoted 7 lines · Gustavo Zacarias
package/openssl/openssl.mk +7 -0
+# libdl has no business in a static build
+ifeq ($(BR2_PREFER_STATIC_LIB),y)
+define OPENSSL_FIXUP_STATIC_PKGCONFIG
+	$(SED) 's/-ldl//' $(STAGING_DIR)/usr/lib/pkgconfig/openssl.pc
+endef
+endif
+OPENSSL_POST_INSTALL_STAGING_HOOKS += OPENSSL_FIXUP_STATIC_PKGCONFIG

This should have been inside the ifeq condition.

Committed with that fixed, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com