From 1c23fd7f8b58636983fd0b233c2043e34d3bc3b3 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 20 Mar 2022 01:21:42 -0700 Subject: libsquish: Define LIBDIR knob this is to avoid assuming /lib for library path Enable compile with altivec when in machine features Signed-off-by: Khem Raj --- .../libsquish/0001-makefile-Add-LIBDIR.patch | 36 ++++++++++++++++++++++ .../recipes-multimedia/libsquish/libsquish_git.bb | 3 +- 2 files changed, 38 insertions(+), 1 deletion(-) create 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 new file mode 100644 index 000000000..c6eb7ac57 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/libsquish/libsquish/0001-makefile-Add-LIBDIR.patch @@ -0,0 +1,36 @@ +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 + diff --git a/meta-multimedia/recipes-multimedia/libsquish/libsquish_git.bb b/meta-multimedia/recipes-multimedia/libsquish/libsquish_git.bb index cb42d943f..b69d30d25 100644 --- a/meta-multimedia/recipes-multimedia/libsquish/libsquish_git.bb +++ b/meta-multimedia/recipes-multimedia/libsquish/libsquish_git.bb @@ -10,7 +10,8 @@ SRC_URI = "git://github.com/OpenELEC/libsquish.git;protocol=https;branch=master" S = "${WORKDIR}/git" -EXTRA_OEMAKE = "INSTALL_DIR=${D}${prefix}" +EXTRA_OEMAKE = "INSTALL_DIR=${D}${prefix} LIBDIR=${base_libdir} \ + ${@bb.utils.contains('TUNE_FEATURES', 'altivec', 'USE_ALTIVEC=1', '', d)}" do_install() { install -d ${D}${includedir} -- cgit v1.2.3-54-g00ecf