mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-01 00:59:48 +00:00
Code Issues Projects Releases Wiki Activity

libacpi: update libacpi_fix_for_x32.patch to use libdir

Browse Source 
Prefix plus base_libdir generates an invalid path when building with
usrmerge, so change libacpi_fix_for_x32.patch to use libdir instead as
it provides the right path in both cases.

(From OE-Core rev: c46d50c82d8ad27aaa75b974fa80838ff3a81386)

Signed-off-by: Ricardo Salveti <ricardo@opensourcefoundries.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ricardo Salveti
2018-02-03 01:30:33 -02:00
committed by Richard Purdie
parent 45f2a2f155
commit 89cc1315b3
2 changed files with 11 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-bsp/libacpi/files/libacpi_fix_for_x32.patch
+10 -20
View File
@@ -3,9 +3,10 @@ Upstream-Status: Pending
Fix libacpi for x32 Fix libacpi for x32
libacpi doesn't use base_libdir for install. This patch adds libacpi doesn't use base_libdir for install. This patch adds
base_libdir support so that x32 libraries are installed properly. libdir support so that x32 libraries are installed properly.
Patch Received from: H.J. Lu <hjl.tools@gmail.com> Patch Received from: H.J. Lu <hjl.tools@gmail.com>
Updated by: Ricardo Salveti <ricardo@opensourcefoundries.com> 2018/02/03
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/05 Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/05
@@ -13,18 +14,7 @@ Index: libacpi-0.2/Makefile
=================================================================== ===================================================================
--- libacpi-0.2.orig/Makefile --- libacpi-0.2.orig/Makefile
+++ libacpi-0.2/Makefile +++ libacpi-0.2/Makefile
@@ -8,6 +8,10 @@ SRC_test = test-libacpi.c libacpi.c list @@ -42,13 +42,13 @@ install: all
OBJ = ${SRC:.c=.o}
OBJ_test = ${SRC_test:.c=.o}
+ifndef base_libdir
+base_libdir=/lib
+endif
+
all: options libacpi.a libacpi.so test-libacpi
options:
@@ -42,13 +46,13 @@ install: all
@mkdir -p ${DESTDIR}${PREFIX}/include @mkdir -p ${DESTDIR}${PREFIX}/include
@cp -f libacpi.h ${DESTDIR}${PREFIX}/include @cp -f libacpi.h ${DESTDIR}${PREFIX}/include
@chmod 644 ${DESTDIR}${PREFIX}/include/libacpi.h @chmod 644 ${DESTDIR}${PREFIX}/include/libacpi.h
@@ -35,13 +25,13 @@ Index: libacpi-0.2/Makefile
- @cp -f ${SONAME} ${DESTDIR}${PREFIX}/lib/ - @cp -f ${SONAME} ${DESTDIR}${PREFIX}/lib/
- @chmod 644 ${DESTDIR}${PREFIX}/lib/${SONAME} - @chmod 644 ${DESTDIR}${PREFIX}/lib/${SONAME}
- @ln -s ${SONAME} ${DESTDIR}${PREFIX}/lib/libacpi.so - @ln -s ${SONAME} ${DESTDIR}${PREFIX}/lib/libacpi.so
+ @echo installing library to ${DESTDIR}${PREFIX}${base_libdir} + @echo installing library to ${DESTDIR}${LIBDIR}
+ @mkdir -p ${DESTDIR}${PREFIX}${base_libdir} + @mkdir -p ${DESTDIR}${LIBDIR}
+ @cp -f libacpi.a ${DESTDIR}${PREFIX}${base_libdir} + @cp -f libacpi.a ${DESTDIR}${LIBDIR}
+ @chmod 644 ${DESTDIR}${PREFIX}${base_libdir}/libacpi.a + @chmod 644 ${DESTDIR}${LIBDIR}/libacpi.a
+ @cp -f ${SONAME} ${DESTDIR}${PREFIX}${base_libdir}/ + @cp -f ${SONAME} ${DESTDIR}${LIBDIR}/
+ @chmod 644 ${DESTDIR}${PREFIX}${base_libdir}/${SONAME} + @chmod 644 ${DESTDIR}${LIBDIR}/${SONAME}
+ @ln -s ${SONAME} ${DESTDIR}${PREFIX}${base_libdir}/libacpi.so + @ln -s ${SONAME} ${DESTDIR}${LIBDIR}/libacpi.so
@echo installing test-libacpi to ${DESTDIR}${PREFIX}/bin @echo installing test-libacpi to ${DESTDIR}${PREFIX}/bin
@mkdir -p ${DESTDIR}${PREFIX}/bin @mkdir -p ${DESTDIR}${PREFIX}/bin
@cp -f test-libacpi ${DESTDIR}${PREFIX}/bin @cp -f test-libacpi ${DESTDIR}${PREFIX}/bin
meta/recipes-bsp/libacpi/libacpi_0.2.bb
+1 -1
View File
@@ -28,5 +28,5 @@ EXTRA_OEMAKE = '-e MAKEFLAGS= STRIP="echo"'
TARGET_CC_ARCH += "${LDFLAGS}" TARGET_CC_ARCH += "${LDFLAGS}"
do_install() { do_install() {
oe_runmake install DESTDIR=${D} PREFIX=${exec_prefix} oe_runmake install DESTDIR=${D} PREFIX=${exec_prefix} LIBDIR=${libdir}
} }