aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2019-01-12 15:34:32 +0100
committerGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2019-01-12 15:35:37 +0100
commitae4b9e4afbbd92e2303507651982d477fd734e68 (patch)
tree733f8d52160179f2716679c69fb8ca724331174e
parentb621273755ef0a9d673100168d1c93750ed7bd6f (diff)
downloadbuildroot-ae4b9e4afbbd92e2303507651982d477fd734e68.tar.gz
buildroot-ae4b9e4afbbd92e2303507651982d477fd734e68.tar.bz2
package/libsquish: re-enable for BR2_STATIC_LIBS configuration
Since the bump to version 1.15, libsquish can conditionally build/install its shared library, which makes it possible to re-enable this package for BR2_STATIC_LIBS configurations. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-rw-r--r--package/libsquish/Config.in5
-rw-r--r--package/libsquish/libsquish.mk4
2 files changed, 6 insertions, 3 deletions
diff --git a/package/libsquish/Config.in b/package/libsquish/Config.in
index eabe6c54a8..e93e97e578 100644
--- a/package/libsquish/Config.in
+++ b/package/libsquish/Config.in
@@ -1,7 +1,6 @@
config BR2_PACKAGE_LIBSQUISH
bool "libsquish"
depends on BR2_INSTALL_LIBSTDCPP
- depends on !BR2_STATIC_LIBS
help
The libSquish library compresses images with the DXT standard
(also known as S3TC). This standard is mainly used by OpenGL
@@ -9,5 +8,5 @@ config BR2_PACKAGE_LIBSQUISH
http://sourceforge.net/projects/libsquish
-comment "libsquish needs a toolchain w/ C++, dynamic library"
- depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS
+comment "libsquish needs a toolchain w/ C++"
+ depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/libsquish/libsquish.mk b/package/libsquish/libsquish.mk
index b1a80e5b60..75d2cbd16a 100644
--- a/package/libsquish/libsquish.mk
+++ b/package/libsquish/libsquish.mk
@@ -12,7 +12,11 @@ LIBSQUISH_STRIP_COMPONENTS = 0
LIBSQUISH_LICENSE = MIT
LIBSQUISH_LICENSE_FILES = LICENSE.txt
+ifeq ($(BR2_STATIC_LIBS),y)
+LIBSQUISH_MAKE_ENV = USE_SHARED=0
+else
LIBSQUISH_MAKE_ENV = USE_SHARED=1
+endif
define LIBSQUISH_BUILD_CMDS
$(TARGET_CONFIGURE_OPTS) $(LIBSQUISH_MAKE_ENV) $(MAKE) -C $(@D)