[minion] update patch0 according the new CMakeLists.txt
Lameire Alexis
alexises at fedoraproject.org
Fri Jul 27 13:46:11 UTC 2012
commit a0ef29fb4d05fbefdb274621d5e9cfb8916e329a
Author: Alexis Lameire <alexisis-pristontale at hotmail.com>
Date: Fri Jul 27 15:23:37 2012 +0200
update patch0 according the new CMakeLists.txt
.gitignore | 1 +
...14-patch0-add-custom-compil-flags-options.patch | 23 ++++++++++---------
minion.spec | 2 +-
sources | 2 +-
4 files changed, 15 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 23c0834..7891e07 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/minion-0.10-linux-without-nauty.tar.gz
+/minion-0.14-linux-without-nauty.tar.gz
diff --git a/minion-0.10-patch0-add-custom-compil-flags-options.patch b/minion-0.14-patch0-add-custom-compil-flags-options.patch
similarity index 56%
rename from minion-0.10-patch0-add-custom-compil-flags-options.patch
rename to minion-0.14-patch0-add-custom-compil-flags-options.patch
index b375b42..4eede31 100644
--- a/minion-0.10-patch0-add-custom-compil-flags-options.patch
+++ b/minion-0.14-patch0-add-custom-compil-flags-options.patch
@@ -1,7 +1,7 @@
-diff -up ./CMakeLists.txt.orig1 ./CMakeLists.txt
---- ./CMakeLists.txt.orig1 2010-08-17 23:09:58.793570098 +0200
-+++ ./CMakeLists.txt 2010-08-17 23:16:11.843687072 +0200
-@@ -155,6 +155,20 @@ if(APPLEMAC)
+diff -up ./CMakeLists.txt.orig ./CMakeLists.txt
+--- ./CMakeLists.txt.orig 2012-04-09 12:26:46.000000000 +0200
++++ ./CMakeLists.txt 2012-07-27 15:20:11.680725855 +0200
+@@ -172,6 +172,20 @@ if(APPLEMAC)
# set(CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS} -mmacosx-version-min=10.5 )
endif()
@@ -22,12 +22,13 @@ diff -up ./CMakeLists.txt.orig1 ./CMakeLists.txt
option(STATIC "" OFF)
if(STATIC)
message(STATUS "Building static binary")
-@@ -315,7 +329,7 @@ else()
+@@ -322,7 +336,7 @@ if(UNOPTIMISED)
+ message(STATUS "Building unoptimised binary")
+ set(BINARY "${BINARY}-unoptimised")
+ set(CFLAGS "${CFLAGS} -g")
+-else()
++elseif(NOT CUSTOM_CXX_FLAGS)
+ # apparently fomit-frame-pointer is only automatically enabled for O* levels
# on machines where this doesn't affect debugging
if(WIN32 AND NOT CYGWIN)
- set(CFLAGS "${CFLAGS} /O2")
-- else()
-+ elseif(NOT CUSTOM_CXX_FLAGS)
- set(CFLAGS "${CFLAGS} -O3 -fomit-frame-pointer")
- check_cxx_compiler_flag("-mdynamic-no-pic" MAC_MDYNAMIC)
- if(MAC_MDYNAMIC)
+
diff --git a/minion.spec b/minion.spec
index b7ca433..1d53303 100644
--- a/minion.spec
+++ b/minion.spec
@@ -15,7 +15,7 @@ Source1: minion-generate-tarball.sh
# patch0 : add custom option to add capability to set the fedora flags in another variable
# patch reported to upstream : https://mail.cs.st-andrews.ac.uk/pipermail/mug/2010-August/000061.html
#
-Patch0: %{name}-0.10-patch0-add-custom-compil-flags-options.patch
+Patch0: %{name}-0.14-patch0-add-custom-compil-flags-options.patch
BuildRequires: cmake
BuildRequires: boost-devel
diff --git a/sources b/sources
index f12e2e3..8314722 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f0899da48f55dac68293dab858a51766 minion-0.10-linux-without-nauty.tar.gz
+fb235559c0453893280cff7997d5e9f0 minion-0.14-linux-without-nauty.tar.gz
More information about the scm-commits
mailing list