diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2022-03-20 01:21:42 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2022-03-21 08:25:11 -0700 |
| commit | 1c23fd7f8b58636983fd0b233c2043e34d3bc3b3 (patch) | |
| tree | bec8d14f608f62f917b17897e2e295c37e180ace /meta-multimedia | |
| parent | e22d8a1a8912b67b1db5611d6e359a63d236b25f (diff) | |
| download | meta-openembedded-contrib-1c23fd7f8b58636983fd0b233c2043e34d3bc3b3.tar.gz | |
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 <raj.khem@gmail.com>
Diffstat (limited to 'meta-multimedia')
| -rw-r--r-- | meta-multimedia/recipes-multimedia/libsquish/libsquish/0001-makefile-Add-LIBDIR.patch | 36 | ||||
| -rw-r--r-- | meta-multimedia/recipes-multimedia/libsquish/libsquish_git.bb | 3 |
2 files changed, 38 insertions, 1 deletions
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 0000000000..c6eb7ac576 --- /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 <raj.khem@gmail.com> +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 <raj.khem@gmail.com> +--- + 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 cb42d943fc..b69d30d259 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} |