summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2011-12-06 00:49:42 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-12 21:50:18 (GMT)
commit2e82fe131cf1650a0d1e1e6d23c5611064230a88 (patch)
tree7b3c86fa93819a6b36bab9b46790aae1fc4ddac0 /meta/recipes-bsp
parent8ae6359650a004b7e108c33f38823395ab3761e4 (diff)
downloadpoky-2e82fe131cf1650a0d1e1e6d23c5611064230a88.tar.gz
libacpi: Fix libdir for x32
libacpi doesn't use base_libdir for install. This patch adds base_libdir support so that x32 libraries are installed properly. (From OE-Core rev: 98a363ef0202511cf32f8408011c4ad178173af7) Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: H.J. Lu <hjl.tools@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp')
-rw-r--r--meta/recipes-bsp/libacpi/files/libacpi_fix_for_x32.patch47
-rw-r--r--meta/recipes-bsp/libacpi/libacpi_0.2.bb5
2 files changed, 50 insertions, 2 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
new file mode 100644
index 0000000..5f2d034
--- /dev/null
+++ b/meta/recipes-bsp/libacpi/files/libacpi_fix_for_x32.patch
@@ -0,0 +1,47 @@
1UpstreamStatus: Pending
2
3Fix libacpi for x32
4
5 libacpi doesn't use base_libdir for install. This patch adds
6 base_libdir support so that x32 libraries are installed properly.
7
8Patch Received from: H.J. Lu <hjl.tools@gmail.com>
9
10Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/05
11
12Index: libacpi-0.2/Makefile
13===================================================================
14--- libacpi-0.2.orig/Makefile
15+++ libacpi-0.2/Makefile
16@@ -8,6 +8,10 @@ SRC_test = test-libacpi.c libacpi.c list
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
29 @cp -f libacpi.h ${DESTDIR}${PREFIX}/include
30 @chmod 644 ${DESTDIR}${PREFIX}/include/libacpi.h
31- @echo installing library to ${DESTDIR}${PREFIX}/lib
32- @mkdir -p ${DESTDIR}${PREFIX}/lib
33- @cp -f libacpi.a ${DESTDIR}${PREFIX}/lib
34- @chmod 644 ${DESTDIR}${PREFIX}/lib/libacpi.a
35- @cp -f ${SONAME} ${DESTDIR}${PREFIX}/lib/
36- @chmod 644 ${DESTDIR}${PREFIX}/lib/${SONAME}
37- @ln -s ${SONAME} ${DESTDIR}${PREFIX}/lib/libacpi.so
38+ @echo installing library to ${DESTDIR}${PREFIX}${base_libdir}
39+ @mkdir -p ${DESTDIR}${PREFIX}${base_libdir}
40+ @cp -f libacpi.a ${DESTDIR}${PREFIX}${base_libdir}
41+ @chmod 644 ${DESTDIR}${PREFIX}${base_libdir}/libacpi.a
42+ @cp -f ${SONAME} ${DESTDIR}${PREFIX}${base_libdir}/
43+ @chmod 644 ${DESTDIR}${PREFIX}${base_libdir}/${SONAME}
44+ @ln -s ${SONAME} ${DESTDIR}${PREFIX}${base_libdir}/libacpi.so
45 @echo installing test-libacpi to ${DESTDIR}${PREFIX}/bin
46 @mkdir -p ${DESTDIR}${PREFIX}/bin
47 @cp -f test-libacpi ${DESTDIR}${PREFIX}/bin
diff --git a/meta/recipes-bsp/libacpi/libacpi_0.2.bb b/meta/recipes-bsp/libacpi/libacpi_0.2.bb
index 7c5095d..82fe8f8 100644
--- a/meta/recipes-bsp/libacpi/libacpi_0.2.bb
+++ b/meta/recipes-bsp/libacpi/libacpi_0.2.bb
@@ -5,10 +5,11 @@ SECTION = "base"
5HOMEPAGE = "http://www.ngolde.de/libacpi.html" 5HOMEPAGE = "http://www.ngolde.de/libacpi.html"
6LICENSE = "MIT" 6LICENSE = "MIT"
7LIC_FILES_CHKSUM = "file://LICENSE;md5=fec17f82f16630adf2dfb7d2a46f21c5" 7LIC_FILES_CHKSUM = "file://LICENSE;md5=fec17f82f16630adf2dfb7d2a46f21c5"
8PR = "r2" 8PR = "r3"
9 9
10SRC_URI = "http://www.ngolde.de/download/libacpi-${PV}.tar.gz \ 10SRC_URI = "http://www.ngolde.de/download/libacpi-${PV}.tar.gz \
11 file://makefile-fix.patch " 11 file://makefile-fix.patch \
12 file://libacpi_fix_for_x32.patch "
12 13
13SRC_URI[md5sum] = "05b53dd7bead66dda35fec502b91066c" 14SRC_URI[md5sum] = "05b53dd7bead66dda35fec502b91066c"
14SRC_URI[sha256sum] = "13086e31d428b9c125954d48ac497b754bbbce2ef34ea29ecd903e82e25bad29" 15SRC_URI[sha256sum] = "13086e31d428b9c125954d48ac497b754bbbce2ef34ea29ecd903e82e25bad29"