Skip to contentSkip to conversation

Pull request for branch 2010-05-10-fixes

GIT PULL New Thomas Petazzoni 2 participants 9 messages May 10, 2010 – May 14, 2010

lore
Share & tools
lore
#0 lore raw

The following changes since commit af850ce10fc490036247a8c0dd92c79f18b2281a:
Peter Korsgaard (1):
Merge branch 'squashfs-fixes' of git://git.busybox.net/~tpetazzoni/git/buildroot

are available in the git repository at:

git://git.busybox.net/~tpetazzoni/git/buildroot 2010-05-10-fixes

Thomas Petazzoni (5):
grep: give hints to ./configure on where gettext() is
hostapd: use internal crypto library
less: depends on curses
netplug: disable -Werror to fix build failure
libnl: include limits.h to fix build failure

 package/grep/grep.mk                               |    1 +
 package/hostapd/hostapd.mk                         |    1 +
 package/less/less.mk                               |    1 +
 package/libnl/libnl-1.1-netlink-local-fix.patch    |   19 +++++++++++++++++
 package/netplug/netplug-1.2.9-disable-werror.patch |   22 ++++++++++++++++++++
 5 files changed, 44 insertions(+), 0 deletions(-)
 create mode 100644 package/libnl/libnl-1.1-netlink-local-fix.patch
 create mode 100644 package/netplug/netplug-1.2.9-disable-werror.patch

Thanks,

Signature · 1 line
Thomas Petazzoni
#1 lore raw

PATCH 1/5 grep: give hints to ./configure on where gettext() is

The build of grep fails with:

fgrep.o: In function `add_count':
fgrep.c:(.text+0x90): undefined reference to `libintl_gettext'

This is because the ./configure script of grep thought that gettext was part of the C library instead of part of libintl:

checking for GNU gettext in libc... (cached) yes

Therefore, it forgot to add -lintl while linking grep and related applications. Passing gt_cv_func_gnugettext_libc=no forces grep to use libintl instead.

---
 package/grep/grep.mk |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
package/grep/grep.mk +1 -0
index acef6e9..3fa671c 100644
@@ -6,6 +6,7 @@
 GREP_VERSION:=2.5.3
 GREP_SOURCE:=grep-$(GREP_VERSION).tar.bz2
 GREP_SITE:=$(BR2_GNU_MIRROR)/grep
+GREP_CONF_ENV = gt_cv_func_gnugettext_libc=no
 GREP_CONF_OPT = --disable-perl-regexp --without-included-regex
 
 GREP_DEPENDENCIES = $(if $(BR2_ENABLE_LOCALE),gettext libintl)
Signature · 1 line
1.6.3.3
#2 lore raw

PATCH 1/5 grep: give hints to ./configure on where gettext() is

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> The build of grep fails with:
Thomas> fgrep.o: In function `add_count':
Thomas> fgrep.c:(.text+0x90): undefined reference to `libintl_gettext'

Thomas> This is because the ./configure script of grep thought that gettext Thomas> was part of the C library instead of part of libintl:

Thomas> checking for GNU gettext in libc... (cached) yes

That must mean some other package has loaded the cache with wrong info. We should fix that instead.

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH 1/5 grep: give hints to ./configure on where gettext() is

Quoted 2 lines · On Tue, 11 May 2010 08:55:14 +0200 Peter Korsgaard <[email protected]> wrote:

That must mean some other package has loaded the cache with wrong info. We should fix that instead.

You're right. I have a new stack of patches fixing this the proper way. Several other packages were affected by this issue.

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#4 lore raw

PATCH 2/5 hostapd: use internal crypto library

In reply to Thomas Petazzoni

When OpenSSL is not enabled, hostapd relies on an internal library. However, this library must be enabled, otherwise the compilation of hostapd fails with:

/home/test/ctng-arm-eglibc/bin/../lib/gcc/arm-unknown-linux-gnueabi/4.3.4/../../../../arm-unknown-linux-gnueabi/bin/ld: cannot find -ltommath

---
 package/hostapd/hostapd.mk |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
package/hostapd/hostapd.mk +1 -0
index 2359fd3..bde3766 100644
@@ -45,6 +45,7 @@ endif
 # We take care of that in Config.in
 ifneq ($(BR2_PACKAGE_OPENSSL),y)
 	echo "CONFIG_CRYPTO=internal" >>$(HOSTAPD_CONFIG)
+	echo "CONFIG_INTERNAL_LIBTOMMATH=y" >>$(HOSTAPD_CONFIG)
 	echo "CONFIG_TLS=internal" >>$(HOSTAPD_CONFIG)
 endif
 # WPS
Signature · 1 line
1.6.3.3
#5 lore raw

PATCH 3/5 less: depends on curses

In reply to Thomas Petazzoni

The less package already selects BR2_PACKAGE_CURSES, but it fails to depend on it in the makefile. Therefore, there are cases where less gets built before curses, and the build fails:

checking for working terminal libraries... Cannot find terminal libraries - configure failed

---
 package/less/less.mk |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
package/less/less.mk +1 -0
index 706a3e0..bae1cf6 100644
@@ -6,6 +6,7 @@
 
 LESS_VERSION = 436
 LESS_SITE = http://www.greenwoodsoftware.com/less
+LESS_DEPENDENCIES = ncurses
 
 $(eval $(call AUTOTARGETS,package,less))
 
Signature · 1 line
1.6.3.3
#6 lore raw

PATCH 4/5 netplug: disable -Werror to fix build failure

In reply to Thomas Petazzoni

netplug uses nested functions, and gcc generates a warning that is turned into an error:

cc1: warnings being treated as errors
if_info.c: In function 'ifsm_scriptdone':
if_info.c:289: error: generating trampoline in object (requires executable stack)

---
 package/netplug/netplug-1.2.9-disable-werror.patch |   22 ++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)
 create mode 100644 package/netplug/netplug-1.2.9-disable-werror.patch
package/netplug/netplug-1.2.9-disable-werror.patch new file +22 -0
new file mode 100644
index 0000000..d8a3e15
@@ -0,0 +1,22 @@
+netplug uses nested functions, and gcc generates a warning that
+is turned into an error:
+
+cc1: warnings being treated as errors
+if_info.c: In function 'ifsm_scriptdone':
+if_info.c:289: error: generating trampoline in object (requires executable stack)
+
+Signed-off-by: Thomas Petazzoni <[email protected]>
+
+Index: netplug-1.2.9/Makefile
+===================================================================
+--- netplug-1.2.9.orig/Makefile	2010-05-09 21:07:40.000000000 +0200
++++ netplug-1.2.9/Makefile	2010-05-09 21:09:32.000000000 +0200
+@@ -9,7 +9,7 @@
+ 
+ install_opts :=
+ 
+-CFLAGS += -Wall -Werror -std=gnu99 -DNP_ETC_DIR='"$(etcdir)"' \
++CFLAGS += -Wall -std=gnu99 -DNP_ETC_DIR='"$(etcdir)"' \
+ 	-DNP_SCRIPT_DIR='"$(scriptdir)"' -ggdb3 -O3 -DNP_VERSION='"$(version)"'
+ 
+ netplugd: config.o netlink.o lib.o if_info.o main.o
Signature · 1 line
1.6.3.3
#7 lore raw

PATCH 5/5 libnl: include limits.h to fix build failure

In reply to Thomas Petazzoni

Fixes the ULONG_MAX definition problem:

In file included from cache.c:43:
../include/netlink-local.h: In function '__str2type':../include/netlink-local.h:218: error: 'ULONG_MAX' undeclared (first use in this function)

---
 package/libnl/libnl-1.1-netlink-local-fix.patch |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 deletions(-)
 create mode 100644 package/libnl/libnl-1.1-netlink-local-fix.patch
package/libnl/libnl-1.1-netlink-local-fix.patch new file +19 -0
new file mode 100644
index 0000000..79cda28
@@ -0,0 +1,19 @@
+Fixes the ULONG_MAX definition problem:
+
+In file included from cache.c:43:
+../include/netlink-local.h: In function '__str2type':../include/netlink-local.h:218: error: 'ULONG_MAX' undeclared (first use in this function)
+
+Patch borrowed from OpenEmbedded, recipes/libnl/files/netlink-local-fix.patch.
+
+Index: libnl-1.1/include/netlink-local.h
+===================================================================
+--- libnl-1.1.orig/include/netlink-local.h	2009-06-18 15:28:32.614209645 +0400
++++ libnl-1.1/include/netlink-local.h	2009-06-18 15:28:44.094190518 +0400
+@@ -26,6 +26,7 @@
+ #include <sys/socket.h>
+ #include <inttypes.h>
+ #include <assert.h>
++#include <limits.h>
+ 
+ #include <arpa/inet.h>
+ #include <netdb.h>
Signature · 1 line
1.6.3.3
#8 lore raw
In reply to Thomas Petazzoni
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> The following changes since commit af850ce10fc490036247a8c0dd92c79f18b2281a:
Thomas> Peter Korsgaard (1):
Thomas> Merge branch 'squashfs-fixes' of git://git.busybox.net/~tpetazzoni/git/buildroot

Thomas> are available in the git repository at:

Thomas> git://git.busybox.net/~tpetazzoni/git/buildroot 2010-05-10-fixes

Thomas> Thomas Petazzoni (5):

 Thomas>       grep: give hints to ./configure on where gettext() is
 Thomas>       hostapd: use internal crypto library
 Thomas>       less: depends on curses
 Thomas>       netplug: disable -Werror to fix build failure
 Thomas>       libnl: include limits.h to fix build failure

Thanks, committed everything besides the grep fix.

Signature · 1 line
Bye, Peter Korsgaard