The following commit has been merged in the debian/experimental branch:
commit 3da4a9ba78c08f94f688b671dbb5d7b49549cb5c
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Sep 3 06:03:38 2010 +0000
2010-09-02 Lucas De Marchi <lucas.demarchi at profusion.mobi>
Reviewed by Antonio Gomes.
[EFL] Do not override custom compile flags
https://bugs.webkit.org/show_bug.cgi?id=45125
Set a default build type if and only if user did not define one as
command line options and he did not give custom CFLAGS or CXXFLAGS.
Otherwise, flags from default build type would override user-defined
ones.
* CMakeLists.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66715 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 99b6383..9e4b60e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,10 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
PROJECT(WebKit)
-IF (NOT CMAKE_BUILD_TYPE)
+# Set a default build type if and only if user did not define one as command
+# line options and he did not give custom CFLAGS or CXXFLAGS. Otherwise, flags
+# from default build type would overwrite user-defined ones.
+IF (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_C_FLAGS AND NOT CMAKE_CXX_FLAGS)
SET(CMAKE_BUILD_TYPE Release)
ENDIF ()
SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
diff --git a/ChangeLog b/ChangeLog
index 3af1bfc..8eca143 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,20 @@
Reviewed by Antonio Gomes.
+ [EFL] Do not override custom compile flags
+ https://bugs.webkit.org/show_bug.cgi?id=45125
+
+ Set a default build type if and only if user did not define one as
+ command line options and he did not give custom CFLAGS or CXXFLAGS.
+ Otherwise, flags from default build type would override user-defined
+ ones.
+
+ * CMakeLists.txt:
+
+2010-09-02 Lucas De Marchi <lucas.demarchi at profusion.mobi>
+
+ Reviewed by Antonio Gomes.
+
[EFL] Fix double addition of -fPIC
https://bugs.webkit.org/show_bug.cgi?id=45122
--
WebKit Debian packaging