NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/libsquish: re-enable for BR2_STATIC_LIBS configuration

Browse Source 
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>
This commit is contained in:
Thomas Petazzoni 2019-01-12 15:34:32 +01:00
parent b621273755
commit ae4b9e4afb
2 changed files with 6 additions and 3 deletions
package/libsquish
Config.inlibsquish.mk

5
package/libsquish/Config.in
View File

@ -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

4
package/libsquish/libsquish.mk
View File

@ -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)