Skip to content
Extraits de code Groupes Projets
Valider 617883d1 rédigé par Tom Barbette's avatar Tom Barbette
Parcourir les fichiers

Fix compilation with musl

parent 2023d07b
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -75,11 +75,7 @@ cache: ...@@ -75,11 +75,7 @@ cache:
- dpdk-* - dpdk-*
- netmap-$NETMAP_VERSION - netmap-$NETMAP_VERSION
before_script: before_script:
- if ( command -v apt-get &> /dev/null ) ; then - sh deps.sh
echo "Installing dependencies..." ;
apt-get update -yqq && apt-get install -yqq build-essential sudo wget libelf-dev pkg-config zlib1g-dev libnuma-dev python3-pyelftools ninja-build meson linux-headers-$(uname -r) python3-pip ;
fi;
- gcc -v - gcc -v
- if [ ! -e "netmap-$NETMAP_VERSION/sys/net/netmap.h" ] ; then wget https://github.com/luigirizzo/netmap/archive/v$NETMAP_VERSION.tar.gz && tar -xvf v$NETMAP_VERSION.tar.gz && ( cd netmap-$NETMAP_VERSION && cd LINUX && ./configure --no-drivers ; cd .. && cd .. ) ; fi - if [ ! -e "netmap-$NETMAP_VERSION/sys/net/netmap.h" ] ; then wget https://github.com/luigirizzo/netmap/archive/v$NETMAP_VERSION.tar.gz && tar -xvf v$NETMAP_VERSION.tar.gz && ( cd netmap-$NETMAP_VERSION && cd LINUX && ./configure --no-drivers ; cd .. && cd .. ) ; fi
- ls -al - ls -al
......
#!/bin/sh
echo "Installing dependencies..." ;
if ( command -v apt-get &> /dev/null ) ; then
echo "Using apt-get"
apt-get update -yqq && apt-get install -yqq build-essential sudo wget libelf-dev pkg-config zlib1g-dev libnuma-dev python3-pyelftools ninja-build meson linux-headers-$(uname -r) python3-pip
elif ( command -v apk &> /dev/null ) ; then
echo "Using apk"
apk add --no-cache wget gcc libelf numactl python3 pkgconf zlib-dev py3-pip g++ py3-elftools autoconf build-base bsd-compat-headers linux-headers gcompat libstdc++
fi
...@@ -43,6 +43,8 @@ ...@@ -43,6 +43,8 @@
#include <click/packet_anno.hh> #include <click/packet_anno.hh>
#include <click/standard/scheduleinfo.hh> #include <click/standard/scheduleinfo.hh>
#include <click/userutils.hh> #include <click/userutils.hh>
#include <netinet/if_ether.h>
#define _LINUX_IF_ETHER_H 1
#include <linux/ethtool.h> #include <linux/ethtool.h>
#include <linux/netlink.h> #include <linux/netlink.h>
#include <unistd.h> #include <unistd.h>
......
...@@ -14,6 +14,7 @@ CLICK_CXX_UNPROTECT ...@@ -14,6 +14,7 @@ CLICK_CXX_UNPROTECT
#else #else
# include <errno.h> # include <errno.h>
# include <sys/ioctl.h> # include <sys/ioctl.h>
# include <asm/ioctl.h>
#endif #endif
/* Click low-level RPC interface */ /* Click low-level RPC interface */
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include <click/config.h> #include <click/config.h>
#include <click/glue.hh> #include <click/glue.hh>
#include <stdlib.h> #include <stdlib.h>
#include <byteswap.h>
#include <regex> #include <regex>
#include <click/flow/flow.hh> #include <click/flow/flow.hh>
#include <click/flow/flowelement.hh> #include <click/flow/flowelement.hh>
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter