aboutsummaryrefslogtreecommitdiff
path: root/package/libsquish
diff options
context:
space:
mode:
authorGravatar Romain Naour <romain.naour@gmail.com>2019-01-12 13:10:24 +0100
committerGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2019-01-12 15:35:28 +0100
commitb621273755ef0a9d673100168d1c93750ed7bd6f (patch)
treeaacfc9fe9e4ab443c9c5f3f8d4560aa20d9eecda /package/libsquish
parent9b377e9dcfbad9025cfcc87d95735a61bd8722ca (diff)
downloadbuildroot-b621273755ef0a9d673100168d1c93750ed7bd6f.tar.gz
buildroot-b621273755ef0a9d673100168d1c93750ed7bd6f.tar.bz2
package/libsquish: really install shared library
While testing the new supertuxkart 0.10-beta1 version, the build failed due to missing libsquash shared library. Indeed, by default (see config file) the shared library is not build and all symlinks created by LIBSQUISH_INSTALL_{STAGING,TARGET}_CMDS are curently broken. To fix that, add USE_SHARED=1 to LIBSQUISH_MAKE_ENV. Also add a patch to allow reinstall the package. Signed-off-by: Romain Naour <romain.naour@gmail.com> Cc: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Diffstat (limited to 'package/libsquish')
-rw-r--r--package/libsquish/0001-Makefile-add-f-option-for-ln-to-remove-existing-dest.patch32
-rw-r--r--package/libsquish/libsquish.mk11
2 files changed, 37 insertions, 6 deletions
diff --git a/package/libsquish/0001-Makefile-add-f-option-for-ln-to-remove-existing-dest.patch b/package/libsquish/0001-Makefile-add-f-option-for-ln-to-remove-existing-dest.patch
new file mode 100644
index 0000000000..ab9e64f0ff
--- /dev/null
+++ b/package/libsquish/0001-Makefile-add-f-option-for-ln-to-remove-existing-dest.patch
@@ -0,0 +1,32 @@
+From 1e541293ac19c49f886220b64de6006c5c700144 Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@gmail.com>
+Date: Sat, 12 Jan 2019 12:50:54 +0100
+Subject: [PATCH] Makefile: add -f option for ln to remove existing destination
+ files
+
+While reinstalling the library, all symlinks are present.
+Ask ln to remove them with -f.
+
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index fd7d6c8..2683819 100644
+--- a/Makefile
++++ b/Makefile
+@@ -25,8 +25,8 @@ install: $(LIB) $(LIBA) libsquish.pc
+ $(INSTALL_FILE) $(LIBA) $(INSTALL_DIR)/$(LIB_PATH)
+ ifneq ($(USE_SHARED),0)
+ $(INSTALL_FILE) $(LIB) $(INSTALL_DIR)/$(LIB_PATH)
+- ln -s $(LIB) $(INSTALL_DIR)/$(LIB_PATH)/$(SOLIB)
+- ln -s $(LIB) $(INSTALL_DIR)/$(LIB_PATH)/libsquish.so
++ ln -sf $(LIB) $(INSTALL_DIR)/$(LIB_PATH)/$(SOLIB)
++ ln -sf $(LIB) $(INSTALL_DIR)/$(LIB_PATH)/libsquish.so
+ $(INSTALL_DIRECTORY) $(INSTALL_DIR)/$(LIB_PATH)/pkgconfig
+ $(INSTALL_FILE) libsquish.pc $(INSTALL_DIR)/$(LIB_PATH)/pkgconfig
+ endif
+--
+2.14.5
+
diff --git a/package/libsquish/libsquish.mk b/package/libsquish/libsquish.mk
index 67892dd9eb..b1a80e5b60 100644
--- a/package/libsquish/libsquish.mk
+++ b/package/libsquish/libsquish.mk
@@ -12,26 +12,25 @@ LIBSQUISH_STRIP_COMPONENTS = 0
LIBSQUISH_LICENSE = MIT
LIBSQUISH_LICENSE_FILES = LICENSE.txt
+LIBSQUISH_MAKE_ENV = USE_SHARED=1
+
define LIBSQUISH_BUILD_CMDS
- $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)
+ $(TARGET_CONFIGURE_OPTS) $(LIBSQUISH_MAKE_ENV) $(MAKE) -C $(@D)
endef
define LIBSQUISH_INSTALL_STAGING_CMDS
mkdir -p $(STAGING_DIR)/usr/include
mkdir -p $(STAGING_DIR)/usr/lib
- $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
+ $(TARGET_CONFIGURE_OPTS) $(LIBSQUISH_MAKE_ENV) $(MAKE) -C $(@D) \
install PREFIX=/usr INSTALL_DIR=$(STAGING_DIR)/usr
$(INSTALL) -D -m 644 $(@D)/libsquish.pc $(STAGING_DIR)/usr/lib/pkgconfig/libsquish.pc
- ln -sf libsquish.so.0.0 $(STAGING_DIR)/usr/lib/libsquish.so
- ln -sf libsquish.so.0.0 $(STAGING_DIR)/usr/lib/libsquish.so.0
endef
define LIBSQUISH_INSTALL_TARGET_CMDS
mkdir -p $(TARGET_DIR)/usr/include
mkdir -p $(TARGET_DIR)/usr/lib
- $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
+ $(TARGET_CONFIGURE_OPTS) $(LIBSQUISH_MAKE_ENV) $(MAKE) -C $(@D) \
install PREFIX=/usr INSTALL_DIR=$(TARGET_DIR)/usr
- ln -sf libsquish.so.0.0 $(TARGET_DIR)/usr/lib/libsquish.so.0
endef
$(eval $(generic-package))