[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-34-g43a6bb2
Gustavo Noronha Silva
gustavo.noronha at collabora.co.uk
Wed Oct 7 06:25:34 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit 3baf4c1534d991a98256ebcf431e5513ba8a8b91
Author: xan at webkit.org <xan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Sep 22 16:24:57 2009 +0000
2009-09-22 Philippe Normand <pnormand at igalia.com>
Reviewed by Xan Lopez.
link errors due to wrong UNICODE_LIBS on Ubuntu Jaunty
https://bugs.webkit.org/show_bug.cgi?id=29638
Call icu-cconfig with ldflags-libsonly to prevent having a -L
statement that could override libs installed in another prefix.
* autotools/webkit.m4:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48636 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/ChangeLog b/ChangeLog
index fa21b69..164fdf7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2009-09-22 Philippe Normand <pnormand at igalia.com>
+
+ Reviewed by Xan Lopez.
+
+ link errors due to wrong UNICODE_LIBS on Ubuntu Jaunty
+ https://bugs.webkit.org/show_bug.cgi?id=29638
+
+ Call icu-cconfig with ldflags-libsonly to prevent having a -L
+ statement that could override libs installed in another prefix.
+
+ * autotools/webkit.m4:
+
2009-09-22 Gustavo Noronha Silva <gustavo.noronha at collabora.co.uk>
Unreviewed. Bump version for 1.1.15.1 release.
diff --git a/autotools/webkit.m4 b/autotools/webkit.m4
index 92fe5db..5bb4f65 100644
--- a/autotools/webkit.m4
+++ b/autotools/webkit.m4
@@ -160,7 +160,7 @@ if test "$with_unicode_backend" = "icu" -o "$with_unicode_backend" = "glib"; the
# necessarily want, like debugging and optimization flags
# See man (1) icu-config for more info.
UNICODE_CFLAGS=`$icu_config --cppflags`
- UNICODE_LIBS=`$icu_config --ldflags`
+ UNICODE_LIBS=`$icu_config --ldflags-libsonly`
fi
fi
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list