diff options
Diffstat (limited to 'patches/e2fsprogs-1.41.1/generic/e2fsprogs-1.41.1-libe2fsprogs-libs.diff')
| -rw-r--r-- | patches/e2fsprogs-1.41.1/generic/e2fsprogs-1.41.1-libe2fsprogs-libs.diff | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/patches/e2fsprogs-1.41.1/generic/e2fsprogs-1.41.1-libe2fsprogs-libs.diff b/patches/e2fsprogs-1.41.1/generic/e2fsprogs-1.41.1-libe2fsprogs-libs.diff new file mode 100644 index 000000000..51ca07e8b --- /dev/null +++ b/patches/e2fsprogs-1.41.1/generic/e2fsprogs-1.41.1-libe2fsprogs-libs.diff @@ -0,0 +1,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) |