summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlf Samuelsson <ulf.samuelsson@atmel.com>2007-09-20 15:35:26 +0000
committerUlf Samuelsson <ulf.samuelsson@atmel.com>2007-09-20 15:35:26 +0000
commit9c017d76a4bf20cf89f4b454f45a34b851e03ecd (patch)
tree3bcc4bf1700496a36deb5d4144c83b83a295e61a
parent5dfe2080ac0c47a66d5d48bdec1680bff132408f (diff)
Make sure libdaemon finds AC_PROG_LIBTOOL
-rw-r--r--package/libdaemon/libdaemon-0.10.patch.bz2bin406128 -> 0 bytes
-rw-r--r--package/libdaemon/libdaemon.mk10
2 files changed, 2 insertions, 8 deletions
diff --git a/package/libdaemon/libdaemon-0.10.patch.bz2 b/package/libdaemon/libdaemon-0.10.patch.bz2
deleted file mode 100644
index ee3d80702..000000000
--- a/package/libdaemon/libdaemon-0.10.patch.bz2
+++ /dev/null
Binary files differ
diff --git a/package/libdaemon/libdaemon.mk b/package/libdaemon/libdaemon.mk
index 15ca9368e..0ec61ae74 100644
--- a/package/libdaemon/libdaemon.mk
+++ b/package/libdaemon/libdaemon.mk
@@ -26,17 +26,11 @@ libdaemon-source: $(DL_DIR)/$(LIBDAEMON_SOURCE)
$(LIBDAEMON_DIR)/.unpacked: $(DL_DIR)/$(LIBDAEMON_SOURCE)
$(LIBDAEMON_CAT) $(DL_DIR)/$(LIBDAEMON_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(LIBDAEMON_DIR) package/libdaemon/ \*.patch
-# Ulf, what was this supposed to fix? Your patch is broken
-# (hardcoded for /home/ulf/..)
-# mkdir -p $(PROJECT_BUILD_DIR)/patches
-# $(BZCAT) package/libdaemon/$(LIBDAEMON_NAME).patch.bz2 \
-# > $(PROJECT_BUILD_DIR)/patches/$(LIBDAEMON_NAME).patch
-# toolchain/patch-kernel.sh $(LIBDAEMON_DIR) $(PROJECT_BUILD_DIR)/patches/ $(LIBDAEMON_NAME)\*.patch
-# $(CONFIG_UPDATE) $(LIBDAEMON_DIR)
+ $(CONFIG_UPDATE) $(LIBDAEMON_DIR)
touch $@
$(LIBDAEMON_DIR)/.configured: $(LIBDAEMON_DIR)/.unpacked
- (cd $(LIBDAEMON_DIR) && rm -rf config.cache && autoconf)
+ (cd $(LIBDAEMON_DIR) && rm -rf config.cache && autoreconf)
(cd $(LIBDAEMON_DIR) && \
$(TARGET_CONFIGURE_OPTS) \
$(TARGET_CONFIGURE_ARGS) \