[SCM] eq10q/master: Remove redundant amd64 cflags.
mira-guest at users.alioth.debian.org
mira-guest at users.alioth.debian.org
Tue Dec 13 14:33:49 UTC 2016
The following commit has been merged in the master branch:
commit 62149285029b8b38d673cd20807c281367978859
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date: Tue Dec 13 15:26:15 2016 +0100
Remove redundant amd64 cflags.
diff --git a/debian/patches/05-pass_debug_flags.patch b/debian/patches/05-pass_debug_flags.patch
deleted file mode 100644
index 2310776..0000000
--- a/debian/patches/05-pass_debug_flags.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Pass debug flags.
-Author: Jaromír Mikeš <mira.mikes at seznam.cz>
-Forwarded: no
-
-Index: eq10q/CMakeLists.txt
-===================================================================
---- eq10q.orig/CMakeLists.txt
-+++ eq10q/CMakeLists.txt
-@@ -3,10 +3,10 @@ cmake_minimum_required(VERSION 2.8)
- PROJECT(eq10q)
-
- ##ADD_DEFINITIONS(-Wall -O3 -fPIC -finline-functions -finline-functions-called-once -msse -mfpmath=sse -std=c99)
--set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -O3 -fPIC -finline-functions -finline-functions-called-once -std=c99")
-+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -O3 -g -fPIC -finline-functions -finline-functions-called-once -std=c99")
- #set(CMAKE_C_FLAGS "-Wall -O0 -g -fPIC -finline-functions -finline-functions-called-once -msse -mfpmath=sse -std=c99")
-
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fPIC -std=c++11")
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -O3 -g -fPIC -DPIC -std=c++11")
- #set(CMAKE_CXX_FLAGS "-Wall -O0 -g -fPIC -DPIC -std=c++11") ##Debuging GUI
-
- ##ADD_DEFINITIONS(-Wall -O0 -g -fPIC -DPIC) ###USED FOR DEBUG
diff --git a/debian/patches/series b/debian/patches/series
index be7a332..d067d26 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@
02-remove_sse_flags.patch
03-fix_flags.patch
04-spelling.patch
-05-pass_debug_flags.patch
diff --git a/debian/rules b/debian/rules
index 82bdac3..5a0c00c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,10 +5,6 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed
-ifeq ($(DEB_HOST_ARCH_CPU),amd64)
-export CFLAGS += -msse -msse2 -mfpmath=sse
-endif
-
%:
dh $@
--
eq10q packaging
More information about the pkg-multimedia-commits
mailing list