userland: Fix install prefix and generate pkgconfigs
PATCH 1/1 userland: Fix install prefix and generate pkgconfigs
several userspace libraries like libepoxy poke for pkgconfigs ( .pc ) files to detect egl support, and comes out to fail in configure stage, one of the patches now adds support to generate .pc files for some known cases. it could be further extended if needed for other libraries too
Secondly, the default CMAKE_INSTALL_PREFIX is /opt/vc but in OE we use proper /usr so lets make this change as well, it simplifies do_install()
.so are not versioned so we need to grapple with OE's defaults of expecting versioned .so files.
Adjust packages for -dev package such that it can automatically package pkgconfig files and inherit pkgconfig because in cmake code we are not looking for pkgconfig so we need the dependency also put in place for consistent builds
--- .../0002-set-VMCS_INSTALL_PREFIX-to-usr.patch | 29 ++++++ ...make-generate-and-install-pkgconfig-files.patch | 114 +++++++++++++++++++++ recipes-graphics/userland/userland_git.bb | 21 ++-- 3 files changed, 152 insertions(+), 12 deletions(-) create mode 100644 recipes-graphics/userland/userland/0002-set-VMCS_INSTALL_PREFIX-to-usr.patch create mode 100644 recipes-graphics/userland/userland/0003-cmake-generate-and-install-pkgconfig-files.patch
recipes-graphics/userland/userland/0002-set-VMCS_INSTALL_PREFIX-to-usr.patch new file +29 -0
@@ -0,0 +1,29 @@ +From 05554d8486050546efc3c0605015786c8b267d19 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Sun, 9 Aug 2015 23:58:17 -0700 +Subject: [PATCH 1/2] set VMCS_INSTALL_PREFIX to /usr + +in OE we dont use /opt/vc but standard prefix + +Signed-off-by: Khem Raj <[email protected]> +--- +Upstream-Status: Submitted + makefiles/cmake/vmcs.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/makefiles/cmake/vmcs.cmake b/makefiles/cmake/vmcs.cmake +index 0f8641b..e9d576d 100644 +--- a/makefiles/cmake/vmcs.cmake ++++ b/makefiles/cmake/vmcs.cmake +@@ -10,7 +10,7 @@ INCLUDE(CPack) + if (ANDROID) + SET(VMCS_INSTALL_PREFIX "/vendor/brcm/islands" CACHE PATH "Prefix prepended to install directories" FORCE) + else() +- SET(VMCS_INSTALL_PREFIX "/opt/vc" CACHE PATH "Prefix prepended to install directories" FORCE) ++ SET(VMCS_INSTALL_PREFIX "/usr" CACHE PATH "Prefix prepended to install directories" FORCE) + endif() + + SET(CMAKE_INSTALL_PREFIX "${VMCS_INSTALL_PREFIX}" CACHE INTERNAL "Prefix +-- +2.1.4 +
recipes-graphics/userland/userland/0003-cmake-generate-and-install-pkgconfig-files.patch new file +114 -0
114 lines not on this page · raw message
recipes-graphics/userland/userland_git.bb +9 -12
@@ -17,30 +17,27 @@ SRCREV = "c2f27fb8e581f8e5af83bf28422553ade8f7a7c8" SRC_URI = "git://github.com/${SRCFORK}/userland.git;protocol=git;branch=${SRCBRANCH} \ file://0001-Use-newer-POSIX-macro.patch \ + file://0002-set-VMCS_INSTALL_PREFIX-to-usr.patch \ + file://0003-cmake-generate-and-install-pkgconfig-files.patch \ " S = "${WORKDIR}/git" -inherit cmake +inherit cmake pkgconfig EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release -DCMAKE_EXE_LINKER_FLAGS='-Wl,--no-as-needed'" CFLAGS_append = " -fPIC" -# The compiled binaries don't provide sonames. -SOLIBS = "${SOLIBSDEV}" - -do_install_append() { - mkdir -p ${D}/${prefix} - mv ${D}/opt/vc/* ${D}/${prefix} - rm -rf ${D}/opt -} +# Shared libs from userland package build aren't versioned, so we need +# to force the .so files into the runtime package (and keep them +# out of -dev package). +FILES_SOLIBSDEV = "" FILES_${PN} += " \ - ${libdir}/*${SOLIBS} \ + ${libdir}/*.so \ ${libdir}/plugins" -FILES_${PN}-dev = "${includedir} \ +FILES_${PN}-dev += "${includedir} \ ${prefix}/src" FILES_${PN}-doc += "${datadir}/install" FILES_${PN}-dbg += "${libdir}/plugins/.debug" PACKAGE_ARCH = "${MACHINE_ARCH}" -
Signature · 1 line
2.1.4