From 26397c2ea3fe904cc99cd767c9e2b1c5b3840321 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 24 May 2023 09:52:34 +0200 Subject: [PATCH] libsquish: remove unused 0001-makefile-Add-LIBDIR.patch * it was added to meta-multimedia, but not to SRC_URI in: https://git.openembedded.org/meta-openembedded/commit/?id=1c23fd7f8b58636983fd0b233c2043e34d3bc3b3 * and later diferent patch was added to the layer as well as SRC_URI in: https://git.openembedded.org/meta-openembedded/commit/?id=8df60dc8d69ffa506fd923f8db91a2a8aa33343f Signed-off-by: Martin Jansa Signed-off-by: Khem Raj --- .../libsquish/0001-makefile-Add-LIBDIR.patch | 36 ------------------- 1 file changed, 36 deletions(-) delete mode 100644 meta-multimedia/recipes-multimedia/libsquish/libsquish/0001-makefile-Add-LIBDIR.patch diff --git a/meta-multimedia/recipes-multimedia/libsquish/libsquish/0001-makefile-Add-LIBDIR.patch b/meta-multimedia/recipes-multimedia/libsquish/libsquish/0001-makefile-Add-LIBDIR.patch deleted file mode 100644 index c6eb7ac576..0000000000 --- a/meta-multimedia/recipes-multimedia/libsquish/libsquish/0001-makefile-Add-LIBDIR.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 4fd08c0446ca02917014b63f9080c4205958a130 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 20 Mar 2022 01:15:32 -0700 -Subject: [PATCH] makefile: Add LIBDIR - -Avoid hardcoding /lib - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - Makefile | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Makefile b/Makefile -index 1c01f89..2b1df5b 100644 ---- a/Makefile -+++ b/Makefile -@@ -11,12 +11,12 @@ all : $(LIB) squish.pc - - install : $(LIB) squish.pc - install squish.h $(INSTALL_DIR)/include -- install libsquish.a $(INSTALL_DIR)/lib -- install squish.pc $(INSTALL_DIR)/lib/pkgconfig -+ install libsquish.a $(INSTALL_DIR)/$(LIBDIR) -+ install squish.pc $(INSTALL_DIR)/$(LIBDIR)/pkgconfig - - uninstall: - $(RM) $(INSTALL_DIR)/include/squish.h -- $(RM) $(INSTALL_DIR)/lib/libsquish.a -+ $(RM) $(INSTALL_DIR)/$(LIBDIR)/libsquish.a - - $(LIB) : $(OBJ) - $(AR) cr $@ $? --- -2.35.1 -