summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2005-04-12 22:04:14 +0000
committerEric Andersen <andersen@codepoet.org>2005-04-12 22:04:14 +0000
commit2badd4b3e50546c3d745b8fbbd9f71598f5fc369 (patch)
treea9ae3a22fd9e80c813698634e839837c006f0ba9
parent9fc890fc1faf265c473c5aa26522aaa1d3bc77fd (diff)
Fix up the build of libelf so it actually works
-rw-r--r--package/libelf/libelf.mk18
-rw-r--r--package/libelf/libelf.patch11
2 files changed, 23 insertions, 6 deletions
diff --git a/package/libelf/libelf.mk b/package/libelf/libelf.mk
index 0ee40f570..3fa315120 100644
--- a/package/libelf/libelf.mk
+++ b/package/libelf/libelf.mk
@@ -5,7 +5,7 @@
#############################################################
LIBELF_VER=0.8.5
LIBELF_SOURCE=libelf-$(LIBELF_VER).tar.gz
-LIBELF_SITE=http://www.stud.uni-hannover.de/~michael/software/
+LIBELF_SITE=http://www.mr511.de/software/
LIBELF_DIR=$(BUILD_DIR)/libelf-$(LIBELF_VER)
LIBELF_ARCH:=$(ARCH)
@@ -18,6 +18,7 @@ $(DL_DIR)/$(LIBELF_SOURCE):
$(LIBELF_DIR)/.source: $(DL_DIR)/$(LIBELF_SOURCE)
zcat $(DL_DIR)/$(LIBELF_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ toolchain/patch-kernel.sh $(LIBELF_DIR) package/libelf libelf\*.patch
touch $(LIBELF_DIR)/.source
$(LIBELF_DIR)/.configured: $(LIBELF_DIR)/.source
@@ -29,16 +30,21 @@ $(LIBELF_DIR)/.configured: $(LIBELF_DIR)/.source
--build=$(GNU_HOST_NAME) \
--prefix=/usr \
--sysconfdir=/etc \
+ $(DISABLE_NLS) \
+ --enable-shared \
);
touch $(LIBELF_DIR)/.configured;
$(LIBELF_DIR)/libelf.so.$(LIBELF_VER): $(LIBELF_DIR)/.configured
- $(MAKE) CC=$(TARGET_CC) LD=$(TARGET_CROSS)ld ARCH=$(LIBELF_ARCH) \
- -C $(LIBELF_DIR)
+ $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(LIBELF_DIR)
-$(TARGET_DIR)/usr/lib/libelf.so.$(LIBELF_VER): $(LIBELF_DIR)/libelf.so.$(LIBELF_VER)
- $(INSTALL) -d -m 0644 $(LIBELF_DIR)/libelf.so.$(LIBELF_VER) $(TARGET_DIR)/usr/lib/
- $(INSTALL) -d -m 0644 $(LIBELF_DIR)/libelf.so $(TARGET_DIR)/usr/lib/
+$(STAGING_DIR)/usr/lib/libelf.a: $(LIBELF_DIR)/libelf.so.$(LIBELF_VER)
+ $(MAKE1) $(TARGET_CONFIGURE_OPTS) ${INSTALL}="install -D" \
+ instroot=$(STAGING_DIR) -C $(LIBELF_DIR) install
+
+$(TARGET_DIR)/usr/lib/libelf.so.$(LIBELF_VER): $(STAGING_DIR)/usr/lib/libelf.a
+ $(INSTALL) -m 0644 $(STAGING_DIR)/usr/lib/libelf.so.$(LIBELF_VER) $(TARGET_DIR)/usr/lib/
+ $(INSTALL) -m 0644 $(STAGING_DIR)/usr/lib/libelf.so.0 $(TARGET_DIR)/usr/lib/
libelf: uclibc $(TARGET_DIR)/usr/lib/libelf.so.$(LIBELF_VER)
diff --git a/package/libelf/libelf.patch b/package/libelf/libelf.patch
new file mode 100644
index 000000000..81494aac4
--- /dev/null
+++ b/package/libelf/libelf.patch
@@ -0,0 +1,11 @@
+--- libelf-0.8.5/aclocal.m4.orig 2003-12-05 08:36:00.000000000 -0700
++++ libelf-0.8.5/aclocal.m4 2005-04-12 16:01:16.000000000 -0600
+@@ -191,7 +191,7 @@
+ }>>, changequote([, ])dnl
+ mr_cv_target_elf=yes,
+ mr_cv_target_elf=no,
+- mr_cv_target_elf=no)])])
++ mr_cv_target_elf=yes)])])
+
+ AC_DEFUN(mr_ENABLE_SHARED, [
+ AC_PROVIDE([$0])