Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

softethervpn: fix build on macos #17611

Merged
merged 1 commit into from
Jan 31, 2022

Conversation

svlobanov
Copy link
Contributor

host-compile fails on macos due to several reasons:

  1. host-compile Makefile always selected for linux
  2. macos host cc (clang) fails due to implicit-function-declaration
  3. ar and ranlib tools are hardcoded in softethervpn Makefiles

All three issues are fixed by this patch

Signed-off-by: Sergey V. Lobanov [email protected]

Maintainer: @fededim
Compile tested: (armvirt/64, OpenWrt trunk)

PR to upstream: SoftEtherVPN/SoftEtherVPN_Stable#20

Description: see above

@neheb
Copy link
Contributor

neheb commented Jan 19, 2022

knxd failure. Weird.

@svlobanov
Copy link
Contributor Author

knxd failure. Weird.

@neheb do you think this issue is somehow related to my commit?

@neheb
Copy link
Contributor

neheb commented Jan 20, 2022

no. I would try rebasing against master anyway.

@neheb
Copy link
Contributor

neheb commented Jan 20, 2022

yeah there's a version update with master.

@svlobanov
Copy link
Contributor Author

@neheb I didn't get your 2 last comments.

softerthervpn master (5.x) is: https://github.com/SoftEtherVPN/SoftEtherVPN (for developers)
OpenWrt uses softethervpn stable (4.x): https://github.com/SoftEtherVPN/SoftEtherVPN_Stable (recommended for end-users)

softerthervpn master doesn't have the files I patched. As I understand, there is no reason to use softerthervpn master due to it is a version for developers.
Could you please explain what is required to accept this PR?

@neheb
Copy link
Contributor

neheb commented Jan 30, 2022

i mean packages.git master.

git fetch origin
git rebase origin/master

@svlobanov
Copy link
Contributor Author

i mean packages.git master.

git fetch origin
git rebase origin/master

I'm sorry but I still don't undestand. This PR has no conflicts with packages repo. Last update for softethervpn was in October 2021, but my tree is January 2022

@neheb
Copy link
Contributor

neheb commented Jan 30, 2022

right. my point is ARC is failing because of knxd. knxd is fixed in current master. rebasing will make it succeed.

host-compile fails on macos due to several reasons:
1. host-compile Makefile always selected for linux
2. macos host cc (clang) fails due to implicit-function-declaration
3. ar and ranlib tools are hardcoded in softethervpn Makefiles

All three issues are fixed by this patch

Signed-off-by: Sergey V. Lobanov <[email protected]>
@svlobanov svlobanov force-pushed the softethervpn-fix-build-on-macos branch from bc8e3e3 to d648a06 Compare January 31, 2022 21:35
@neheb neheb merged commit f01baee into openwrt:master Jan 31, 2022
@svlobanov
Copy link
Contributor Author

@neheb thanks, rebase helped

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.

2 participants