[Buildroot] [git commit] package/jpeg-turbo: use configure option WITH_{TESTS, TOOLS}
Peter Korsgaard <[email protected]>
| Newsgroups | net.busybox.buildroot |
|---|---|
| Message-ID | <[email protected]> |
commit: https://gitlab.com/buildroot.org/buildroot/-/commit/d74a065a16be4e18e6c85ddf257c4f5ff033e6b8 branch: https://gitlab.com/buildroot.org/buildroot/-/tree/master Buildroot commit c531fe65209defd356e5ee8142896478a20ab371 bumped the package to 3.1.2. This version first included upstream commit https://github.com/libjpeg-turbo/libjpeg-turbo/commit/942ac87e479c48199d48781e9a5b2cda3b910d7b which added configure options to disable the build of command-line tools and tests. This patch replaces the current _POST_INSTALL_TARGET_HOOK with the new configure option and disables the build of tests. Signed-off-by: Bernd Kuhls <[email protected]> Signed-off-by: Peter Korsgaard <[email protected]> --- package/jpeg-turbo/jpeg-turbo.mk | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/package/jpeg-turbo/jpeg-turbo.mk b/package/jpeg-turbo/jpeg-turbo.mk index 9a10110766..073a607188 100644 --- a/package/jpeg-turbo/jpeg-turbo.mk +++ b/package/jpeg-turbo/jpeg-turbo.mk @@ -15,7 +15,7 @@ JPEG_TURBO_INSTALL_STAGING = YES JPEG_TURBO_PROVIDES = jpeg JPEG_TURBO_DEPENDENCIES = host-pkgconf -JPEG_TURBO_CONF_OPTS = -DWITH_JPEG8=ON +JPEG_TURBO_CONF_OPTS = -DWITH_JPEG8=ON -DWITH_TESTS=OFF ifeq ($(BR2_STATIC_LIBS),y) JPEG_TURBO_CONF_OPTS += -DENABLE_STATIC=ON -DENABLE_SHARED=OFF @@ -43,11 +43,10 @@ ifeq ($(BR2_STATIC_LIBS),) JPEG_TURBO_CONF_OPTS += -DCMAKE_POSITION_INDEPENDENT_CODE=ON endif -ifeq ($(BR2_PACKAGE_JPEG_TURBO_TOOLS),) -define JPEG_TURBO_REMOVE_TOOLS - rm -f $(addprefix $(TARGET_DIR)/usr/bin/,cjpeg djpeg jpegtran rdjpgcom tjbench wrjpgcom) -endef -JPEG_TURBO_POST_INSTALL_TARGET_HOOKS += JPEG_TURBO_REMOVE_TOOLS +ifeq ($(BR2_PACKAGE_JPEG_TURBO_TOOLS),y) +JPEG_TURBO_CONF_OPTS += -DWITH_TOOLS=ON +else +JPEG_TURBO_CONF_OPTS += -DWITH_TOOLS=OFF endif $(eval $(cmake-package)) _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot