diff options
-rw-r--r-- | meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa.bb | 4 | ||||
-rw-r--r-- | meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa/0001-Use-CMAKE_INSTALL_-path-instead-of-hardcoding-bin-li.patch | 46 |
2 files changed, 49 insertions, 1 deletions
diff --git a/meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa.bb b/meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa.bb index 8b86f8243..062096892 100644 --- a/meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa.bb +++ b/meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa.bb | |||
@@ -7,7 +7,9 @@ LICENSE = "BSD-3-Clause" | |||
7 | LIC_FILES_CHKSUM = "file://NOTICE;md5=dbdefe400d894b510a9de14813181d0b" | 7 | LIC_FILES_CHKSUM = "file://NOTICE;md5=dbdefe400d894b510a9de14813181d0b" |
8 | 8 | ||
9 | SRCREV = "8449529c7e50f432091539ba7b438e79b04059b5" | 9 | SRCREV = "8449529c7e50f432091539ba7b438e79b04059b5" |
10 | SRC_URI = "git://github.com/tinyalsa/tinyalsa" | 10 | SRC_URI = "git://github.com/tinyalsa/tinyalsa \ |
11 | file://0001-Use-CMAKE_INSTALL_-path-instead-of-hardcoding-bin-li.patch \ | ||
12 | " | ||
11 | PV = "1.1.1+git${SRCPV}" | 13 | PV = "1.1.1+git${SRCPV}" |
12 | 14 | ||
13 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
diff --git a/meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa/0001-Use-CMAKE_INSTALL_-path-instead-of-hardcoding-bin-li.patch b/meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa/0001-Use-CMAKE_INSTALL_-path-instead-of-hardcoding-bin-li.patch new file mode 100644 index 000000000..6f9c39996 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa/0001-Use-CMAKE_INSTALL_-path-instead-of-hardcoding-bin-li.patch | |||
@@ -0,0 +1,46 @@ | |||
1 | From fe4f3c2a37a81201f463ff962364f014f50c9896 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 16 Dec 2019 22:58:41 -0800 | ||
4 | Subject: [PATCH] Use CMAKE_INSTALL_<path> instead of hardcoding bin/lib/ | ||
5 | install paths | ||
6 | |||
7 | Helps fix build/packaging issues on machines where default libdir is not | ||
8 | lib but say lib64 | ||
9 | |||
10 | Upstream-Status: Submitted [https://github.com/tinyalsa/tinyalsa/pull/143] | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | CMakeLists.txt | 14 +++++++++++--- | ||
14 | 1 file changed, 11 insertions(+), 3 deletions(-) | ||
15 | |||
16 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
17 | index cb31c58..1cc4a85 100644 | ||
18 | --- a/CMakeLists.txt | ||
19 | +++ b/CMakeLists.txt | ||
20 | @@ -41,12 +41,20 @@ add_util("tinymix" "utils/tinymix.c") | ||
21 | install(FILES ${HDRS} | ||
22 | DESTINATION "include/tinyalsa") | ||
23 | |||
24 | +if(NOT DEFINED CMAKE_INSTALL_LIBDIR) | ||
25 | + set(CMAKE_INSTALL_LIBDIR lib) | ||
26 | +endif() | ||
27 | + | ||
28 | +if(NOT DEFINED CMAKE_INSTALL_BINDIR) | ||
29 | + set(CMAKE_INSTALL_BINDIR bin) | ||
30 | +endif() | ||
31 | + | ||
32 | install(TARGETS "tinyalsa" | ||
33 | "tinyplay" | ||
34 | "tinycap" | ||
35 | "tinymix" | ||
36 | "tinypcminfo" | ||
37 | - RUNTIME DESTINATION "bin" | ||
38 | - ARCHIVE DESTINATION "lib" | ||
39 | - LIBRARY DESTINATION "lib") | ||
40 | + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} | ||
41 | + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} | ||
42 | + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) | ||
43 | |||
44 | -- | ||
45 | 2.24.1 | ||
46 | |||