[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 13:37:00 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 395e6c69a918c0c9afa987d9977c442f7355274e
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Sep 21 17:44:31 2010 +0000
2010-09-21 Fridrich Strba <fridrich.strba at bluewin.ch>
Reviewed by Martin Robinson.
Fix linking issues of the GTK+ port on Windows
https://bugs.webkit.org/show_bug.cgi?id=45844
* GNUmakefile.am: link on Windows with ole32.dll, winmm.dll and shlwapi.dll
* configure.ac: link on Windows with ole32.dll, winmm.dll and shlwapi.dll
and export correctly all needed symbols from the libwebkitgtk DLL.
2010-09-21 Fridrich Strba <fridrich.strba at bluewin.ch>
Reviewed by Martin Robinson.
Build issues with Windows versions of the GTK+ port
https://bugs.webkit.org/show_bug.cgi?id=45844
Link with winmm.dll when necessary and specify the executable extension
explicitely so that the Programs/jsc- at WEBKITGTK_API_MAJOR_VERSION@
rule actually works.
Don't try to build the ThreadSpecificWin.cpp since GTK+ port uses
a section in ThreadSpecific.cpp
* GNUmakefile.am:
2010-09-21 Fridrich Strba <fridrich.strba at bluewin.ch>
Reviewed by Martin Robinson.
Fix linking problems on Windows.
https://bugs.webkit.org/show_bug.cgi?id=45844
* GNUmakefile.am: link the executables with winmm.dll
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67963 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/ChangeLog b/ChangeLog
index 8db9c73..d935052 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-09-21 Fridrich Strba <fridrich.strba at bluewin.ch>
+
+ Reviewed by Martin Robinson.
+
+ Fix linking issues of the GTK+ port on Windows
+ https://bugs.webkit.org/show_bug.cgi?id=45844
+
+ * GNUmakefile.am: link on Windows with ole32.dll, winmm.dll and shlwapi.dll
+ * configure.ac: link on Windows with ole32.dll, winmm.dll and shlwapi.dll
+ and export correctly all needed symbols from the libwebkitgtk DLL.
+
2010-09-21 Xan Lopez <xlopez at igalia.com>
Reviewed by Martin Robinson.
diff --git a/GNUmakefile.am b/GNUmakefile.am
index 03cad1a..c769db2 100644
--- a/GNUmakefile.am
+++ b/GNUmakefile.am
@@ -101,7 +101,7 @@ global_cxxflags += \
# It breaks the build on other platforms, so we use it conditionally
if OS_WIN32
no_undefined = -no-undefined
-version_script = -export-symbols-regex "^(webkit_|JS).*"
+version_script = -export-symbols-regex "^(webkit_|k?JS).*"
endif
if OS_GNU
@@ -245,7 +245,10 @@ libwebkitgtk_ at WEBKITGTK_API_MAJOR_VERSION@_ at WEBKITGTK_API_MINOR_VERSION@_la_LIBA
$(PNG_LIBS) \
$(SQLITE3_LIBS) \
$(UNICODE_LIBS) \
- $(XT_LIBS)
+ $(XT_LIBS) \
+ $(WINMM_LIBS) \
+ $(SHLWAPI_LIBS) \
+ $(OLE32_LIBS)
#
# Extra checks and flags
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 2481142..649233c 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-09-21 Fridrich Strba <fridrich.strba at bluewin.ch>
+
+ Reviewed by Martin Robinson.
+
+ Build issues with Windows versions of the GTK+ port
+ https://bugs.webkit.org/show_bug.cgi?id=45844
+
+ Link with winmm.dll when necessary and specify the executable extension
+ explicitely so that the Programs/jsc- at WEBKITGTK_API_MAJOR_VERSION@
+ rule actually works.
+
+ Don't try to build the ThreadSpecificWin.cpp since GTK+ port uses
+ a section in ThreadSpecific.cpp
+
+ * GNUmakefile.am:
+
2010-09-21 Martin Robinson <mrobinson at igalia.com>
Reviewed by Xan Lopez.
diff --git a/JavaScriptCore/GNUmakefile.am b/JavaScriptCore/GNUmakefile.am
index 2bf2cb8..88d1761 100644
--- a/JavaScriptCore/GNUmakefile.am
+++ b/JavaScriptCore/GNUmakefile.am
@@ -546,7 +546,6 @@ javascriptcore_sources += \
if TARGET_WIN32
javascriptcore_sources += \
- JavaScriptCore/wtf/ThreadSpecificWin.cpp \
JavaScriptCore/runtime/MarkStackWin.cpp
else
javascriptcore_sources += \
@@ -586,7 +585,7 @@ JavaScriptCore/pcre/chartables.c: $(srcdir)/JavaScriptCore/pcre/dftables
$(AM_V_GEN)$(PERL) $^ $@
bin_PROGRAMS += \
- Programs/jsc- at WEBKITGTK_API_MAJOR_VERSION@
+ Programs/jsc- at WEBKITGTK_API_MAJOR_VERSION@$(EXEEXT)
noinst_PROGRAMS += \
Programs/jsc \
@@ -616,6 +615,7 @@ Programs_minidom_CFLAGS = \
Programs_minidom_LDADD = \
libJavaScriptCore.la \
+ $(WINMM_LIBS) \
-lm \
-lstdc++
@@ -624,8 +624,8 @@ Programs_minidom_LDFLAGS = \
-no-fast-install
# jsc
-Programs/jsc- at WEBKITGTK_API_MAJOR_VERSION@: Programs/jsc
- $(AM_V_GEN)cp -f Programs/jsc Programs/jsc- at WEBKITGTK_API_MAJOR_VERSION@
+Programs/jsc- at WEBKITGTK_API_MAJOR_VERSION@$(EXEEXT): Programs/jsc$(EXEEXT)
+ $(AM_V_GEN)cp -f Programs/jsc$(EXEEXT) Programs/jsc- at WEBKITGTK_API_MAJOR_VERSION@$(EXEEXT)
Programs_jsc_ at WEBKITGTK_API_MAJOR_VERSION@_LDADD =
Programs_jsc_ at WEBKITGTK_API_MAJOR_VERSION@_SOURCES =
@@ -644,7 +644,8 @@ Programs_jsc_CXXFLAGS = \
$(UNICODE_CFLAGS)
Programs_jsc_LDADD = \
- libJavaScriptCore.la
+ libJavaScriptCore.la \
+ $(WINMM_LIBS)
EXTRA_DIST += \
JavaScriptCore/AUTHORS \
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index f805512..5c8134a 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-21 Fridrich Strba <fridrich.strba at bluewin.ch>
+
+ Reviewed by Martin Robinson.
+
+ Fix linking problems on Windows.
+ https://bugs.webkit.org/show_bug.cgi?id=45844
+
+ * GNUmakefile.am: link the executables with winmm.dll
+
2010-09-21 Adam Barth <abarth at webkit.org>
Reviewed by Eric Seidel.
diff --git a/WebKitTools/GNUmakefile.am b/WebKitTools/GNUmakefile.am
index 292ca7e..e384101 100644
--- a/WebKitTools/GNUmakefile.am
+++ b/WebKitTools/GNUmakefile.am
@@ -24,7 +24,8 @@ Programs_GtkLauncher_CFLAGS = \
Programs_GtkLauncher_LDADD = \
libwebkitgtk- at WEBKITGTK_API_MAJOR_VERSION@. at WEBKITGTK_API_MINOR_VERSION@.la \
$(GTK_LIBS) \
- $(GLIB_LIBS)
+ $(GLIB_LIBS) \
+ $(WINMM_LIBS)
Programs_GtkLauncher_LDFLAGS = \
-no-fast-install \
@@ -100,7 +101,8 @@ Programs_DumpRenderTree_LDADD = \
$(GTK_LIBS) \
$(GLIB_LIBS) \
$(LIBSOUP_LIBS) \
- $(FREETYPE_LIBS)
+ $(FREETYPE_LIBS) \
+ $(WINMM_LIBS)
Programs_DumpRenderTree_LDFLAGS = \
-no-fast-install \
diff --git a/configure.ac b/configure.ac
index 29ba3ae..dea741a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -167,6 +167,17 @@ if test "$png_ok" != yes; then
fi
AC_SUBST([PNG_LIBS])
+
+if test "$os_win32" = "yes"; then
+ WINMM_LIBS=-lwinmm
+ SHLWAPI_LIBS=-lshlwapi
+ OLE32_LIBS=-lole32
+fi
+AC_SUBST([WINMM_LIBS])
+AC_SUBST([SHLWAPI_LIBS])
+AC_SUBST([OLE32_LIBS])
+
+
# determine the GTK+ version to use
AC_MSG_CHECKING([the GTK+ version to use])
AC_ARG_WITH([gtk],
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list