summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-02-15 15:56:33 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-15 16:28:46 +0000
commitb050c50f04968ab3311a06a602942fa24f2a93f3 (patch)
tree600ecf71ef6e5f010a1f04aae3c5be1d756b23ab /meta
parentd585a716d26c93f97fe0fbf91a32c0ccaf14ec2b (diff)
downloadpoky-b050c50f04968ab3311a06a602942fa24f2a93f3.tar.gz
apmd: fix build with static libraries disabled
apmd was using foo.o in Makefile dependencies but if libtool is being used then those are the statically linked intermediate files. When static libraries are globally disabled they won't be generated by libtool-cross so the build fails. Instead, use the libtool intermediate wrapper .lo files so the build succeeds. (From OE-Core rev: a3dbd98970683c410edee5e15e5fe72643953adf) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-bsp/apmd/apmd/linkage.patch53
-rw-r--r--meta/recipes-bsp/apmd/apmd_3.2.2-15.bb1
2 files changed, 54 insertions, 0 deletions
diff --git a/meta/recipes-bsp/apmd/apmd/linkage.patch b/meta/recipes-bsp/apmd/apmd/linkage.patch
new file mode 100644
index 0000000000..3d32c49cd2
--- /dev/null
+++ b/meta/recipes-bsp/apmd/apmd/linkage.patch
@@ -0,0 +1,53 @@
1When building use the libtool intermediate .lo files instead of explicitly using
2the .o files. Under libtool foo.lo is the libtool intermediate wrapper, foo.o is
3a static build, and .libs/foo.o is a shared build.
4
5If static libraries have been disabled globally then libtool won't generate them
6and explicit references to foo.o won't be satisfied.
7
8Upstream-Status: Pending
9Signed-off-by: Ross Burton <ross.burton@intel.com>
10
11diff --git a/Makefile b/Makefile
12index bb695c6..5f60146 100644
13--- a/Makefile
14+++ b/Makefile
15@@ -28,7 +28,7 @@ endif
16
17 .SUFFIXES:
18
19-OBJS=apmlib.o
20+OBJS=apmlib.lo
21 EXES=apm apmd xapm apmsleep
22 HEADERS=apm.h
23
24@@ -66,22 +66,22 @@ all: $(EXES)
25
26 $(OBJS): $(HEADERS)
27
28-%.o: %.c
29+%.lo: %.c
30 $(LT_COMPILE) -c $(CPPFLAGS) $(CFLAGS) $(XTRACFLAGS) $<
31
32-%: %.o $(LIBAPM)
33+%: %.lo $(LIBAPM)
34 $(LT_LINK) -o $@ $< $(LDFLAGS) $(LIBAPM)
35
36-xapm.o: xapm.c
37+xapm.lo: xapm.c
38 $(LT_COMPILE) -c $(CPPFLAGS) $(CFLAGS) $(XTRACFLAGS) -DNARROWPROTO $<
39
40-apmd: apmd.o
41+apmd: apmd.lo
42
43-apmsleep: apmsleep.o
44+apmsleep: apmsleep.lo
45
46-apmexists: apmexists.o
47+apmexists: apmexists.lo
48
49-xapm: xapm.o $(LIBAPM)
50+xapm: xapm.lo $(LIBAPM)
51 $(LT_LINK) -o $@ $< $(LDFLAGS) $(LIBAPM) $(XLDFLAGS) $(XLIBS)
52
53 $(LIBAPM): apmlib.lo
diff --git a/meta/recipes-bsp/apmd/apmd_3.2.2-15.bb b/meta/recipes-bsp/apmd/apmd_3.2.2-15.bb
index 917bb2cc83..4ff6ad087c 100644
--- a/meta/recipes-bsp/apmd/apmd_3.2.2-15.bb
+++ b/meta/recipes-bsp/apmd/apmd_3.2.2-15.bb
@@ -14,6 +14,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/a/apmd/apmd_3.2.2.orig.tar.gz;name=tarball \
14 file://libtool.patch \ 14 file://libtool.patch \
15 file://unlinux.patch \ 15 file://unlinux.patch \
16 file://wexitcode.patch \ 16 file://wexitcode.patch \
17 file://linkage.patch \
17 file://init \ 18 file://init \
18 file://default \ 19 file://default \
19 file://apmd_proxy \ 20 file://apmd_proxy \