* [PATCH 1/3] libevent2: Update to 2.0.22-stable
@ 2015-07-07 10:53 Erik Kapfer
2015-07-07 10:53 ` [PATCH 2/3] libevent2: Move from package to core system Erik Kapfer
2015-07-07 10:53 ` [PATCH 3/3] Remove all dependencies to libevent2 Erik Kapfer
0 siblings, 2 replies; 3+ messages in thread
From: Erik Kapfer @ 2015-07-07 10:53 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 1918 bytes --]
Signed-off-by: Erik Kapfer <erik.kapfer(a)ipfire.org>
---
lfs/libevent2 | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/lfs/libevent2 b/lfs/libevent2
index e2ad69f..53e9494 100644
--- a/lfs/libevent2
+++ b/lfs/libevent2
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2014 IPFire Team <info(a)ipfire.de> #
+# Copyright (C) 2007-2015 IPFire Team <info(a)ipfire.de> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
-VER = 2.0.21-stable
+VER = 2.0.22-stable
THISAPP = libevent-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -33,7 +33,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = libevent2
-PAK_VER = 2
+PAK_VER = 3
DEPS = ""
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = b2405cc9ebf264aa47ff615d9de527a2
+$(DL_FILE)_MD5 = c4c56f986aa985677ca1db89630a2e11
install : $(TARGET)
@@ -77,8 +77,12 @@ dist:
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && ./configure --prefix=/usr
+ cd $(DIR_APP) && ./configure \
+ --prefix=/usr \
+ --disable-static
+
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
--
2.4.4
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 2/3] libevent2: Move from package to core system
2015-07-07 10:53 [PATCH 1/3] libevent2: Update to 2.0.22-stable Erik Kapfer
@ 2015-07-07 10:53 ` Erik Kapfer
2015-07-07 10:53 ` [PATCH 3/3] Remove all dependencies to libevent2 Erik Kapfer
1 sibling, 0 replies; 3+ messages in thread
From: Erik Kapfer @ 2015-07-07 10:53 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 4892 bytes --]
The library is used by many other components and
it makes more sense to integrate it into the core
system like libevent.
Signed-off-by: Erik Kapfer <erik.kapfer(a)ipfire.org>
---
config/rootfiles/common/libevent2 | 45 +++++++++++++++++++++++++++++++++++++
config/rootfiles/packages/libevent2 | 45 -------------------------------------
lfs/libevent2 | 7 ------
3 files changed, 45 insertions(+), 52 deletions(-)
create mode 100644 config/rootfiles/common/libevent2
delete mode 100644 config/rootfiles/packages/libevent2
diff --git a/config/rootfiles/common/libevent2 b/config/rootfiles/common/libevent2
new file mode 100644
index 0000000..5beb5f8
--- /dev/null
+++ b/config/rootfiles/common/libevent2
@@ -0,0 +1,45 @@
+#usr/include/event2
+#usr/include/event2/buffer.h
+#usr/include/event2/buffer_compat.h
+#usr/include/event2/bufferevent.h
+#usr/include/event2/bufferevent_compat.h
+#usr/include/event2/bufferevent_ssl.h
+#usr/include/event2/bufferevent_struct.h
+#usr/include/event2/dns.h
+#usr/include/event2/dns_compat.h
+#usr/include/event2/dns_struct.h
+#usr/include/event2/event-config.h
+#usr/include/event2/event.h
+#usr/include/event2/event_compat.h
+#usr/include/event2/event_struct.h
+#usr/include/event2/http.h
+#usr/include/event2/http_compat.h
+#usr/include/event2/http_struct.h
+#usr/include/event2/keyvalq_struct.h
+#usr/include/event2/listener.h
+#usr/include/event2/rpc.h
+#usr/include/event2/rpc_compat.h
+#usr/include/event2/rpc_struct.h
+#usr/include/event2/tag.h
+#usr/include/event2/tag_compat.h
+#usr/include/event2/thread.h
+#usr/include/event2/util.h
+usr/lib/libevent-2.0.so.5
+usr/lib/libevent-2.0.so.5.1.9
+usr/lib/libevent_core-2.0.so.5
+usr/lib/libevent_core-2.0.so.5.1.9
+usr/lib/libevent_extra-2.0.so.5
+usr/lib/libevent_extra-2.0.so.5.1.9
+usr/lib/libevent_openssl-2.0.so.5
+usr/lib/libevent_openssl-2.0.so.5.1.9
+#usr/lib/libevent_openssl.a
+#usr/lib/libevent_openssl.la
+#usr/lib/libevent_openssl.so
+usr/lib/libevent_pthreads-2.0.so.5
+usr/lib/libevent_pthreads-2.0.so.5.1.9
+#usr/lib/libevent_pthreads.a
+#usr/lib/libevent_pthreads.la
+#usr/lib/libevent_pthreads.so
+#usr/lib/pkgconfig/libevent.pc
+#usr/lib/pkgconfig/libevent_openssl.pc
+#usr/lib/pkgconfig/libevent_pthreads.pc
diff --git a/config/rootfiles/packages/libevent2 b/config/rootfiles/packages/libevent2
deleted file mode 100644
index 5beb5f8..0000000
--- a/config/rootfiles/packages/libevent2
+++ /dev/null
@@ -1,45 +0,0 @@
-#usr/include/event2
-#usr/include/event2/buffer.h
-#usr/include/event2/buffer_compat.h
-#usr/include/event2/bufferevent.h
-#usr/include/event2/bufferevent_compat.h
-#usr/include/event2/bufferevent_ssl.h
-#usr/include/event2/bufferevent_struct.h
-#usr/include/event2/dns.h
-#usr/include/event2/dns_compat.h
-#usr/include/event2/dns_struct.h
-#usr/include/event2/event-config.h
-#usr/include/event2/event.h
-#usr/include/event2/event_compat.h
-#usr/include/event2/event_struct.h
-#usr/include/event2/http.h
-#usr/include/event2/http_compat.h
-#usr/include/event2/http_struct.h
-#usr/include/event2/keyvalq_struct.h
-#usr/include/event2/listener.h
-#usr/include/event2/rpc.h
-#usr/include/event2/rpc_compat.h
-#usr/include/event2/rpc_struct.h
-#usr/include/event2/tag.h
-#usr/include/event2/tag_compat.h
-#usr/include/event2/thread.h
-#usr/include/event2/util.h
-usr/lib/libevent-2.0.so.5
-usr/lib/libevent-2.0.so.5.1.9
-usr/lib/libevent_core-2.0.so.5
-usr/lib/libevent_core-2.0.so.5.1.9
-usr/lib/libevent_extra-2.0.so.5
-usr/lib/libevent_extra-2.0.so.5.1.9
-usr/lib/libevent_openssl-2.0.so.5
-usr/lib/libevent_openssl-2.0.so.5.1.9
-#usr/lib/libevent_openssl.a
-#usr/lib/libevent_openssl.la
-#usr/lib/libevent_openssl.so
-usr/lib/libevent_pthreads-2.0.so.5
-usr/lib/libevent_pthreads-2.0.so.5.1.9
-#usr/lib/libevent_pthreads.a
-#usr/lib/libevent_pthreads.la
-#usr/lib/libevent_pthreads.so
-#usr/lib/pkgconfig/libevent.pc
-#usr/lib/pkgconfig/libevent_openssl.pc
-#usr/lib/pkgconfig/libevent_pthreads.pc
diff --git a/lfs/libevent2 b/lfs/libevent2
index 53e9494..2482dda 100644
--- a/lfs/libevent2
+++ b/lfs/libevent2
@@ -32,11 +32,6 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
-PROG = libevent2
-PAK_VER = 3
-
-DEPS = ""
-
###############################################################################
# Top-level Rules
###############################################################################
@@ -68,8 +63,6 @@ $(patsubst %,$(DIR_DL)/%,$(objects)) :
$(subst %,%_MD5,$(objects)) :
@$(MD5)
-dist:
- @$(PAK)
###############################################################################
# Installation Details
###############################################################################
--
2.4.4
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 3/3] Remove all dependencies to libevent2
2015-07-07 10:53 [PATCH 1/3] libevent2: Update to 2.0.22-stable Erik Kapfer
2015-07-07 10:53 ` [PATCH 2/3] libevent2: Move from package to core system Erik Kapfer
@ 2015-07-07 10:53 ` Erik Kapfer
1 sibling, 0 replies; 3+ messages in thread
From: Erik Kapfer @ 2015-07-07 10:53 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 1539 bytes --]
libevent2 has become a part of the core system and is
not a package any more.
Signed-off-by: Erik Kapfer <erik.kapfer(a)ipfire.org>
---
lfs/tmux | 4 ++--
lfs/tor | 4 ++--
lfs/transmission | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lfs/tmux b/lfs/tmux
index ddd5384..2223d13 100644
--- a/lfs/tmux
+++ b/lfs/tmux
@@ -32,9 +32,9 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = tmux
-PAK_VER = 2
+PAK_VER = 3
-DEPS = "libevent2"
+DEPS = ""
###############################################################################
# Top-level Rules
diff --git a/lfs/tor b/lfs/tor
index 8eca48d..d57cea5 100644
--- a/lfs/tor
+++ b/lfs/tor
@@ -32,9 +32,9 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = tor
-PAK_VER = 11
+PAK_VER = 12
-DEPS = "libevent2"
+DEPS = ""
###############################################################################
# Top-level Rules
diff --git a/lfs/transmission b/lfs/transmission
index 3a1cbdd..13b5723 100644
--- a/lfs/transmission
+++ b/lfs/transmission
@@ -32,9 +32,9 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = transmission
-PAK_VER = 11
+PAK_VER = 12
-DEPS = "libevent2"
+DEPS = ""
CXXFLAGS += -fno-exceptions
--
2.4.4
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-07-07 10:53 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-07-07 10:53 [PATCH 1/3] libevent2: Update to 2.0.22-stable Erik Kapfer
2015-07-07 10:53 ` [PATCH 2/3] libevent2: Move from package to core system Erik Kapfer
2015-07-07 10:53 ` [PATCH 3/3] Remove all dependencies to libevent2 Erik Kapfer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox