[webkitgtk4] Build bmalloc as static library

Tomas Popela tpopela at fedoraproject.org
Wed Feb 18 12:49:18 UTC 2015


commit 88d55aea1cefa12c0923694cf206db9fef3d78ef
Author: Tomas Popela <tpopela at redhat.com>
Date:   Wed Feb 18 13:48:30 2015 +0100

    Build bmalloc as static library

 webkitgtk-2.7.90-bmalloc_static.patch |   11 +++++++++++
 webkitgtk4.spec                       |    2 ++
 2 files changed, 13 insertions(+), 0 deletions(-)
---
diff --git a/webkitgtk-2.7.90-bmalloc_static.patch b/webkitgtk-2.7.90-bmalloc_static.patch
new file mode 100644
index 0000000..1023a7e
--- /dev/null
+++ b/webkitgtk-2.7.90-bmalloc_static.patch
@@ -0,0 +1,11 @@
+diff -up webkitgtk-2.7.90/Source/bmalloc/CMakeLists.txt.bmalloc_static webkitgtk-2.7.90/Source/bmalloc/CMakeLists.txt
+--- webkitgtk-2.7.90/Source/bmalloc/CMakeLists.txt.bmalloc_static	2015-02-18 13:31:30.528156987 +0100
++++ webkitgtk-2.7.90/Source/bmalloc/CMakeLists.txt	2015-02-18 13:31:37.828270570 +0100
+@@ -17,6 +17,6 @@ set(bmalloc_SOURCES
+ 
+ WEBKIT_WRAP_SOURCELIST(${bmalloc_SOURCES})
+ include_directories(${bmalloc_INCLUDE_DIRECTORIES})
+-add_library(bmalloc ${bmalloc_SOURCES})
++add_library(bmalloc STATIC ${bmalloc_SOURCES})
+ target_link_libraries(bmalloc ${bmalloc_LIBRARIES})
+ set_target_properties(bmalloc PROPERTIES COMPILE_DEFINITIONS "BUILDING_bmalloc")
diff --git a/webkitgtk4.spec b/webkitgtk4.spec
index 3723d31..8176951 100644
--- a/webkitgtk4.spec
+++ b/webkitgtk4.spec
@@ -25,6 +25,7 @@ Patch4:         webkitgtk-2.7.90-180234.patch
 Patch5:         webkitgtk-2.7.90-180248.patch
 # https://bugs.webkit.org/show_bug.cgi?id=141618
 Patch6:         webkitgtk-2.7.90-180258.patch
+Patch7:         webkitgtk-2.7.90-bmalloc_static.patch
 
 BuildRequires:  at-spi2-core-devel
 BuildRequires:  bison
@@ -103,6 +104,7 @@ This package contains developer documentation for %{name}.
 %patch4 -p1 -b .180234
 %patch5 -p1 -b .180248
 %patch6 -p1 -b .180258
+%patch7 -p1 -b .bmalloc_static
 
 # Remove bundled libraries
 rm -rf Source/ThirdParty/leveldb/


More information about the scm-commits mailing list