gitolite/buildrootschalter
gitolite
/
buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libevent: Bump version and clean up makefile. 

Closes #565

- Bump version from 1.2 to 1.4.12
- Clean up makefile and use Makefile.autotools.in.

Signed-off-by: Will Newton <will.newton@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Will Newton 2009-08-11 16:35:23 +01:00 committed by Peter Korsgaard
parent e18fcb4811
commit a07032e117
3 changed files with 9 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -8,6 +8,7 @@
#487: Make kismet package sexier
#527: misc fixes for dnsmasq package
#565: libevent: Bump version and clean up makefile
#587: Use iptables multipurpose binaries and bump to 1.4.4
#617: netkit/inetd requires RPC and fails to build if RPC is disabled
#619: netkittelnet requires netkitbase to install, but there's no dependency

11
package/libevent/libevent-time_h.patch
View File

@ -1,11 +0,0 @@
diff -ur libevent-1.2/event.c libevent-1.2-patched/event.c
--- libevent-1.2/event.c 2006-08-12 12:41:36.000000000 -0500
+++ libevent-1.2-patched/event.c 2007-01-13 23:33:05.340351152 -0600
@@ -41,6 +41,7 @@
#else
#include <sys/_time.h>
#endif
+#include <time.h>
#include <sys/queue.h>
#include <stdio.h>
#include <stdlib.h>

71
package/libevent/libevent.mk
View File

@ -3,68 +3,13 @@
# libevent
#
#############################################################
LIBEVENT_VERSION:=1.2
LIBEVENT_SOURCE:=libevent-$(LIBEVENT_VERSION).tar.gz
LIBEVENT_SITE:=http://monkey.org/~provos/
LIBEVENT_DIR:=$(BUILD_DIR)/libevent-$(LIBEVENT_VERSION)
LIBEVENT_CAT:=$(ZCAT)
LIBEVENT_BINARY:=libevent.la
LIBEVENT_TARGET_BINARY:=usr/lib/libevent.so
LIBEVENT_VERSION = 1.4.12
LIBEVENT_SOURCE = libevent-$(LIBEVENT_VERSION)-stable.tar.gz
LIBEVENT_SITE = http://monkey.org/~provos/
$(DL_DIR)/$(LIBEVENT_SOURCE):
$(call DOWNLOAD,$(LIBEVENT_SITE),$(LIBEVENT_SOURCE))
LIBEVENT_AUTORECONF = NO
LIBEVENT_LIBTOOL_PATCH = NO
LIBEVENT_INSTALL_STAGING = YES
LIBEVENT_INSTALL_TARGET = YES
libevent-source: $(DL_DIR)/$(LIBEVENT_SOURCE)
libevent-unpacked: $(LIBEVENT_DIR)/.unpacked
$(LIBEVENT_DIR)/.unpacked: $(DL_DIR)/$(LIBEVENT_SOURCE)
$(LIBEVENT_CAT) $(DL_DIR)/$(LIBEVENT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(LIBEVENT_DIR) package/libevent/ \*.patch
touch $@
$(LIBEVENT_DIR)/.configured: $(LIBEVENT_DIR)/.unpacked
(cd $(LIBEVENT_DIR); rm -rf config.cache; \
$(TARGET_CONFIGURE_OPTS) \
$(TARGET_CONFIGURE_ARGS) \
./configure \
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
--prefix=/usr \
--mandir=/usr/share/man \
--disable-static \
--with-gnu-ld \
)
touch $@
$(LIBEVENT_DIR)/$(LIBEVENT_BINARY): $(LIBEVENT_DIR)/.configured
$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(LIBEVENT_DIR)
$(STAGING_DIR)/$(LIBEVENT_TARGET_BINARY): $(LIBEVENT_DIR)/$(LIBEVENT_BINARY)
$(MAKE) -C $(LIBEVENT_DIR) DESTDIR=$(STAGING_DIR) install
$(TARGET_DIR)/$(LIBEVENT_TARGET_BINARY): $(STAGING_DIR)/$(LIBEVENT_TARGET_BINARY)
$(MAKE) -C $(LIBEVENT_DIR) DESTDIR=$(TARGET_DIR) install
rm -f $(addprefix $(TARGET_DIR)/usr/,lib/libevent*.la \
include/ev*)
ifneq ($(BR2_HAVE_MANPAGES),y)
rm -fr $(TARGET_DIR)/usr/share/man
endif
libevent: $(TARGET_DIR)/$(LIBEVENT_TARGET_BINARY)
libevent-clean:
rm -f $(TARGET_DIR)/$(LIBEVENT_TARGET_BINARY)*
-$(MAKE) -C $(LIBEVENT_DIR) clean
libevent-dirclean:
rm -rf $(LIBEVENT_DIR)
#############################################################
#
# Toplevel Makefile options
#
#############################################################
ifeq ($(BR2_PACKAGE_LIBEVENT),y)
TARGETS+=libevent
endif
$(eval $(call AUTOTARGETS,package,libevent))