2 files changed, 16 insertions, 6 deletions
diff --git a/package/libelf/Makefile b/package/libelf/Makefile
index a5847bc87..c8ae86b32 100644
--- a/package/libelf/Makefile
+++ b/package/libelf/Makefile
@@ -2,18 +2,17 @@
 # material, please see the LICENCE file in the top-level directory.
 
 include ${TOPDIR}/rules.mk
+include ${TOPDIR}/toolchain/libelf/Makefile.inc
 
-PKG_NAME:=		libelf
-PKG_VERSION:=		0.8.11
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		e931910b6d100f6caa32239849947fbf
 PKG_DESCR:=		elf library
 PKG_SECTION:=		libs
 PKG_SITES:=		http://www.mr511.de/software/
 
+PKG_SUBPKGS:=		LIBELF
+
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBELF,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBELF,libelf,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_ENV+=		mr_cv_target_elf=yes \
 			ac_cv_sizeof_long_long=8
@@ -21,7 +20,7 @@ CONFIGURE_ARGS+=	--enable-elf64=yes \
 			--disable-sanity-checks
 FAKE_FLAGS+=		instroot="${WRKINST}"
 
-post-install:
+libelf-install:
 	${INSTALL_DIR} ${IDIR_LIBELF}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libelf.so* ${IDIR_LIBELF}/usr/lib/
 
diff --git a/package/libelf/patches/patch-lib_Makefile_in b/package/libelf/patches/patch-lib_Makefile_in
new file mode 100644
index 000000000..7630c7f5c
--- /dev/null
+++ b/package/libelf/patches/patch-lib_Makefile_in
@@ -0,0 +1,11 @@
+--- libelf-0.8.13.orig/lib/Makefile.in	2009-11-01 14:04:19.000000000 +0100
++++ libelf-0.8.13/lib/Makefile.in	2011-01-15 21:55:08.000000000 +0100
+@@ -158,7 +158,7 @@ libelf.a: $(OBJS) $(LIBOBJS)
+ 
+ $(SHLIB): libelf.a
+ 	@$(RM) $(SHLIB)
+-	$(LINK_SHLIB) -o $(SHLIB) $(OBJS:.o=.os) $(LIBOBJS:.o=.os) $(DEPSHLIBS)
++	$(LINK_SHLIB) $(LDFLAGS) -o $(SHLIB) $(OBJS:.o=.os) $(LIBOBJS:.o=.os) $(DEPSHLIBS)
+ 	if test "$(SONAME)" = "$(SHLIB)"; then true; else \
+ 	  $(RM) $(SONAME) && $(LN_S) $(SHLIB) $(SONAME); \
+ 	fi