vwifi: 6.3-unstable-2025-02-04 -> 7.1; move to CMake (#530586)
This commit is contained in:
@@ -1,41 +0,0 @@
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 9430d7e..e46efd3 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -2,8 +2,10 @@
|
||||
#
|
||||
NAME := vwifi
|
||||
VERSION := 6.3
|
||||
-BINDIR := $(DESTDIR)/usr/local/bin
|
||||
-MANDIR := $(DESTDIR)/usr/local/man/man1
|
||||
+PREFIX ?= $(out)
|
||||
+DESTDIR ?= $(PREFIX)
|
||||
+BINDIR ?= $(PREFIX)/bin
|
||||
+MANDIR ?= $(PREFIX)/share/man/man1
|
||||
|
||||
EXEC := vwifi-server vwifi-client vwifi-ctrl vwifi-add-interfaces
|
||||
#EXEC := vwifi-server vwifi-client vwifi-ctrl vwifi-add-interfaces vwifi-inet-monitor
|
||||
@@ -23,10 +25,8 @@ MODE+= -O3 -s -Wall -Wextra -pedantic # ////////// RELEASE
|
||||
|
||||
EDITOR ?= geany
|
||||
|
||||
-NETLINK_FLAGS_PATH := /usr/include/libnl3
|
||||
-NETLINK_FLAGS := -I $(NETLINK_FLAGS_PATH)
|
||||
-NETLINK_LIBS_PATH := .
|
||||
-NETLINK_LIBS := -L $(NETLINK_LIBS_PATH) -lnl-genl-3 -lnl-3
|
||||
+NETLINK_FLAGS := $(shell pkg-config --cflags libnl-3.0 libnl-genl-3.0)
|
||||
+NETLINK_LIBS := $(shell pkg-config --libs libnl-3.0 libnl-genl-3.0)
|
||||
|
||||
THREAD_LIBS := -lpthread
|
||||
|
||||
@@ -101,10 +101,6 @@ gitversion: .git
|
||||
@sed -i "s/^\(VERSION.[^\-]*\)\(-.*\)\?/\1-$(shell git log --pretty=format:"%h" -n 1)/g" Makefile
|
||||
|
||||
install : build
|
||||
-ifneq ($(EUID),0)
|
||||
- @echo "Please run 'make install' as root user"
|
||||
- @exit 1
|
||||
-endif
|
||||
chmod +x $(EXEC)
|
||||
# Install binaire :
|
||||
mkdir -p $(BINDIR) && cp -p $(EXEC) $(BINDIR)
|
||||
@@ -2,26 +2,26 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
libnl,
|
||||
pkg-config,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "vwifi";
|
||||
version = "6.3-unstable-2025-02-04";
|
||||
version = "7.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Raizo62";
|
||||
repo = "vwifi";
|
||||
rev = "18c320b1b92bea241ad801d05e0f2b4748478fd9";
|
||||
hash = "sha256-rlwBO5/xyr8KjvacxYt7dBrV1noXhwBJaElGhmM/eWU=";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-ed7MLPLdKIK9e4EQq83GwKWiOX3tNJShiFdnNgFGj7Q=";
|
||||
};
|
||||
|
||||
patches = [ ./makefile.patch ];
|
||||
|
||||
buildInputs = [
|
||||
libnl
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user