summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2019-12-19 19:51:39 -0800
committerKhem Raj <raj.khem@gmail.com>2019-12-20 16:07:50 -0800
commite4ca7d4ab0ec4b0f2842c982e871ef11d9672a54 (patch)
treecf3a99abbe154e4c12962e9536adf51a0e5016e4
parent99fe1dec83456100e0bc1c02581defa7aaf04a16 (diff)
downloadmeta-openembedded-e4ca7d4ab0ec4b0f2842c982e871ef11d9672a54.tar.gz
dcadec: Define BASELIB as a knob
Use https protocol in fetcher Fixes ERROR: dcadec-0.2.0-r0 do_package: QA Issue: dcadec: Files/directories were installed but not shipped in any package: /usr/lib /usr/lib/libdcadec.so.0 /usr/lib/libdcadec.so.0.1.0 /usr/lib/libdcadec.so /usr/lib/pkgconfig /usr/lib/pkgconfig/dcadec.pc Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-multimedia/recipes-multimedia/dca/dcadec/0001-define-BASELIB-make-variable.patch31
-rw-r--r--meta-multimedia/recipes-multimedia/dca/dcadec_0.2.0.bb8
2 files changed, 36 insertions, 3 deletions
diff --git a/meta-multimedia/recipes-multimedia/dca/dcadec/0001-define-BASELIB-make-variable.patch b/meta-multimedia/recipes-multimedia/dca/dcadec/0001-define-BASELIB-make-variable.patch
new file mode 100644
index 0000000000..adce802bc8
--- /dev/null
+++ b/meta-multimedia/recipes-multimedia/dca/dcadec/0001-define-BASELIB-make-variable.patch
@@ -0,0 +1,31 @@
1From 18cc69460d2a0c756880bd54fda36afb0173ea02 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 19 Dec 2019 19:47:36 -0800
4Subject: [PATCH] define BASELIB make variable
5
6This helps to override the default libdir from environment
7
8Upstream-Status: Submitted [https://github.com/foo86/dcadec/pull/61]
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 Makefile | 3 ++-
12 1 file changed, 2 insertions(+), 1 deletion(-)
13
14diff --git a/Makefile b/Makefile
15index a503698..8f323be 100644
16--- a/Makefile
17+++ b/Makefile
18@@ -7,8 +7,9 @@ API_PATCH = 0
19 CFLAGS := -std=gnu99 -D_FILE_OFFSET_BITS=64 -Wall -Wextra -O3 -ffast-math -g -MMD $(CFLAGS)
20
21 PREFIX ?= /usr/local
22+BASELIB ?= lib
23 BINDIR ?= $(PREFIX)/bin
24-LIBDIR ?= $(PREFIX)/lib
25+LIBDIR ?= $(PREFIX)/$(BASELIB)
26 INCLUDEDIR ?= $(PREFIX)/include
27
28 SRC_DIR := $(realpath $(dir $(lastword $(MAKEFILE_LIST))))
29--
302.24.1
31
diff --git a/meta-multimedia/recipes-multimedia/dca/dcadec_0.2.0.bb b/meta-multimedia/recipes-multimedia/dca/dcadec_0.2.0.bb
index 45b53c1191..1a51abc360 100644
--- a/meta-multimedia/recipes-multimedia/dca/dcadec_0.2.0.bb
+++ b/meta-multimedia/recipes-multimedia/dca/dcadec_0.2.0.bb
@@ -4,14 +4,16 @@ LICENSE = "LGPLv2.1"
4LIC_FILES_CHKSUM = "file://COPYING.LGPLv2.1;md5=4fbd65380cdd255951079008b364516c" 4LIC_FILES_CHKSUM = "file://COPYING.LGPLv2.1;md5=4fbd65380cdd255951079008b364516c"
5 5
6SRCREV = "b93deed1a231dd6dd7e39b9fe7d2abe05aa00158" 6SRCREV = "b93deed1a231dd6dd7e39b9fe7d2abe05aa00158"
7SRC_URI = "git://github.com/foo86/dcadec.git;protocol=http" 7SRC_URI = "git://github.com/foo86/dcadec.git;protocol=https \
8 file://0001-define-BASELIB-make-variable.patch \
9 "
8 10
9S = "${WORKDIR}/git" 11S = "${WORKDIR}/git"
10 12
11inherit lib_package 13inherit lib_package
12 14
13EXTRA_OEMAKE = "CONFIG_SHARED=1" 15EXTRA_OEMAKE = "CONFIG_SHARED=1 PREFIX=${prefix} BASELIB=${baselib}"
14 16
15do_install() { 17do_install() {
16 oe_runmake install DESTDIR="${D}" PREFIX="${prefix}" 18 oe_runmake install DESTDIR="${D}"
17} 19}