mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-05-09 17:59:26 +00:00
Code Issues Projects Releases Wiki Activity

lockdev: Make baselib configurable

Browse Source 
This ensures that baselib can be passed from bitbake tasks via
environment

Refresh patches

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2019-12-19 17:57:10 -08:00
parent 5a5d2cfa1b
commit 89461fecb7
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-support/lockdev/lockdev/build.patch
+1 -1
View File
@@ -18,7 +18,7 @@ Date: Tue Feb 9 14:56:23 2010 +0100
soname = ${libname}.so.${MVER} soname = ${libname}.so.${MVER}
# overwritten by caller (e.g.: debian/rules) # overwritten by caller (e.g.: debian/rules)
@@ -72,6 +72,7 @@ install_doc: docs/lockdev.3 @@ -73,6 +73,7 @@ install_doc: docs/lockdev.3
install_run: ${shared} install_run: ${shared}
install -m755 -d ${libdir} install -m755 -d ${libdir}
install -m644 ${shared} ${libdir} install -m644 ${shared} ${libdir}
meta-oe/recipes-support/lockdev/lockdev/cross_compile.patch
+4 -2
View File
@@ -1,14 +1,16 @@
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -15,17 +15,17 @@ shared = ${libname}.${VER}.so @@ -15,17 +15,18 @@ shared = ${libname}.${VER}.so
soname = ${libname}.so.${MVER} soname = ${libname}.so.${MVER}
# overwritten by caller (e.g.: debian/rules) # overwritten by caller (e.g.: debian/rules)
-basedir = /usr/local -basedir = /usr/local
+basedir ?= /usr/local +basedir ?= /usr/local
+baselib ?= lib
srcdir=. srcdir=.
libdir = ${basedir}/lib -libdir = ${basedir}/lib
+libdir = ${basedir}/${baselib}
incdir = ${basedir}/include incdir = ${basedir}/include
mandir = ${basedir}/share/man mandir = ${basedir}/share/man
meta-oe/recipes-support/lockdev/lockdev_1.0.3.bb
+3 -3
View File
@@ -15,15 +15,15 @@ SRC_URI[debianpatch.md5sum] = "5ef6267c42fca9145e0af006ccb6aff7"
SRC_URI[debianpatch.sha256sum] = "a5405c6ee5e97e45eeb1c81330a7e9f444a58bda5e6771fa30007516c115007e" SRC_URI[debianpatch.sha256sum] = "a5405c6ee5e97e45eeb1c81330a7e9f444a58bda5e6771fa30007516c115007e"
inherit lib_package perlnative inherit lib_package perlnative
export basedir="${D}${prefix}"
CFLAGS += " -D__GNU_LIBRARY__" CFLAGS += " -D__GNU_LIBRARY__"
TARGET_CC_ARCH += "${LDFLAGS}" TARGET_CC_ARCH += "${LDFLAGS}"
EXTRA_OEMAKE = "basedir=${D}${prefix} baselib=${baselib} LD='${CC}' LD='${CC}'"
do_compile() { do_compile() {
oe_runmake basedir=${D}${prefix} LD="${CC}" LD="${CC}" shared static oe_runmake shared static
} }
do_install() { do_install() {
oe_runmake DESTDIR=${D} basedir=${D}${prefix} install oe_runmake DESTDIR=${D} install
} }