Skip to content

Fix debian controller build #2514

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.

Sign up for GitHub

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

Merged
adamierymenko merged 3 commits into from
Sep 15, 2025
+14 −8
Merged

Fix debian controller build #2514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d18a57
Include controller on debian.
adamierymenko Sep 12, 2025
6921628
RPM too
adamierymenko Sep 12, 2025
a28a6d1
Build fix.
adamierymenko Sep 13, 2025
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
6 changes: 6 additions & 0 deletions debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
zerotier-one (1.16.0-2) unstable; urgency=medium

* Fix build settings to include controller.

-- Adam Ierymenko <adam.ierymenko@zerotier.com> Thu, 12 Sep 2025 01:00:00 -0700

zerotier-one (1.16.0) unstable; urgency=medium

* See RELEASE-NOTES.md for release notes.
Expand Down
2 changes: 1 addition & 1 deletion debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ CXXFLAGS=-O3 -fstack-protector-strong
dh $@ --with systemd

override_dh_auto_build:
make
make ZT_OFFICIAL=1 ZT_NONFREE=1 all

override_dh_systemd_start:
dh_systemd_start --restart-after-upgrade
Expand Down
2 changes: 1 addition & 1 deletion debian/rules.wheezy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ CXXFLAGS=-O3 -fstack-protector
dh $@

override_dh_auto_build:
make -j 2
make -j 2 ZT_OFFICIAL=1 ZT_NONFREE=1 all

8 changes: 4 additions & 4 deletions make-linux.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,10 +341,10 @@ ifeq ($(ZT_STATIC),1)
endif

# For building an official semi-static binary on CentOS 7
ifeq ($(ZT_OFFICIAL),1)
CORE_OBJS+=ext/misc/linux-old-glibc-compat.o
override LDFLAGS+=-Wl,--wrap=memcpy -static-libstdc++
endif
#ifeq ($(ZT_OFFICIAL),1)
# CORE_OBJS+=ext/misc/linux-old-glibc-compat.o
# override LDFLAGS+=-Wl,--wrap=memcpy -static-libstdc++
#endif

ifeq ($(ZT_CONTROLLER),1)
override CXXFLAGS+=-Wall -Wno-deprecated -std=c++17 -pthread $(INCLUDES) -DNDEBUG $(DEFS)
Expand Down
4 changes: 2 additions & 2 deletions zerotier-one.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,12 @@ ln -s %{getenv:PWD} %{name}-%{version}
mkdir -p SOURCES
tar --exclude=%{name}-%{version}/.git --exclude=%{name}-%{version}/%{name}-%{version} -czf SOURCES/%{name}-%{version}.tar.gz %{name}-%{version}/*
rm -f %{name}-%{version}
# cp -a %{getenv:PWD}/* .
cp -a %{getenv:PWD}/* .
%endif

%build
%if "%{?dist}" != ".el6"
make ZT_USE_MINIUPNPC=1 %{?_smp_mflags} one
make ZT_USE_MINIUPNPC=1 %{?_smp_mflags} ZT_OFFICIAL=1 ZT_NONFREE=1 one
%endif

%pre
Expand Down
Loading