[Olsr-dev] [Olsr-commit] OLSR.org main repository branch, master, updated. v0.6.6.2-206-g2ded0da
Ferry Huberts
(spam-protected)
Tue Jun 10 10:06:13 CEST 2014
Yuri,
I have reverted your commit with windows changes.
It broke our builds:
- Debian Squeeze win32
- Debian Squeeze win64
- Debian Wheezy win32
If you want to fix windows builds, then make sure that the following
builds do not break:
- Debian Squeeze win32 + win64
- Debian Wheezy win32 + win64
- Fedora 20 win32 + win64
- OpenWRT
The windows builds are extremely fragile because of widely differing
mingw versions and their applied patches. Be warned...
On 10/06/14 09:58, (spam-protected) wrote:
> This is an automated email from the git hooks/post-receive script. It was
> generated because a ref change was pushed to the repository containing
> the project "OLSR.org main repository".
>
> See http://olsr.org/git/?p=olsrd.git;a=commitdiff;h=v0.6.6.2-206-g2ded0da
> for a web version of the last commit.
>
> The branch, master has been updated
> via 2ded0da671d863ca9bcc9d22b0822cbe77a92db2 (commit)
> from 996a734fdf6f0eebb1a5260c5ab11f9975933417 (commit)
>
> Those revisions listed above that are new to this repository have
> not appeared on any other notification email; so we list those
> revisions in full, below.
>
> - Log -----------------------------------------------------------------
> commit 2ded0da671d863ca9bcc9d22b0822cbe77a92db2
> Author: Ferry Huberts <(spam-protected)>
> Date: Tue Jun 10 09:57:20 2014 +0200
>
> Revert "Fix for win32 compiling with i686-w64-mingw32-gcc on ubuntu"
>
> This reverts commit a36245314b1874b940037d3e486796d1a623dd78.
>
> It breaks the windows builds on Debian Squeeze
>
> -----------------------------------------------------------------------
>
> Summary of changes:
> .gitignore | 1 -
> Makefile.inc | 3 ---
> lib/httpinfo/Makefile | 4 ---
> lib/httpinfo/src/admin_interface.c | 18 +++----------
> lib/httpinfo/src/admin_interface.h | 2 +-
> lib/httpinfo/src/olsrd_httpinfo.c | 8 +++---
> lib/nameservice/Makefile | 7 ++---
> lib/nameservice/contrib/libregex.a | Bin 68090 -> 0 bytes
> lib/nameservice/src/nameservice.c | 8 ++----
> src/cfgparser/olsrd_cfgparser.def | 1 -
> src/cfgparser/olsrd_conf.c | 9 +------
> src/win32/compat.c | 2 +-
> src/win32/compat.h | 3 +--
> src/win32/ifnet.c | 52 ++----------------------------------
> 14 files changed, 19 insertions(+), 99 deletions(-)
> delete mode 100644 lib/nameservice/contrib/libregex.a
>
>
> hooks/post-receive
>
--
Ferry Huberts
More information about the Olsr-dev
mailing list