Remove CPU specific optimizations for generic build.
This commit is contained in:
Stuart D. Gathman
parent
0cee7087ee
commit
9da2f5d986
|
|
@ -1,7 +1,7 @@
|
|||
diff -up ./node_build/make.js.dyn ./node_build/make.js
|
||||
--- ./node_build/make.js.dyn 2016-10-11 17:39:44.000000000 -0400
|
||||
+++ ./node_build/make.js 2016-10-14 22:08:23.018241766 -0400
|
||||
@@ -252,44 +252,9 @@ Builder.configure({
|
||||
--- ./node_build/make.js.dyn 2018-04-18 03:35:41.000000000 -0400
|
||||
+++ ./node_build/make.js 2018-06-28 13:50:51.922657841 -0400
|
||||
@@ -256,48 +256,9 @@ Builder.configure({
|
||||
|
||||
}).nThen(function (waitFor) {
|
||||
|
||||
|
|
@ -26,13 +26,17 @@ diff -up ./node_build/make.js.dyn ./node_build/make.js
|
|||
-
|
||||
- args.unshift(builder.config.optimizeLevel, '-fomit-frame-pointer');
|
||||
-
|
||||
- if (!/^\-O0$/.test(builder.config.optimizeLevel)) {
|
||||
- args.unshift('-D_FORTIFY_SOURCE=2');
|
||||
- }
|
||||
-
|
||||
- if (CFLAGS) {
|
||||
- [].push.apply(args, CFLAGS.split(' '));
|
||||
- }
|
||||
-
|
||||
- if (!builder.config.crossCompiling) {
|
||||
- if (NO_MARCH_FLAG.indexOf(process.arch) < -1) {
|
||||
- builder.config.cflags.push('-march=native');
|
||||
- if (NO_MARCH_FLAG.indexOf(process.arch) == -1) {
|
||||
- args.unshift('-march=native');
|
||||
- }
|
||||
- }
|
||||
-
|
||||
|
|
@ -49,7 +53,7 @@ diff -up ./node_build/make.js.dyn ./node_build/make.js
|
|||
|
||||
}).nThen(function (waitFor) {
|
||||
|
||||
@@ -430,7 +395,7 @@ Builder.configure({
|
||||
@@ -442,7 +403,7 @@ Builder.configure({
|
||||
builder.buildExecutable('crypto/random/randombytes.c');
|
||||
|
||||
builder.lintFiles(function (fileName, file, callback) {
|
||||
|
|
|
|||
45
cjdns.spec
45
cjdns.spec
|
|
@ -2,25 +2,40 @@
|
|||
# Fedora review: http://bugzilla.redhat.com/1268716
|
||||
|
||||
# Option to enable SUBNODE mode (WIP)
|
||||
# Fedora generally runs on systems that easily support a full node
|
||||
%bcond_with subnode
|
||||
# Option to use the optimized libnacl embedded with cjdns
|
||||
# Required since v20 due to use of private cnacl APIs
|
||||
%bcond_without embedded
|
||||
# Option to enable CPU specific optimization
|
||||
# Default to generic for distro builds
|
||||
%bcond_without generic
|
||||
# Option to use libsodium instead of nacl (broken since v20)
|
||||
%bcond_with libsodium
|
||||
# Option to disable SECCOMP: confusing backward logic
|
||||
# Needed to run on openvz and other container systems
|
||||
%bcond_without seccomp
|
||||
|
||||
%if %{with subnode} || %{with embedded}
|
||||
|
||||
%if %{with embedded}
|
||||
%global use_embedded 1
|
||||
%else
|
||||
%global use_embedded 0
|
||||
%endif
|
||||
# Use libsodium instead of nacl
|
||||
%global use_libsodium 1
|
||||
# Option to disable SECCOMP: confusing backward logic
|
||||
%bcond_without seccomp
|
||||
|
||||
%if 0%{use_libsodium}
|
||||
%if %{with generic}
|
||||
%global generic_build 1
|
||||
%else
|
||||
%global generic_build 0
|
||||
%endif
|
||||
|
||||
%if %{with libsodium}
|
||||
%global use_libsodium 1
|
||||
%global nacl_name libsodium
|
||||
%global nacl_version 1.0.14
|
||||
%global nacl_lib %{_libdir}/libsodium.so
|
||||
%else
|
||||
%global use_libsodium 0
|
||||
%global nacl_name nacl
|
||||
%global nacl_version 20110221
|
||||
%global nacl_lib %{_libdir}/libnacl.so
|
||||
|
|
@ -50,7 +65,7 @@
|
|||
Name: cjdns
|
||||
# major version is cjdns protocol version:
|
||||
Version: 20.2
|
||||
Release: 3%{?dist}
|
||||
Release: 4%{?dist}
|
||||
Summary: The privacy-friendly network without borders
|
||||
Group: System Environment/Base
|
||||
# cjdns is all GPLv3 except libuv which is MIT and BSD and ISC
|
||||
|
|
@ -116,7 +131,7 @@ BuildRequires: nodejs, nodejs-ronn, python2
|
|||
# Automated package review hates explicit BR on make, but it *is* needed
|
||||
BuildRequires: make
|
||||
|
||||
%if !%{use_embedded}
|
||||
%if !0%{use_embedded}
|
||||
# x86_64 and ARM libnacl are not compiled with -fPIC before Fedora release 11.
|
||||
BuildRequires: %{nacl_name}-devel >= %{nacl_version}
|
||||
%endif
|
||||
|
|
@ -202,7 +217,9 @@ Python graphing tools for cjdns.
|
|||
|
||||
cp %{SOURCE2} contrib/systemd
|
||||
|
||||
%if !%{use_embedded}
|
||||
%if 0%{use_embedded}
|
||||
# disable CPU opt
|
||||
%else !use_embedded
|
||||
# use system nacl library if provided.
|
||||
if test -x %{nacl_lib}; then
|
||||
%if 0%{use_libsodium}
|
||||
|
|
@ -233,7 +250,9 @@ fi
|
|||
#patch14 -b .entropy
|
||||
#patch15 -b .benc
|
||||
%patch16 -b .python3
|
||||
%if 0%{use_embedded}
|
||||
%patch17 -p1 -b .s390x
|
||||
%endif
|
||||
|
||||
cp %{SOURCE1} README_Fedora.md
|
||||
|
||||
|
|
@ -269,6 +288,14 @@ EOF
|
|||
|
||||
chmod a+x cjdns-up.sh
|
||||
|
||||
%if %{generic_build}
|
||||
sed -i -e 's/-march=native/-mtune=generic/' node_build/make.js
|
||||
rm node_build/dependencies/cnacl/node_build/plans/*_AVX_plan.json
|
||||
# Leaving SSE2 code in since x86 is secondary arch and pretty much everyone
|
||||
# is going to have SSE2, except things like XO-1 which needs custom build.
|
||||
#rm node_build/dependencies/cnacl/node_build/plans/x86_SSE2_plan.json
|
||||
%endif
|
||||
|
||||
# FIXME: grep Version_CURRENT_PROTOCOL util/version/Version.h and
|
||||
# check that it matches major %%{version}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue