libevent: Use github call & fix patch

PATCH Superseded Maxime Hadjinlian 3 participants 7 messages Oct 12, 2014 – Oct 19, 2014

lore

Share & tools

lore

Maxime Hadjinlian

author

2014-10-12 17:32 UTC #0 lore raw

PATCH v2 1/1 libevent: Use github call & fix patch

We want to uses the github helper since we download a generated tarball from the tag anyway.

We also need to uses AUTORECONF as theses releases don't contains 'configure' and such.

The patchs that was already present is updated to apply against Makefile.am instead of Makefile.in

The seconds patchs is backported from upstream to remove the usage of $(top_src_dirs) which makes current autotools error.

Signed-off-by Maxime Hadjinlian <[email protected]>

---
v1 -> v2:
- Fix the added patches so they have correct SoB (Thomas Petazzoni)
- Add SoB (Thomas Petazzoni)
- Add comment for autoreconf (Yann E. Morin)

---
 .../0001-Disable-building-test-programs.patch      | 30 +++++++++
 .../0002-Avoid-using-top_srcdir-in-TESTS.patch     | 71 ++++++++++++++++++++++
 .../libevent-disable-building-test-programs.patch  | 30 ---------
 package/libevent/libevent.mk                       |  5 +-
 4 files changed, 104 insertions(+), 32 deletions(-)
 create mode 100644 package/libevent/0001-Disable-building-test-programs.patch
 create mode 100644 package/libevent/0002-Avoid-using-top_srcdir-in-TESTS.patch
 delete mode 100644 package/libevent/libevent-disable-building-test-programs.patch

package/libevent/0001-Disable-building-test-programs.patch new file +30 -0

new file mode 100644
index 0000000..eb1acfd
@@ -0,0 +1,30 @@
+From 4b5a135fa681e85eb6988a379f59f3c7a41cc48c Mon Sep 17 00:00:00 2001
+From: Gilles Talis <[email protected]>
+Date: Fri, 21 Jun 2013 15:25:11 -0700
+Subject: [PATCH 1/2] Disable building test programs
+
+We are not really interested in building test programs.
+Moreover, these programs use fork() function that is
+not available on MMU-less architectures.
+
+Signed-off-by: Gilles Talis <[email protected]>
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 42879a3..dc90359 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -126,7 +126,7 @@ else
+ noinst_LTLIBRARIES =  $(LIBEVENT_LIBS_LA)
+ endif
+ 
+-SUBDIRS = . include sample test
++SUBDIRS = . include sample
+ 
+ if BUILD_WIN32
+ 
+-- 
+2.1.1
+

package/libevent/0002-Avoid-using-top_srcdir-in-TESTS.patch new file +71 -0

71 lines not on this page · raw message

package/libevent/libevent-disable-building-test-programs.patch deleted +0 ~~-30~~

deleted file mode 100644
index 4b0f0d9..0000000
@@ -1,30 +0,0 @@
-From e932c8864e1bb8b6a7901d4b049a1100c4becba5 Mon Sep 17 00:00:00 2001
-From: Gilles Talis <[email protected]>
-Date: Fri, 21 Jun 2013 15:25:11 -0700
-Subject: [PATCH] Disable building test programs
-
-We are not really interested in building test programs.
-Moreover, these programs use fork() function that is
-not available on MMU-less architectures.
-
-Signed-off-by: Gilles Talis <[email protected]>
----
- Makefile.in |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 2ebefa2..4fba1ff 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -487,7 +487,7 @@ LIBEVENT_LIBS_LA = libevent.la libevent_core.la libevent_extra.la \
- @INSTALL_LIBEVENT_TRUE at lib_LTLIBRARIES = $(LIBEVENT_LIBS_LA)
- @INSTALL_LIBEVENT_TRUE at pkgconfig_DATA = $(LIBEVENT_PKGCONFIG)
- @INSTALL_LIBEVENT_FALSE at noinst_LTLIBRARIES = $(LIBEVENT_LIBS_LA)
--SUBDIRS = . include sample test
-+SUBDIRS = . include sample
- @BUILD_WIN32_FALSE at SYS_LIBS = 
- @BUILD_WIN32_TRUE at SYS_LIBS = -lws2_32 -lshell32 -ladvapi32
- @BUILD_WIN32_FALSE at SYS_SRC = $(am__append_5) $(am__append_6) \
--- 
-1.7.4.1
-

package/libevent/libevent.mk +3 -2

index 73be502..8d325da 100644
@@ -5,11 +5,12 @@
 ################################################################################
 
 LIBEVENT_VERSION = 2.0.21
-LIBEVENT_SOURCE = libevent-$(LIBEVENT_VERSION)-stable.tar.gz
-LIBEVENT_SITE = https://github.com/downloads/libevent/libevent
+LIBEVENT_SITE = $(call github,libevent,libevent,release-$(LIBEVENT_VERSION)-stable)
 LIBEVENT_INSTALL_STAGING = YES
 LIBEVENT_LICENSE = BSD-3c, OpenBSD
 LIBEVENT_LICENSE_FILES = LICENSE
+# Straight from the repository, need to generate autotools files
+LIBEVENT_AUTORECONF = YES
 
 define LIBEVENT_REMOVE_PYSCRIPT
 	rm $(TARGET_DIR)/usr/bin/event_rpcgen.py

Signature · 1 line

2.1.1

Yann E. MORIN

2014-10-19 08:50 UTC #1 lore raw

PATCH v2 1/1 libevent: Use github call & fix patch

Maxime, All,

On 2014-10-12 19:32 +0200, Maxime Hadjinlian spake thusly:

Quoted 1 line

We want to uses the github helper since we download a generated tarball

... to use ...

Quoted 3 lines

from the tag anyway.
We also need to uses AUTORECONF as theses releases don't contains

... to use ... those releases ... do not contain ...

Quoted 3 lines

'configure' and such.
The patchs that was already present is updated to apply against

The patch ...

Quoted 3 lines

Makefile.am instead of Makefile.in
The seconds patchs is backported from upstream to remove the usage of

The second patch ... the use of ...

Quoted 1 line

$(top_src_dirs) which makes current autotools error.

... error out.

Quoted 1 line

Signed-off-by Maxime Hadjinlian <[email protected]>

[--SNIP--]

package/libevent/libevent.mk line 8

Quoted 11 lines

package/libevent/libevent.mk +1 -2

index 73be502..8d325da 100644
@@ -5,11 +5,12 @@
 ################################################################################
 
 LIBEVENT_VERSION = 2.0.21
-LIBEVENT_SOURCE = libevent-$(LIBEVENT_VERSION)-stable.tar.gz
-LIBEVENT_SITE = https://github.com/downloads/libevent/libevent
+LIBEVENT_SITE = $(call github,libevent,libevent,release-$(LIBEVENT_VERSION)-stable)

This should be:

LIBEVENT_VERSION = release-2.0.21-stable
LIBEVENT_SITE = $(call github,libevent,libevent,$(LIBEVENT_VERSION))

I think we already talked about this in the past few days (for another such change), where we said that the version should be the tag used by upstream.

Regards,
Yann E. MORIN.

Quoted 15 lines

package/libevent/libevent.mk +2 -0

 LIBEVENT_INSTALL_STAGING = YES
 LIBEVENT_LICENSE = BSD-3c, OpenBSD
 LIBEVENT_LICENSE_FILES = LICENSE
+# Straight from the repository, need to generate autotools files
+LIBEVENT_AUTORECONF = YES
 
 define LIBEVENT_REMOVE_PYSCRIPT
 	rm $(TARGET_DIR)/usr/bin/event_rpcgen.py

Signature · 6 lines

2.1.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Signature · 6 lines

.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

Arnout Vandecappelle

2014-10-19 20:43 UTC #2 lore raw

PATCH v2 1/1 libevent: Use github call & fix patch

Quoted 3 lines · Yann E. MORIN

Maxime, All,
On 2014-10-12 19:32 +0200, Maxime Hadjinlian spake thusly:

[snip]

Quoted 7 lines

package/libevent/libevent.mk line 8
Quoted 4 lines
LIBEVENT_VERSION = 2.0.21
package/libevent/libevent.mk +1 -2
-LIBEVENT_SOURCE = libevent-$(LIBEVENT_VERSION)-stable.tar.gz
-LIBEVENT_SITE = https://github.com/downloads/libevent/libevent
+LIBEVENT_SITE = $(call github,libevent,libevent,release-$(LIBEVENT_VERSION)-stable)
This should be:

Quoted 6 lines

LIBEVENT_VERSION = release-2.0.21-stable
LIBEVENT_SITE = $(call github,libevent,libevent,$(LIBEVENT_VERSION))
I think we already talked about this in the past few days (for another such change), where we said that the version should be the tag used by upstream.

Perhaps we should remove the third argument of the github helper and instead
use $($(PKG)_VERSION) instead, to avoid this kind of confusion...

Regards,
Arnout

Signature · 6 lines

Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F

Maxime Hadjinlian

author

2014-10-19 20:47 UTC #3 lore raw

PATCH v2 1/1 libevent: Use github call & fix patch

Hi Arnout, all,

Quoted 15 lines · Arnout Vandecappelle

Quoted 3 lines · Yann E. MORIN
Maxime, All,
On 2014-10-12 19:32 +0200, Maxime Hadjinlian spake thusly:
[snip]
Quoted 10 lines
package/libevent/libevent.mk line 8
Quoted 4 lines
LIBEVENT_VERSION = 2.0.21
package/libevent/libevent.mk +1 -2
-LIBEVENT_SOURCE = libevent-$(LIBEVENT_VERSION)-stable.tar.gz
-LIBEVENT_SITE = https://github.com/downloads/libevent/libevent
+LIBEVENT_SITE = $(call github,libevent,libevent,release-$(LIBEVENT_VERSION)-stable)
This should be:
LIBEVENT_VERSION = release-2.0.21-stable
LIBEVENT_SITE = $(call github,libevent,libevent,$(LIBEVENT_VERSION))

Quoted 7 lines

Quoted 3 lines
I think we already talked about this in the past few days (for another such change), where we said that the version should be the tag used by upstream.
Perhaps we should remove the third argument of the github helper and instead
use $($(PKG)_VERSION) instead, to avoid this kind of confusion...

Yann and I are currently working on changing the github helper to take this into account :)
Also providing another options to the helper to also support the releases URL scheme.

Quoted 12 lines

Regards,
Arnout

Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F

Arnout Vandecappelle

2014-10-19 20:48 UTC #4 lore raw

PATCH v2 1/1 libevent: Use github call & fix patch

In reply to Maxime Hadjinlian

Quoted 18 lines · Maxime Hadjinlian

We want to uses the github helper since we download a generated tarball from the tag anyway.
We also need to uses AUTORECONF as theses releases don't contains 'configure' and such.
The patchs that was already present is updated to apply against Makefile.am instead of Makefile.in
The seconds patchs is backported from upstream to remove the usage of $(top_src_dirs) which makes current autotools error.
Signed-off-by Maxime Hadjinlian <[email protected]>
---
v1 -> v2:
- Fix the added patches so they have correct SoB (Thomas Petazzoni)
- Add SoB (Thomas Petazzoni)
- Add comment for autoreconf (Yann E. Morin)

[snip]

package/libevent/libevent.mk line 8

Quoted 4 lines

LIBEVENT_VERSION = 2.0.21

package/libevent/libevent.mk +1 -2

-LIBEVENT_SOURCE = libevent-$(LIBEVENT_VERSION)-stable.tar.gz
-LIBEVENT_SITE = https://github.com/downloads/libevent/libevent
+LIBEVENT_SITE = $(call github,libevent,libevent,release-$(LIBEVENT_VERSION)-stable)

Like the addition to the manual that you created a few days ago points out:
this is wrong, because you're replacing a release tarball with a git tag...

package/libevent/libevent.mk line 13

Quoted 5 lines

LIBEVENT_INSTALL_STAGING = YES
LIBEVENT_LICENSE = BSD-3c, OpenBSD
LIBEVENT_LICENSE_FILES = LICENSE
package/libevent/libevent.mk +2 -0
+# Straight from the repository, need to generate autotools files
+LIBEVENT_AUTORECONF = YES

... which would also make this redundant. And probably the patch changes as well. So perhaps this one should be rejected.

Regards,
Arnout

Quoted 4 lines

define LIBEVENT_REMOVE_PYSCRIPT
rm $(TARGET_DIR)/usr/bin/event_rpcgen.py

Signature · 6 lines

Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F

Maxime Hadjinlian

author

2014-10-19 20:49 UTC #5 lore raw

PATCH v2 1/1 libevent: Use github call & fix patch

Hi Arnout, all

Quoted 28 lines · Arnout Vandecappelle

Quoted 18 lines · Maxime Hadjinlian
We want to uses the github helper since we download a generated tarball from the tag anyway.
We also need to uses AUTORECONF as theses releases don't contains 'configure' and such.
The patchs that was already present is updated to apply against Makefile.am instead of Makefile.in
The seconds patchs is backported from upstream to remove the usage of $(top_src_dirs) which makes current autotools error.
Signed-off-by Maxime Hadjinlian <[email protected]>
---
v1 -> v2:
- Fix the added patches so they have correct SoB (Thomas Petazzoni)
- Add SoB (Thomas Petazzoni)
- Add comment for autoreconf (Yann E. Morin)
[snip]
package/libevent/libevent.mk line 8
Quoted 4 lines
LIBEVENT_VERSION = 2.0.21
package/libevent/libevent.mk +1 -2
-LIBEVENT_SOURCE = libevent-$(LIBEVENT_VERSION)-stable.tar.gz
-LIBEVENT_SITE = https://github.com/downloads/libevent/libevent
+LIBEVENT_SITE = $(call github,libevent,libevent,release-$(LIBEVENT_VERSION)-stable)
Like the addition to the manual that you created a few days ago points out:
this is wrong, because you're replacing a release tarball with a git tag...

Quoted 8 lines

package/libevent/libevent.mk line 13
Quoted 5 lines
LIBEVENT_INSTALL_STAGING = YES
LIBEVENT_LICENSE = BSD-3c, OpenBSD
LIBEVENT_LICENSE_FILES = LICENSE
package/libevent/libevent.mk +2 -0
+# Straight from the repository, need to generate autotools files
+LIBEVENT_AUTORECONF = YES
... which would also make this redundant. And probably the patch changes as well. So perhaps this one should be rejected.

Please look at the commit log of the v4 of this patch, I edited it so the need for this patch is clearer.

Quoted 18 lines

Regards,
Arnout

Quoted 4 lines

define LIBEVENT_REMOVE_PYSCRIPT
      rm $(TARGET_DIR)/usr/bin/event_rpcgen.py

Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F

Arnout Vandecappelle

2014-10-19 20:53 UTC #6 lore raw

PATCH v2 1/1 libevent: Use github call & fix patch

Quoted 4 lines · Maxime Hadjinlian

Quoted 2 lines
Quoted 2 lines
... which would also make this redundant. And probably the patch changes as well. So perhaps this one should be rejected.
Please look at the commit log of the v4 of this patch, I edited it so the need for this patch is clearer.

Sorry, FIFO mail reading... I should have checked for a v4.

Regards,
Arnout

Signature · 6 lines

Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F