From 8bca5ee3a8d7cd6dea4827668964356bc28c0722 Mon Sep 17 00:00:00 2001 From: Herb Kuta Date: Mon, 10 Dec 2012 16:35:03 -0800 Subject: [PATCH] Fix for empty SONAME record in webkit-webos shared library Rather than try to figure out why qmake is appending the extraneous empty -W1,-soname, just sed it away from all of the Makefiles generated by it. [OWEBOS-2534] Build webkit-webos shared library with a valid SONAME record Open-webOS-DCO-1.0-Signed-off-by: Herb Kuta --- Tools/Scripts/webkitdirs.pm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Tools/Scripts/webkitdirs.pm b/Tools/Scripts/webkitdirs.pm index b004516a064..25f6115581e 100755 --- a/Tools/Scripts/webkitdirs.pm +++ b/Tools/Scripts/webkitdirs.pm @@ -2324,7 +2324,11 @@ sub buildQMakeProjects if ($clean) { $command = "$command distclean"; } elsif ($buildHint eq "incremental") { - $command = "$command incremental"; + # Interpose sed-ing to remove the extraneous "-Wl,-soname," added by qmake to link command lines that causes SONAME + # records to be empty between the "make -f Makefile qmake" (which generates the makefiles) and the "make -f Makefile" + # that "make incremental" does. + $command = "$command -f Makefile qmake && find . -name 'Makefile*' | xargs sed -i -e 's/-Wl,-soname, //' -e 's/-Wl,-soname,\$//' && $command -f Makefile" + # $command = "$command incremental"; } print "Calling '$command' in " . $dir . "\n\n";