summaryrefslogtreecommitdiffstats
path: root/patches/e2fsprogs-1.41.1/generic/e2fsprogs-1.41.1-libe2fsprogs-libs.diff
blob: 51ca07e8b7b481f3fe4fe90866139dc9171f3341 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
From: Robert Schwebel <r.schwebel@pengutronix.de>
Subject: e2fsprogs: link libcom_err with libext2fs

When compiling e2fsprogs, I get this error:

make[2]: Entering directory `/home/rsc/svn/oselas/bsp/pengutronix/OSELAS.BSP-Pengutronix-AllYes-trunk/platform-phyCORE-PXA270/build-target/e2fsprogs-1.41.1/misc'
        LD blkid
arm-iwmmx-linux-gnueabi-gcc -L/home/rsc/svn/oselas/bsp/pengutronix/OSELAS.BSP-Pengutronix-AllYes-trunk/platform-phyCORE-PXA270/sysroot-target/lib -L/home/rsc/svn/oselas/bsp/pengutronix/OSELAS.BSP-Pengutronix-AllYes-trunk/platform-phyCORE-PXA270/sysroot-target/usr/lib -Wl,-rpath-link -Wl,/home/rsc/svn/oselas/bsp/pengutronix/OSELAS.BSP-Pengutronix-AllYes-trunk/platform-phyCORE-PXA270/sysroot-target/usr/lib -o blkid blkid.o ../lib/libblkid.so ../lib/libuuid.so  ../lib/libext2fs.so  
/opt/OSELAS.Toolchain-1.1.1/arm-iwmmx-linux-gnueabi/gcc-4.1.2-glibc-2.5-kernel-2.6.18/bin/../lib/gcc/arm-iwmmx-linux-gnueabi/4.1.2/../../../../arm-iwmmx-linux-gnueabi/bin/ld: warning: libcom_err.so.2, needed by ../lib/libext2fs.so, not found (try using -rpath or -rpath-link)
../lib/libext2fs.so: undefined reference to `_et_list'
../lib/libext2fs.so: undefined reference to `com_err'

Looking at misc/Makefile.in suggests that, whenever LIBEXT2FS is used,
we also need to link in it's dependencies. Patch below.

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>

---
 misc/Makefile.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: e2fsprogs-1.41.1/misc/Makefile.in
===================================================================
--- e2fsprogs-1.41.1.orig/misc/Makefile.in
+++ e2fsprogs-1.41.1/misc/Makefile.in
@@ -61,8 +61,8 @@ DEPLIBS= $(LIBEXT2FS) $(LIBCOM_ERR) 
 STATIC_LIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) 
 STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) 
 
-LIBS_BLKID= $(LIBBLKID) $(LIBUUID) $(LIBEXT2FS) 
-DEPLIBS_BLKID= $(DEPLIBBLKID) $(DEPLIBUUID) $(LIBEXT2FS) 
+LIBS_BLKID= $(LIBBLKID) $(LIBUUID) $(LIBS) 
+DEPLIBS_BLKID= $(DEPLIBBLKID) $(DEPLIBUUID) $(LIBS) 
 
 LIBS_E2P= $(LIBE2P) $(LIBCOM_ERR) 
 DEPLIBS_E2P= $(LIBE2P) $(LIBCOM_ERR)