summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2011-01-11 07:43:49 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-01-20 21:37:04 +0000
commit2560d0e83f40fbd328c3f8d99e0c120ad10ff272 (patch)
tree577603d9ccb3608ed72d8aee7a53eefac6d34b9c
parent52691e7284a4a4c23cb6ecf981231d259c9b0b0d (diff)
downloadpoky-2560d0e83f40fbd328c3f8d99e0c120ad10ff272.tar.gz
blktrace: fix build issue with gcc dso linking change
All the libraries needs to be specified explicitely with the new gcc dso linking change patch. This was causing build errors for this recipe. Specifying the libXrender library explicitely for linking to work without errors. Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
-rw-r--r--meta/recipes-kernel/blktrace/blktrace/dso_linking_change_build_fix.patch26
-rw-r--r--meta/recipes-kernel/blktrace/blktrace_git.bb5
2 files changed, 29 insertions, 2 deletions
diff --git a/meta/recipes-kernel/blktrace/blktrace/dso_linking_change_build_fix.patch b/meta/recipes-kernel/blktrace/blktrace/dso_linking_change_build_fix.patch
new file mode 100644
index 0000000000..5b7433900d
--- /dev/null
+++ b/meta/recipes-kernel/blktrace/blktrace/dso_linking_change_build_fix.patch
@@ -0,0 +1,26 @@
1after gcc linking has changed, all the libraries must be explicitely specified
2This patch avoids this linking error:
3
4| make[1]: Entering directory `/disk0/pokybuild/build1/tmp/work/i586-poky-linux/blktrace-1.0.1+git0+1e09f6e9012826fca69fa07222b7bc53c3e629ee-r1/git/btreplay'^M
5| ccache i586-poky-linux-gcc -march=i586 --sysroot=/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux -fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 -ggdb -feliminate-unused-debug-types -I. -I.. -I../btt -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -UCOUNT_IOS -UDEBUG -DNDEBUG -o btreplay btreplay.o -laio -lrt^M
6| /disk0/pokybuild/build1/tmp/sysroots/x86_64-linux/usr/libexec/i586-poky-linux/gcc/i586-poky-linux/4.5.1/ld: >: invalid DSO for symbol `pthread_join@@GLIBC_2.0' definition^M
7| /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/lib/libpthread.so.0: could not read symbols: Bad value^M
8| collect2: ld returned 1 exit status^M
9| make[1]: *** [btreplay] Error 1
10
11Nitin A Kamble <nitin.a.kamble@intel.com>
12Date: 2011/01/11
13
14Index: git/btreplay/Makefile
15===================================================================
16--- git.orig/btreplay/Makefile
17+++ git/btreplay/Makefile
18@@ -11,7 +11,7 @@ XCFLAGS = -D_GNU_SOURCE -D_LARGEFILE_SOU
19 override CFLAGS += $(INCS) $(XCFLAGS) $(OCFLAGS)
20
21 PROGS = btrecord btreplay
22-LIBS = -laio -lrt
23+LIBS = -laio -lrt -lpthread
24
25 all: depend $(PROGS)
26
diff --git a/meta/recipes-kernel/blktrace/blktrace_git.bb b/meta/recipes-kernel/blktrace/blktrace_git.bb
index 85e4a4b3ce..7cd8127e8a 100644
--- a/meta/recipes-kernel/blktrace/blktrace_git.bb
+++ b/meta/recipes-kernel/blktrace/blktrace_git.bb
@@ -4,11 +4,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
4 4
5DEPENDS = "libaio" 5DEPENDS = "libaio"
6 6
7PR = r1 7PR = r2
8PV = "1.0.1+git${SRCPV}" 8PV = "1.0.1+git${SRCPV}"
9 9
10SRC_URI = "git://git.kernel.dk/blktrace.git;protocol=git \ 10SRC_URI = "git://git.kernel.dk/blktrace.git;protocol=git \
11 file://blktrace-makefile.patch" 11 file://blktrace-makefile.patch \
12 file://dso_linking_change_build_fix.patch"
12 13
13SRC_URI[md5sum] = "588aa9ab8a14d1766ab3f061d728ed89" 14SRC_URI[md5sum] = "588aa9ab8a14d1766ab3f061d728ed89"
14SRC_URI[sha256sum] = "f3cb6a3df1b3dc67369c7c4da3444a7897aa8a18e55937b368e0a6aa2f64b3aa" 15SRC_URI[sha256sum] = "f3cb6a3df1b3dc67369c7c4da3444a7897aa8a18e55937b368e0a6aa2f64b3aa"