* [Buildroot] [PATCH 1/2] package/libsquish: add license file hash
@ 2019-01-12 12:10 Romain Naour
2019-01-12 12:10 ` [Buildroot] [PATCH 2/2] package/libsquash: really install shared library Romain Naour
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Romain Naour @ 2019-01-12 12:10 UTC (permalink / raw)
To: buildroot
Signed-off-by: Romain Naour <romain.naour@gmail.com>
Cc: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/libsquish/libsquish.hash | 2 ++
1 file changed, 2 insertions(+)
diff --git a/package/libsquish/libsquish.hash b/package/libsquish/libsquish.hash
index e68d28d66f..06c96e977b 100644
--- a/package/libsquish/libsquish.hash
+++ b/package/libsquish/libsquish.hash
@@ -1,3 +1,5 @@
# From http://sourceforge.net/projects/libsquish/files
sha1 51844b9a8bc815a27e2cc0ffbede5fee3ef75110 libsquish-1.15.tgz
md5 c02645800131e55b519ff8dbe7284f93 libsquish-1.15.tgz
+# Locally calculated
+sha256 a6b8c383bf3ab28460d6507484d605dd722e03971606f0cd3032a3af682b63a5 LICENSE.txt
--
2.14.5
^ permalink raw reply related [flat|nested] 8+ messages in thread* [Buildroot] [PATCH 2/2] package/libsquash: really install shared library 2019-01-12 12:10 [Buildroot] [PATCH 1/2] package/libsquish: add license file hash Romain Naour @ 2019-01-12 12:10 ` Romain Naour 2019-01-12 12:31 ` Romain Naour ` (2 more replies) 2019-01-12 14:48 ` [Buildroot] [PATCH 1/2] package/libsquish: add license file hash Thomas Petazzoni 2019-01-24 15:46 ` Peter Korsgaard 2 siblings, 3 replies; 8+ messages in thread From: Romain Naour @ 2019-01-12 12:10 UTC (permalink / raw) To: buildroot 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> --- There is a new CMakeFiles.txt but it doesn't install libsquish.pc file. @Peter: This patch should be backported to all stable version (i.e since the bump to 1.15, commit 374e39df819598a0049a9c485ce5b2adbe2c90a1) --- ...d-f-option-for-ln-to-remove-existing-dest.patch | 32 ++++++++++++++++++++++ package/libsquish/libsquish.mk | 11 ++++---- 2 files changed, 37 insertions(+), 6 deletions(-) create mode 100644 package/libsquish/0001-Makefile-add-f-option-for-ln-to-remove-existing-dest.patch 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)) -- 2.14.5 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 2/2] package/libsquash: really install shared library 2019-01-12 12:10 ` [Buildroot] [PATCH 2/2] package/libsquash: really install shared library Romain Naour @ 2019-01-12 12:31 ` Romain Naour 2019-01-12 15:36 ` Thomas De Schampheleire 2019-01-24 15:46 ` Peter Korsgaard 2 siblings, 0 replies; 8+ messages in thread From: Romain Naour @ 2019-01-12 12:31 UTC (permalink / raw) To: buildroot Sorry for the typo in the tittle s/libsquash/libsquish/ Le 12/01/2019 ? 13:10, Romain Naour a ?crit?: > 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> > --- > There is a new CMakeFiles.txt but it doesn't install libsquish.pc file. > > @Peter: This patch should be backported to all stable version > (i.e since the bump to 1.15, commit 374e39df819598a0049a9c485ce5b2adbe2c90a1) > --- > ...d-f-option-for-ln-to-remove-existing-dest.patch | 32 ++++++++++++++++++++++ > package/libsquish/libsquish.mk | 11 ++++---- > 2 files changed, 37 insertions(+), 6 deletions(-) > create mode 100644 package/libsquish/0001-Makefile-add-f-option-for-ln-to-remove-existing-dest.patch > > 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)) > ^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 2/2] package/libsquash: really install shared library 2019-01-12 12:10 ` [Buildroot] [PATCH 2/2] package/libsquash: really install shared library Romain Naour 2019-01-12 12:31 ` Romain Naour @ 2019-01-12 15:36 ` Thomas De Schampheleire 2019-01-12 16:04 ` Thomas De Schampheleire 2019-01-24 15:46 ` Peter Korsgaard 2 siblings, 1 reply; 8+ messages in thread From: Thomas De Schampheleire @ 2019-01-12 15:36 UTC (permalink / raw) To: buildroot On Sat, Jan 12, 2019, 13:11 Romain Naour <romain.naour@gmail.com wrote: > While testing the new supertuxkart 0.10-beta1 version, the build failed > due to missing libsquash shared library. > Libsquish (also in commit title) Best regards, Thomas -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20190112/f6c9b2d4/attachment.html> ^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 2/2] package/libsquash: really install shared library 2019-01-12 15:36 ` Thomas De Schampheleire @ 2019-01-12 16:04 ` Thomas De Schampheleire 0 siblings, 0 replies; 8+ messages in thread From: Thomas De Schampheleire @ 2019-01-12 16:04 UTC (permalink / raw) To: buildroot On Sat, Jan 12, 2019, 16:36 Thomas De Schampheleire < patrickdepinguin@gmail.com wrote: > > > On Sat, Jan 12, 2019, 13:11 Romain Naour <romain.naour@gmail.com wrote: > >> While testing the new supertuxkart 0.10-beta1 version, the build failed >> due to missing libsquash shared library. >> > > Libsquish (also in commit title) > (Sorry, I hadn't seen your follow up mail) > -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20190112/34e4957d/attachment.html> ^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 2/2] package/libsquash: really install shared library 2019-01-12 12:10 ` [Buildroot] [PATCH 2/2] package/libsquash: really install shared library Romain Naour 2019-01-12 12:31 ` Romain Naour 2019-01-12 15:36 ` Thomas De Schampheleire @ 2019-01-24 15:46 ` Peter Korsgaard 2 siblings, 0 replies; 8+ messages in thread From: Peter Korsgaard @ 2019-01-24 15:46 UTC (permalink / raw) To: buildroot >>>>> "Romain" == Romain Naour <romain.naour@gmail.com> writes: > 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> > --- > There is a new CMakeFiles.txt but it doesn't install libsquish.pc file. > @Peter: This patch should be backported to all stable version > (i.e since the bump to 1.15, commit 374e39df819598a0049a9c485ce5b2adbe2c90a1) Committed to 2018.02.x and 2018.11.x, thanks. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 1/2] package/libsquish: add license file hash 2019-01-12 12:10 [Buildroot] [PATCH 1/2] package/libsquish: add license file hash Romain Naour 2019-01-12 12:10 ` [Buildroot] [PATCH 2/2] package/libsquash: really install shared library Romain Naour @ 2019-01-12 14:48 ` Thomas Petazzoni 2019-01-24 15:46 ` Peter Korsgaard 2 siblings, 0 replies; 8+ messages in thread From: Thomas Petazzoni @ 2019-01-12 14:48 UTC (permalink / raw) To: buildroot Hello, On Sat, 12 Jan 2019 13:10:23 +0100, Romain Naour wrote: > Signed-off-by: Romain Naour <romain.naour@gmail.com> > Cc: Bernd Kuhls <bernd.kuhls@t-online.de> > --- > package/libsquish/libsquish.hash | 2 ++ > 1 file changed, 2 insertions(+) I've applied both patches. I've added a third patch that re-enables libsquish for BR2_STATIC_LIBS=y configuration, since the ENABLE_SHARED=0 flag allows to disable building/installing the shared library. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com ^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 1/2] package/libsquish: add license file hash 2019-01-12 12:10 [Buildroot] [PATCH 1/2] package/libsquish: add license file hash Romain Naour 2019-01-12 12:10 ` [Buildroot] [PATCH 2/2] package/libsquash: really install shared library Romain Naour 2019-01-12 14:48 ` [Buildroot] [PATCH 1/2] package/libsquish: add license file hash Thomas Petazzoni @ 2019-01-24 15:46 ` Peter Korsgaard 2 siblings, 0 replies; 8+ messages in thread From: Peter Korsgaard @ 2019-01-24 15:46 UTC (permalink / raw) To: buildroot >>>>> "Romain" == Romain Naour <romain.naour@gmail.com> writes: > Signed-off-by: Romain Naour <romain.naour@gmail.com> > Cc: Bernd Kuhls <bernd.kuhls@t-online.de> Committed to 2018.02.x and 2018.11.x, thanks. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2019-01-24 15:46 UTC | newest] Thread overview: 8+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2019-01-12 12:10 [Buildroot] [PATCH 1/2] package/libsquish: add license file hash Romain Naour 2019-01-12 12:10 ` [Buildroot] [PATCH 2/2] package/libsquash: really install shared library Romain Naour 2019-01-12 12:31 ` Romain Naour 2019-01-12 15:36 ` Thomas De Schampheleire 2019-01-12 16:04 ` Thomas De Schampheleire 2019-01-24 15:46 ` Peter Korsgaard 2019-01-12 14:48 ` [Buildroot] [PATCH 1/2] package/libsquish: add license file hash Thomas Petazzoni 2019-01-24 15:46 ` Peter Korsgaard
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox