rpi/domo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bump buildroot to version 2017-02

Browse Source 
TG-3 #closed
This commit is contained in:
jbnadal
2017-03-28 18:29:16 +02:00
parent 93b7fd91d2
commit 42c92a6bcb
3010 changed files with 41289 additions and 46428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
bsp/buildroot/package/ushare/0003-ushare-c-include-config-h-before-checking-for-CONFIG-NLS.patch Normal file
View File

@@ -0,0 +1,42 @@
ushare.c: include config.h before checking for CONFIG_NLS
When NLS support is enabled, we get following build errors:
ushare.c: In function 'setup_i18n':
ushare.c:745:3: warning: implicit declaration of function 'setlocale' [-Wimplicit-function-declaration]
setlocale (LC_ALL, "");
^
ushare.c:745:14: error: 'LC_ALL' undeclared (first use in this function)
setlocale (LC_ALL, "");
^
ushare.c:745:14: note: each undeclared identifier is reported only once for each function it appears in
make[2]: *** [ushare.o] Error 1
When NLS support is enabled, configure script creates macro in config.h.
We check for CONFIG_NLS before including config.h which results in above
build errors as locale.h doesn't get included.
This patch fixes above build error by including config.h before we check for
CONFIG_NLS.
This build error is detected by Buildroot autobuilder
http://autobuild.buildroot.net/results/19d/19d67dd43e5a313c77e4be97ecb9811ffa52f797/
Signed-off-by: Rahul Bedarkar <rahul.bedarkar@imgtec.com>
--- ushare-1.1a/src/ushare.c.old 2016-09-20 19:04:00.915239326 +0530
+++ ushare-1.1a/src/ushare.c 2016-09-20 19:04:24.707239276 +0530
@@ -56,11 +56,12 @@
#include <upnp/upnp.h>
#include <upnp/upnptools.h>
+#include "config.h"
+
#if (defined(HAVE_SETLOCALE) && defined(CONFIG_NLS))
# include <locale.h>
#endif
-#include "config.h"
#include "ushare.h"
#include "services.h"
#include "http.h"

4
bsp/buildroot/package/ushare/ushare.mk
View File

@@ -26,11 +26,11 @@ define USHARE_CONFIGURE_CMDS
endef
define USHARE_BUILD_CMDS
$(MAKE) LDFLAGS="$(TARGET_LDFLAGS) $(USHARE_LDFLAGS)" -C $(@D)
$(TARGET_MAKE_ENV) $(MAKE) LDFLAGS="$(TARGET_LDFLAGS) $(USHARE_LDFLAGS)" -C $(@D)
endef
define USHARE_INSTALL_TARGET_CMDS
$(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
rm -f $(TARGET_DIR)/etc/init.d/ushare
endef