blackbox: rename patches to add sequence numbers
PATCH 1/2 blackbox: rename patches to add sequence numbers
---
...0.70.1-gcc43.patch => blackbox-002-gcc43.patch} | 0
... blackbox-003-gcc46-textpropertytostring.patch} | 0
2 files changed, 0 insertions(+), 0 deletions(-)
rename package/blackbox/{blackbox-0.70.1-gcc43.patch => blackbox-002-gcc43.patch} (100%)
rename package/blackbox/{blackbox-0.70.1-gcc46-textpropertytostring.patch => blackbox-003-gcc46-textpropertytostring.patch} (100%)package/blackbox/blackbox-002-gcc43.patch renamed from package/blackbox/blackbox-0.70.1-gcc43.patch +0 -0
package/blackbox/blackbox-003-gcc46-textpropertytostring.patch renamed from package/blackbox/blackbox-0.70.1-gcc46-textpropertytostring.patch +0 -0
Signature · 1 line
1.7.1
PATCH 2/2 blackbox: merge patch and fix linkage problem
-Merge the current blackbox-0.70.1-configure.patch to a new one named blackbox-001-Fix-configure-ac.patch that will patch configure.ac instead and also will add -lpthreads to LIBS to fix a linkage problem. -Force autoreconf to generate the new configure script using the new patched configure.ac file.
Fixes:
http://autobuild.buildroot.net/results/a97/a979cc079706be2012fb4b6c72894aca636adfb6/
--- package/blackbox/blackbox-0.70.1-configure.patch | 15 --------- .../blackbox/blackbox-001-Fix-configure-ac.patch | 34 ++++++++++++++++++++ package/blackbox/blackbox.mk | 2 + 3 files changed, 36 insertions(+), 15 deletions(-) delete mode 100644 package/blackbox/blackbox-0.70.1-configure.patch create mode 100644 package/blackbox/blackbox-001-Fix-configure-ac.patch
package/blackbox/blackbox-0.70.1-configure.patch deleted +0 -15
@@ -1,15 +0,0 @@ ---- a/configure 2005-11-03 03:27:16.000000000 -0500 -+++ b/configure 2008-02-02 23:25:25.000000000 -0500 -@@ -1980,12 +1980,6 @@ am__tar='${AMTAR} chof - "$$tardir"'; am - - test "x$prefix" = "xNONE" && prefix="$ac_default_prefix" - --CPPFLAGS="$CPPFLAGS -I$prefix/include" --LDFLAGS="$LDFLAGS -L$prefix/lib" --if test "x$prefix" != "x/usr/local"; then -- CPPFLAGS="$CPPFLAGS -I/usr/local/include" -- LDFLAGS="$LDFLAGS -L/usr/local/lib" --fi - - ac_ext=c - ac_cpp='$CPP $CPPFLAGS'
package/blackbox/blackbox-001-Fix-configure-ac.patch new file +34 -0
@@ -0,0 +1,34 @@ +blackbox: merge existing patch and fix lpthread + +Merge the current configure patch into this one so it will patch +configure.ac instead. Also add pthread to libs to fix a linkage problem. + +Signed-off-by: Vicente Olivert Riera <[email protected]> +--- blackbox-0.70.1/configure.ac.orig 2013-12-17 11:02:38.799055141 +0000 ++++ blackbox-0.70.1/configure.ac 2013-12-17 11:09:08.421204545 +0000 +@@ -8,14 +8,6 @@ AC_CONFIG_SRCDIR([src/blackbox.cc]) + dnl Determine default prefix + test "x$prefix" = "xNONE" && prefix="$ac_default_prefix" + +-dnl Look in the most logical places for external libraries +-CPPFLAGS="$CPPFLAGS -I$prefix/include" +-LDFLAGS="$LDFLAGS -L$prefix/lib" +-if test "x$prefix" != "x/usr/local"; then +- CPPFLAGS="$CPPFLAGS -I/usr/local/include" +- LDFLAGS="$LDFLAGS -L/usr/local/lib" +-fi +- + dnl Locate required external software + AC_PROG_CC + +@@ -128,6 +120,10 @@ int main(int, char **) + [AC_MSG_RESULT([no])] + ) + ++dnl required pthread ++AC_CHECK_LIB([pthread], ++ [pthread_cancel], ++ [LIBS="$LIBS -lpthread"]) + dnl needed for some X11 libs + AC_CHECK_LIB([nsl], + [t_open],
package/blackbox/blackbox.mk +2 -0
@@ -17,4 +17,6 @@ ifneq ($(BR2_ENABLE_LOCALE),y) BLACKBOX_DEPENDENCIES += libiconv endif +BLACKBOX_AUTORECONF = YES + $(eval $(autotools-package))
Signature · 1 line
1.7.1
PATCH 1/2 blackbox: rename patches to add sequence numbers
In reply to Vicente Olivert RieraQuoted 3 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Vicente" == Vicente Olivert Riera <[email protected]> writes:
Signed-off-by Vicente Olivert Riera <[email protected]>
Committed both, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/2 blackbox: rename patches to add sequence numbers
In reply to Vicente Olivert RieraDear Vicente Olivert Riera,
Quoted 7 lines · Vicente Olivert Riera
Signed-off-by Vicente Olivert Riera <[email protected]>--- ...0.70.1-gcc43.patch => blackbox-002-gcc43.patch} | 0 ... blackbox-003-gcc46-textpropertytostring.patch} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename package/blackbox/{blackbox-0.70.1-gcc43.patch => blackbox-002-gcc43.patch} (100%) rename package/blackbox/{blackbox-0.70.1-gcc46-textpropertytostring.patch => blackbox-003-gcc46-textpropertytostring.patch} (100%)
It is a little bit weird that the first patch was not renamed in this commit, but instead renamed in PATCH 2/2, mixed with some other changes in the patch itself.
Both patches have now be applied by Peter, so it's too late, but it would have been good to get this right.
Thanks for those contributions anyway!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 1/2 blackbox: rename patches to add sequence numbers
Quoted 12 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Petazzoni <[email protected]> writes:
Dear Vicente Olivert Riera,
Quoted 7 lines · Vicente Olivert Riera
Signed-off-by Vicente Olivert Riera <[email protected]>---
...0.70.1-gcc43.patch => blackbox-002-gcc43.patch} | 0 ... blackbox-003-gcc46-textpropertytostring.patch} | 0 2 files changed, 0 insertions(+), 0 deletions(-)rename
package/blackbox/{blackbox-0.70.1-gcc43.patch=> blackbox-002-gcc43.patch} (100%)
renamepackage/blackbox/{blackbox-0.70.1-gcc46-textpropertytostring.patch=> blackbox-003-gcc46-textpropertytostring.patch} (100%)
Quoted 6 lines
It is a little bit weird that the first patch was not renamed in this commit, but instead renamed in PATCH 2/2, mixed with some other changes in the patch itself.
Both patches have now be applied by Peter, so it's too late, but it would have been good to get this right.
Sorry, I apparently missed that.
Signature · 1 line
Bye, Peter Korsgaard