summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp/libacpi/files
diff options
context:
space:
mode:
authorRicardo Salveti <ricardo@opensourcefoundries.com>2018-02-03 01:30:33 -0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-02-16 18:05:39 +0000
commit89cc1315b3e983d52235d5f6f9cecd5f5cedfd83 (patch)
tree17784940e6e03ffd41f185836426619a6d1440ba /meta/recipes-bsp/libacpi/files
parent45f2a2f1558bfdf80bc4d66be729c043cbdd6002 (diff)
downloadpoky-89cc1315b3e983d52235d5f6f9cecd5f5cedfd83.tar.gz
libacpi: update libacpi_fix_for_x32.patch to use libdir
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>
Diffstat (limited to 'meta/recipes-bsp/libacpi/files')
-rw-r--r--meta/recipes-bsp/libacpi/files/libacpi_fix_for_x32.patch30
1 files changed, 10 insertions, 20 deletions
diff --git a/meta/recipes-bsp/libacpi/files/libacpi_fix_for_x32.patch b/meta/recipes-bsp/libacpi/files/libacpi_fix_for_x32.patch
index 86a16c262f..06f20e5a78 100644
--- a/meta/recipes-bsp/libacpi/files/libacpi_fix_for_x32.patch
+++ b/meta/recipes-bsp/libacpi/files/libacpi_fix_for_x32.patch
@@ -3,9 +3,10 @@ Upstream-Status: Pending
3Fix libacpi for x32 3Fix libacpi for x32
4 4
5 libacpi doesn't use base_libdir for install. This patch adds 5 libacpi doesn't use base_libdir for install. This patch adds
6 base_libdir support so that x32 libraries are installed properly. 6 libdir support so that x32 libraries are installed properly.
7 7
8Patch Received from: H.J. Lu <hjl.tools@gmail.com> 8Patch Received from: H.J. Lu <hjl.tools@gmail.com>
9Updated by: Ricardo Salveti <ricardo@opensourcefoundries.com> 2018/02/03
9 10
10Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/05 11Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/05
11 12
@@ -13,18 +14,7 @@ Index: libacpi-0.2/Makefile
13=================================================================== 14===================================================================
14--- libacpi-0.2.orig/Makefile 15--- libacpi-0.2.orig/Makefile
15+++ libacpi-0.2/Makefile 16+++ libacpi-0.2/Makefile
16@@ -8,6 +8,10 @@ SRC_test = test-libacpi.c libacpi.c list 17@@ -42,13 +42,13 @@ install: all
17 OBJ = ${SRC:.c=.o}
18 OBJ_test = ${SRC_test:.c=.o}
19
20+ifndef base_libdir
21+base_libdir=/lib
22+endif
23+
24 all: options libacpi.a libacpi.so test-libacpi
25
26 options:
27@@ -42,13 +46,13 @@ install: all
28 @mkdir -p ${DESTDIR}${PREFIX}/include 18 @mkdir -p ${DESTDIR}${PREFIX}/include
29 @cp -f libacpi.h ${DESTDIR}${PREFIX}/include 19 @cp -f libacpi.h ${DESTDIR}${PREFIX}/include
30 @chmod 644 ${DESTDIR}${PREFIX}/include/libacpi.h 20 @chmod 644 ${DESTDIR}${PREFIX}/include/libacpi.h
@@ -35,13 +25,13 @@ Index: libacpi-0.2/Makefile
35- @cp -f ${SONAME} ${DESTDIR}${PREFIX}/lib/ 25- @cp -f ${SONAME} ${DESTDIR}${PREFIX}/lib/
36- @chmod 644 ${DESTDIR}${PREFIX}/lib/${SONAME} 26- @chmod 644 ${DESTDIR}${PREFIX}/lib/${SONAME}
37- @ln -s ${SONAME} ${DESTDIR}${PREFIX}/lib/libacpi.so 27- @ln -s ${SONAME} ${DESTDIR}${PREFIX}/lib/libacpi.so
38+ @echo installing library to ${DESTDIR}${PREFIX}${base_libdir} 28+ @echo installing library to ${DESTDIR}${LIBDIR}
39+ @mkdir -p ${DESTDIR}${PREFIX}${base_libdir} 29+ @mkdir -p ${DESTDIR}${LIBDIR}
40+ @cp -f libacpi.a ${DESTDIR}${PREFIX}${base_libdir} 30+ @cp -f libacpi.a ${DESTDIR}${LIBDIR}
41+ @chmod 644 ${DESTDIR}${PREFIX}${base_libdir}/libacpi.a 31+ @chmod 644 ${DESTDIR}${LIBDIR}/libacpi.a
42+ @cp -f ${SONAME} ${DESTDIR}${PREFIX}${base_libdir}/ 32+ @cp -f ${SONAME} ${DESTDIR}${LIBDIR}/
43+ @chmod 644 ${DESTDIR}${PREFIX}${base_libdir}/${SONAME} 33+ @chmod 644 ${DESTDIR}${LIBDIR}/${SONAME}
44+ @ln -s ${SONAME} ${DESTDIR}${PREFIX}${base_libdir}/libacpi.so 34+ @ln -s ${SONAME} ${DESTDIR}${LIBDIR}/libacpi.so
45 @echo installing test-libacpi to ${DESTDIR}${PREFIX}/bin 35 @echo installing test-libacpi to ${DESTDIR}${PREFIX}/bin
46 @mkdir -p ${DESTDIR}${PREFIX}/bin 36 @mkdir -p ${DESTDIR}${PREFIX}/bin
47 @cp -f test-libacpi ${DESTDIR}${PREFIX}/bin 37 @cp -f test-libacpi ${DESTDIR}${PREFIX}/bin