Skip to contentSkip to conversation

package/lzo: enable shared/static libs when needed

PATCH New Yann E. MORIN 2 participants 2 messages Sep 2, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/lzo: enable shared/static libs when needed

In 61c4c63 (package/lzo: switch to cmake), building lzo has switched from autotools to cmake. In the conversion, we've lost the build of the shared library, because the cmake-based buildsystem of lzo explcitly disables it by default.

Restore the shared library build.

---
Note: it was noticed because of an autobuild failure of cairo:
http://autobuild.buildroot.org/results/d51/d51888cbc3a743d53ce38f736ee43953e50bdf61/
but it has not been checked wether this patch fixes the build at all. Yet, the patch is still valid even without fixing the autobuild failure.

---
 package/lzo/lzo.mk | 12 ++++++++++++
 1 file changed, 12 insertions(+)
package/lzo/lzo.mk +12 -0
index dba965fcd3..27ca459acf 100644
@@ -11,5 +11,17 @@ LZO_LICENSE_FILES = COPYING
 LZO_INSTALL_STAGING = YES
 LZO_SUPPORTS_IN_SOURCE_BUILD = NO
 
+ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y)
+LZO_CONF_OPTS += -DENABLE_SHARED=ON
+else
+LZO_CONF_OPTS += -DENABLE_SHARED=OFF
+endif
+
+ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),y)
+LZO_CONF_OPTS += -DENABLE_STATIC=ON
+else
+LZO_CONF_OPTS += -DENABLE_STATIC=OFF
+endif
+
 $(eval $(cmake-package))
 $(eval $(host-cmake-package))
Signature · 1 line
2.11.0
#1 lore raw

PATCH 1/1 package/lzo: enable shared/static libs when needed

Hello,

Quoted 10 lines · Yann E. MORIN

In 61c4c63 (package/lzo: switch to cmake), building lzo has switched from autotools to cmake. In the conversion, we've lost the build of the shared library, because the cmake-based buildsystem of lzo explcitly disables it by default.

Restore the shared library build.

Quoted 8 lines

---
Note: it was noticed because of an autobuild failure of cairo:
http://autobuild.buildroot.org/results/d51/d51888cbc3a743d53ce38f736ee43953e50bdf61/
but it has not been checked wether this patch fixes the build at all. Yet, the patch is still valid even without fixing the autobuild failure.

---
 package/lzo/lzo.mk | 12 ++++++++++++
 1 file changed, 12 insertions(+)

Applied to master, thanks.

Thomas

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