浏览代码

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>
Thomas Petazzoni 6 年之前
父节点
当前提交
ae4b9e4afb
共有 2 个文件被更改,包括 6 次插入3 次删除
  1. 2 3
      package/libsquish/Config.in
  2. 4 0
      package/libsquish/libsquish.mk

+ 2 - 3
package/libsquish/Config.in

@@ -1,7 +1,6 @@
 config BR2_PACKAGE_LIBSQUISH
 config BR2_PACKAGE_LIBSQUISH
 	bool "libsquish"
 	bool "libsquish"
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_INSTALL_LIBSTDCPP
-	depends on !BR2_STATIC_LIBS
 	help
 	help
 	  The libSquish library compresses images with the DXT standard
 	  The libSquish library compresses images with the DXT standard
 	  (also known as S3TC). This standard is mainly used by OpenGL
 	  (also known as S3TC). This standard is mainly used by OpenGL
@@ -9,5 +8,5 @@ config BR2_PACKAGE_LIBSQUISH
 
 
 	  http://sourceforge.net/projects/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

+ 4 - 0
package/libsquish/libsquish.mk

@@ -12,7 +12,11 @@ LIBSQUISH_STRIP_COMPONENTS = 0
 LIBSQUISH_LICENSE = MIT
 LIBSQUISH_LICENSE = MIT
 LIBSQUISH_LICENSE_FILES = LICENSE.txt
 LIBSQUISH_LICENSE_FILES = LICENSE.txt
 
 
+ifeq ($(BR2_STATIC_LIBS),y)
+LIBSQUISH_MAKE_ENV = USE_SHARED=0
+else
 LIBSQUISH_MAKE_ENV = USE_SHARED=1
 LIBSQUISH_MAKE_ENV = USE_SHARED=1
+endif
 
 
 define LIBSQUISH_BUILD_CMDS
 define LIBSQUISH_BUILD_CMDS
 	$(TARGET_CONFIGURE_OPTS) $(LIBSQUISH_MAKE_ENV) $(MAKE) -C $(@D)
 	$(TARGET_CONFIGURE_OPTS) $(LIBSQUISH_MAKE_ENV) $(MAKE) -C $(@D)