helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-04-02 02:49:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

tinyalsa: fix installation libdir path to match multilibs

Browse Source 
Fixes
ERROR: tinyalsa-1.1.1+gitAUTOINC+8449529c7e-r0 do_package: QA Issue: tinyalsa: Files/directories were installed but not shipped in any package:
  /usr/lib
  /usr/lib/libtinyalsa.a
Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Andreas Müller <schnitzeltony@googlemail.com>
Acked-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit d9f3e6dbed8e5d96f2069280f0a566af89afb2fa)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Khem Raj 2019-12-17 18:48:08 -08:00 committed by Armin Kuster
parent c61c89918e
commit 22bec3b260
2 changed files with 49 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa.bb
View File

@ -7,7 +7,9 @@ LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://NOTICE;md5=dbdefe400d894b510a9de14813181d0b"
SRCREV = "8449529c7e50f432091539ba7b438e79b04059b5"
SRC_URI = "git://github.com/tinyalsa/tinyalsa"
SRC_URI = "git://github.com/tinyalsa/tinyalsa \
file://0001-Use-CMAKE_INSTALL_-path-instead-of-hardcoding-bin-li.patch \
"
PV = "1.1.1+git${SRCPV}"
S = "${WORKDIR}/git"

46
meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa/0001-Use-CMAKE_INSTALL_-path-instead-of-hardcoding-bin-li.patch Normal file
View File

@ -0,0 +1,46 @@
From fe4f3c2a37a81201f463ff962364f014f50c9896 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 16 Dec 2019 22:58:41 -0800
Subject: [PATCH] Use CMAKE_INSTALL_<path> instead of hardcoding bin/lib/
install paths
Helps fix build/packaging issues on machines where default libdir is not
lib but say lib64
Upstream-Status: Submitted [https://github.com/tinyalsa/tinyalsa/pull/143]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
CMakeLists.txt | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cb31c58..1cc4a85 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,12 +41,20 @@ add_util("tinymix" "utils/tinymix.c")
install(FILES ${HDRS}
DESTINATION "include/tinyalsa")
+if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
+ set(CMAKE_INSTALL_LIBDIR lib)
+endif()
+
+if(NOT DEFINED CMAKE_INSTALL_BINDIR)
+ set(CMAKE_INSTALL_BINDIR bin)
+endif()
+
install(TARGETS "tinyalsa"
"tinyplay"
"tinycap"
"tinymix"
"tinypcminfo"
- RUNTIME DESTINATION "bin"
- ARCHIVE DESTINATION "lib"
- LIBRARY DESTINATION "lib")
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
--
2.24.1