Commit 24798477 authored by Felipe Sateler's avatar Felipe Sateler

Remove autodetection of raspberry cpus

In debian we don't actually target raspberries, and guessing based on the build machine
is wrong too

Closes: #878347
parent b2fe91c2
......@@ -4,16 +4,14 @@ Subject: Disable 128bit float constants.
They conflict with --std=c++11 (ie, additional flags are required),
but are not used, so just skip that
Forwarded: https://github.com/supercollider/supercollider/pull/3227
---
lang/LangPrimSource/PyrMathPrim.cpp | 1 +
1 file changed, 1 insertion(+)
Index: supercollider/lang/LangPrimSource/PyrMathPrim.cpp
===================================================================
--- supercollider.orig/lang/LangPrimSource/PyrMathPrim.cpp
+++ supercollider/lang/LangPrimSource/PyrMathPrim.cpp
diff --git a/lang/LangPrimSource/PyrMathPrim.cpp b/lang/LangPrimSource/PyrMathPrim.cpp
index 16ca148..8a3b15a 100644
--- a/lang/LangPrimSource/PyrMathPrim.cpp
+++ b/lang/LangPrimSource/PyrMathPrim.cpp
@@ -34,6 +34,7 @@
#include "SC_Endian.h"
#include "SCBase.h"
......
......@@ -8,10 +8,10 @@ gcc7.1 enforces this.
server/plugins/DiskIO_UGens.cpp | 1 +
1 file changed, 1 insertion(+)
Index: supercollider/server/plugins/DiskIO_UGens.cpp
===================================================================
--- supercollider.orig/server/plugins/DiskIO_UGens.cpp
+++ supercollider/server/plugins/DiskIO_UGens.cpp
diff --git a/server/plugins/DiskIO_UGens.cpp b/server/plugins/DiskIO_UGens.cpp
index b695b70..a6a8764 100644
--- a/server/plugins/DiskIO_UGens.cpp
+++ b/server/plugins/DiskIO_UGens.cpp
@@ -28,6 +28,7 @@
#include <atomic>
......
......@@ -3,15 +3,14 @@ Date: Thu, 7 Sep 2017 19:38:46 -0300
Subject: PyrSched.cpp: #include <functional> to fix FTBFS
Bug-Debian: https://bugs.debian.org/853671
Forwarded: https://github.com/supercollider/supercollider/pull/3226
---
lang/LangPrimSource/PyrSched.cpp | 1 +
1 file changed, 1 insertion(+)
Index: supercollider/lang/LangPrimSource/PyrSched.cpp
===================================================================
--- supercollider.orig/lang/LangPrimSource/PyrSched.cpp
+++ supercollider/lang/LangPrimSource/PyrSched.cpp
diff --git a/lang/LangPrimSource/PyrSched.cpp b/lang/LangPrimSource/PyrSched.cpp
index 7d33518..2f5908e 100644
--- a/lang/LangPrimSource/PyrSched.cpp
+++ b/lang/LangPrimSource/PyrSched.cpp
@@ -37,6 +37,7 @@
#include <string.h>
#include <math.h>
......
From: Felipe Sateler <fsateler@debian.org>
Date: Thu, 12 Oct 2017 21:19:55 -0300
Subject: Remove autodetection of raspberry cpus
In debian we don't actually target raspberries, and guessing based on the build machine
is wrong too
Bug-Debian: https://bugs.debian.org/878347
---
CMakeLists.txt | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f42ed30..615e52a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -318,21 +318,6 @@ if(MINGW)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mstackrealign -fno-strict-aliasing")
endif()
-# support for building on Raspberry Pi 1/2/3 and BBB
-if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_SYSTEM_PROCESSOR STREQUAL "armv7l")
- foreach(flag CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
- set(${flag} "${${flag}} -mfloat-abi=hard")
- set(${flag} "${${flag}} -mfpu=neon")
- endforeach()
-elseif(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_SYSTEM_PROCESSOR STREQUAL "armv6l")
- foreach(flag CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
- set(${flag} "${${flag}} -march=armv6")
- set(${flag} "${${flag}} -mtune=arm1176jzf-s")
- set(${flag} "${${flag}} -mfloat-abi=hard")
- set(${flag} "${${flag}} -mfpu=vfp")
- endforeach()
-endif()
-
if (NO_GPL3)
add_definitions(-DNO_GPL3)
endif()
......@@ -6,10 +6,10 @@ Subject: adding functional header in PyrSerialPrim.cpp
lang/LangPrimSource/PyrSerialPrim.cpp | 1 +
1 file changed, 1 insertion(+)
Index: supercollider/lang/LangPrimSource/PyrSerialPrim.cpp
===================================================================
--- supercollider.orig/lang/LangPrimSource/PyrSerialPrim.cpp
+++ supercollider/lang/LangPrimSource/PyrSerialPrim.cpp
diff --git a/lang/LangPrimSource/PyrSerialPrim.cpp b/lang/LangPrimSource/PyrSerialPrim.cpp
index 7935255..45933af 100644
--- a/lang/LangPrimSource/PyrSerialPrim.cpp
+++ b/lang/LangPrimSource/PyrSerialPrim.cpp
@@ -36,6 +36,7 @@
#include <termios.h>
#include <unistd.h>
......
......@@ -3,3 +3,4 @@ Disable-128bit-float-constants.patch
adding-functional-header-in-PyrSerialPrim.cpp.patch
DiskIO_UGens-include-functional.patch
PyrSched.cpp-include-functional-to-fix-FTBFS.patch
Remove-autodetection-of-raspberry-cpus.patch
......@@ -6,10 +6,10 @@ Subject: Fix supernova build on x86
server/supernova/CMakeLists.txt | 4 ++++
1 file changed, 4 insertions(+)
Index: supercollider/server/supernova/CMakeLists.txt
===================================================================
--- supercollider.orig/server/supernova/CMakeLists.txt
+++ supercollider/server/supernova/CMakeLists.txt
diff --git a/server/supernova/CMakeLists.txt b/server/supernova/CMakeLists.txt
index c71a8dd..fda7d1d 100644
--- a/server/supernova/CMakeLists.txt
+++ b/server/supernova/CMakeLists.txt
@@ -149,6 +149,10 @@ else()
target_link_libraries(libsupernova boost_system boost_filesystem boost_program_options)
endif()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment