Skip to content

Fix build when NO_VLAN#1865

Merged
davidebeatrici merged 1 commit into
SoftEtherVPN:masterfrom
metalefty:fix-build-no-vlan
Jul 5, 2023
Merged

Fix build when NO_VLAN#1865
davidebeatrici merged 1 commit into
SoftEtherVPN:masterfrom
metalefty:fix-build-no-vlan

Conversation

@metalefty
Copy link
Copy Markdown
Contributor

@metalefty metalefty commented Jun 16, 2023

Occurred at: #670
Closes: #1864

Tested build on FreeBSD with NO_VLAN by modifying CMakeLists.txt like this:

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c49a3c78..1dad3691 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -93,6 +93,7 @@ if(UNIX)
if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
     add_definitions(-DUNIX_BSD -DBRIDGE_BPF)
+    add_definitions(-DNO_VLAN)
     include_directories(SYSTEM /usr/local/include)
     link_directories(SYSTEM /usr/local/lib)
   endif()

Occurred at:	 SoftEtherVPN#670
Closes:		SoftEtherVPN#1864

Tested build on FreeBSD with NO_VLAN by modifying CMakeLists.txt like this:

```diff
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c49a3c7..1dad3691 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -93,6 +93,7 @@ if(UNIX)
if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
     add_definitions(-DUNIX_BSD -DBRIDGE_BPF)
+    add_definitions(-DNO_VLAN)
     include_directories(SYSTEM /usr/local/include)
     link_directories(SYSTEM /usr/local/lib)
   endif()
```
@metalefty metalefty force-pushed the fix-build-no-vlan branch from 93124e5 to 0ab5199 Compare June 16, 2023 17:18
@metalefty
Copy link
Copy Markdown
Contributor Author

Let's merge since this one and #1866 are clear and easy.

@davidebeatrici davidebeatrici merged commit 1493ccb into SoftEtherVPN:master Jul 5, 2023
@metalefty metalefty deleted the fix-build-no-vlan branch July 5, 2023 09:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Build error with NO_VLAN

2 participants