Pull request for branch fixes
The following changes since commit f0bdacdb5b8fe0fbc276ed510fc58e9a219f5cf8:
Peter Korsgaard (1):
update for 2010.02-rc1
are available in the git repository at:
git://git.busybox.net/~tpetazzoni/git/buildroot fixes
Thomas Petazzoni (3):
Create $(STAGING_DIR)/usr/bin unconditionnally
argus: fix compile breakage
at: fix compile breakage when flex isn't on the target
Makefile | 1 + .../argus-3.0.0.rc.34-01-use-pcap-header.patch | 27 ++++++++++++++++++++ package/at/at-3.1.12-0007-include-config-h.patch | 16 +++++++++++ 3 files changed, 44 insertions(+), 0 deletions(-) create mode 100644 package/argus/argus-3.0.0.rc.34-01-use-pcap-header.patch create mode 100644 package/at/at-3.1.12-0007-include-config-h.patch
Thanks,
Signature · 1 line
Thomas Petazzoni
PATCH 1/3 Create $(STAGING_DIR)/usr/bin unconditionnally
This fixes the build of libcap, with external toolchain, when it is the first package being built.
--- Makefile | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
Makefile +1 -0
@@ -371,6 +371,7 @@ ifneq ($(BR2_TOOLCHAIN_EXTERNAL),y) endif endif @mkdir -p $(STAGING_DIR)/usr/include + @mkdir -p $(STAGING_DIR)/usr/bin $(BUILD_DIR)/.root: mkdir -p $(TARGET_DIR)
Signature · 1 line
1.6.3.3
PATCH 2/3 argus: fix compile breakage
In reply to Thomas PetazzoniAdd a patch that includes pcap.h instead of hardcoding an incorrect prototype for a function provided by libpcap.
--- .../argus-3.0.0.rc.34-01-use-pcap-header.patch | 27 ++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) create mode 100644 package/argus/argus-3.0.0.rc.34-01-use-pcap-header.patch
package/argus/argus-3.0.0.rc.34-01-use-pcap-header.patch new file +27 -0
@@ -0,0 +1,27 @@ +Instead of hardcoding a wrong prototype for a libcap function, include +the correct header. + +Index: argus-3.0.0.rc.34/argus/ArgusSource.c +=================================================================== +--- argus-3.0.0.rc.34.orig/argus/ArgusSource.c 2010-02-09 22:57:21.000000000 +0100 ++++ argus-3.0.0.rc.34/argus/ArgusSource.c 2010-02-09 22:57:29.000000000 +0100 +@@ -53,6 +53,7 @@ + #define PPP_HDRLEN 4 /* length of PPP header */ + #endif + ++#include <pcap.h> + + void ArgusGetInterfaceStatus (struct ArgusSourceStruct *src); + +Index: argus-3.0.0.rc.34/argus/ArgusSource.h +=================================================================== +--- argus-3.0.0.rc.34.orig/argus/ArgusSource.h 2010-02-09 22:57:35.000000000 +0100 ++++ argus-3.0.0.rc.34/argus/ArgusSource.h 2010-02-09 22:57:54.000000000 +0100 +@@ -381,7 +381,6 @@ + + int ArgusCreatePktFromFddi(const struct fddi_header *, struct ether_header *, int); + +-extern char *bpf_image(struct bpf_insn *, int); + + + #else /* defined(ArgusSource) */
Signature · 1 line
1.6.3.3
PATCH 3/3 at: fix compile breakage when flex isn't on the target
In reply to Thomas PetazzoniAdd a patch that makes sure config.h gets included in a file that uses some of the NEEDS_* macros. The yywrap() function was missing when flex was not available on the target, even though this configuration is supposed to be supported by at (and handled by NEEDS_YYWRAP).
--- package/at/at-3.1.12-0007-include-config-h.patch | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) create mode 100644 package/at/at-3.1.12-0007-include-config-h.patch
package/at/at-3.1.12-0007-include-config-h.patch new file +16 -0
@@ -0,0 +1,16 @@ +Make sure to include config.h so that NEEDS_* macros are properly +taken into account. This was a problem for NEEDS_YYWRAP, which was set +to 1 in config.h, but the corresponding code wasn't compiled in. + +Index: at-3.1.12/parsetime.l +=================================================================== +--- at-3.1.12.orig/parsetime.l 2010-02-10 00:17:46.000000000 +0100 ++++ at-3.1.12/parsetime.l 2010-02-10 00:18:07.000000000 +0100 +@@ -4,6 +4,7 @@ + #include <time.h> + #include "y.tab.h" + #include "parsetime.h" ++#include "config.h" + + char *last_token = NULL; + char **my_argv;
Signature · 1 line
1.6.3.3
PATCH 3/3 at: fix compile breakage when flex isn't on the target
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Petazzoni <[email protected]> writes:
Thomas> Add a patch that makes sure config.h gets included in a file that uses Thomas> some of the NEEDS_* macros. The yywrap() function was missing when Thomas> flex was not available on the target, even though this configuration Thomas> is supposed to be supported by at (and handled by NEEDS_YYWRAP).
Thanks - Please also send upstream and CC crossdev at send-patches.org
Signature · 1 line
Bye, Peter Korsgaard
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 f0bdacdb5b8fe0fbc276ed510fc58e9a219f5cf8:
Thomas> Peter Korsgaard (1):
Thomas> update for 2010.02-rc1
Thomas> are available in the git repository at:
Thomas> git://git.busybox.net/~tpetazzoni/git/buildroot fixes
Committed, thanks!
Signature · 1 line
Bye, Peter Korsgaard