Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions batmand/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=batmand
PKG_RELEASE:=2
PKG_RELEASE:=3

PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://git.open-mesh.org/batmand.git
Expand Down Expand Up @@ -37,7 +37,6 @@ B.A.T.M.A.N. layer 3 routing daemon
endef

MAKE_FLAGS += \
EXTRA_CFLAGS='-DDEBUG_MALLOC -DMEMORY_USAGE -DPROFILE_DATA -DREVISION_VERSION=\"\ rv$(PKG_SOURCE_VERSION)\" -D_GNU_SOURCE' \
REVISION="$(PKG_SOURCE_VERSION)" \
CC="$(TARGET_CC)" \
UNAME="Linux" \
Expand Down
27 changes: 27 additions & 0 deletions batmand/patches/100-allocate-include-string-h.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Josef Schlehofer <pepe.schlehofer@gmail.com>
Date: Wed, 6 Aug 2026 12:00:00 +0200
Subject: [PATCH] allocate: include string.h for memcpy

memcpy() is used in debugRealloc() without including string.h. Since
GCC 14 treats implicit function declarations as a hard error, the
build fails:

allocate.c:349:17: error: implicit declaration of function
'memcpy' [-Wimplicit-function-declaration]

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
Comment on lines +1 to +13

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@elektra42 @ecsv:

This PR carries a small patch adding #include <string.h> to allocate.c, because memcpy() is used there without it and GCC 14 turns implicit declarations into errors, so batmand currently fails to build.

It looks like a fix that belongs upstream rather than in the feed.

---
allocate.c | 1 +
1 file changed, 1 insertion(+)

--- a/allocate.c
+++ b/allocate.c
@@ -23,6 +23,7 @@

#include <stdio.h>
#include <stdlib.h>
+#include <string.h>

#include "os.h"
#include "allocate.h"
17 changes: 17 additions & 0 deletions batmand/test-version.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#!/bin/sh

# shellcheck shell=busybox

case "$PKG_NAME" in
batmand)
# The version of batmand is derived from the source date and git
# hash, which the binary does not report. Check that the binary
# starts and prints its version banner instead.
batmand -v 2>&1 | grep -F "B.A.T.M.A.N."
;;

*)
echo "Untested package: $PKG_NAME" >&2
exit 1
;;
esac
5 changes: 2 additions & 3 deletions vis/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=vis
PKG_RELEASE:=10
PKG_RELEASE:=11

PKG_SOURCE_PROTO:=git
PKG_SOURCE_DATE:=2013-04-07
Expand Down Expand Up @@ -37,8 +37,7 @@ visualization server for B.A.T.M.A.N. layer 3
endef

MAKE_FLAGS += \
EXTRA_CFLAGS='-DDEBUG_MALLOC -DMEMORY_USAGE -DPROFILE_DATA -DREVISION_VERSION=\"\ rv$(PKG_REV)\" -D_GNU_SOURCE' \
REVISION="$(PKG_REV)" \
REVISION="$(PKG_SOURCE_VERSION)" \
CC="$(TARGET_CC)" \
vis

Expand Down
17 changes: 17 additions & 0 deletions vis/test-version.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#!/bin/sh

# shellcheck shell=busybox

case "$PKG_NAME" in
vis)
# The version of vis is derived from the source date and git
# hash, which the binary does not report. Check that the binary
# starts and prints its version banner instead.
vis -v 2>&1 | grep -F "B.A.T.M.A.N."
;;

*)
echo "Untested package: $PKG_NAME" >&2
exit 1
;;
esac