Browse Source

Build fix.

Adam Ierymenko 3 months ago
parent
commit
a28a6d1bf5
2 changed files with 5 additions and 5 deletions
  1. 4 4
      make-linux.mk
  2. 1 1
      zerotier-one.spec

+ 4 - 4
make-linux.mk

@@ -341,10 +341,10 @@ ifeq ($(ZT_STATIC),1)
 endif
 endif
 
 
 # For building an official semi-static binary on CentOS 7
 # 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)
 ifeq ($(ZT_CONTROLLER),1)
 	override CXXFLAGS+=-Wall -Wno-deprecated -std=c++17 -pthread $(INCLUDES) -DNDEBUG $(DEFS)
 	override CXXFLAGS+=-Wall -Wno-deprecated -std=c++17 -pthread $(INCLUDES) -DNDEBUG $(DEFS)

+ 1 - 1
zerotier-one.spec

@@ -102,7 +102,7 @@ ln -s %{getenv:PWD} %{name}-%{version}
 mkdir -p SOURCES
 mkdir -p SOURCES
 tar --exclude=%{name}-%{version}/.git --exclude=%{name}-%{version}/%{name}-%{version} -czf SOURCES/%{name}-%{version}.tar.gz %{name}-%{version}/*
 tar --exclude=%{name}-%{version}/.git --exclude=%{name}-%{version}/%{name}-%{version} -czf SOURCES/%{name}-%{version}.tar.gz %{name}-%{version}/*
 rm -f %{name}-%{version}
 rm -f %{name}-%{version}
-# cp -a %{getenv:PWD}/* .
+cp -a %{getenv:PWD}/* .
 %endif
 %endif
 
 
 %build
 %build