Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for empty SONAME record in webkit-webos shared library #21

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion Tools/Scripts/webkitdirs.pm
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down