Bug 44599 - some jhbuild out-of-tree fixes
Summary: some jhbuild out-of-tree fixes
Status: RESOLVED FIXED
Alias: None
Product: PolicyKit
Classification: Unclassified
Component: libpolkit (show other bugs)
Version: unspecified
Hardware: Other All
: medium normal
Assignee: David Zeuthen (not reading bugmail)
QA Contact: David Zeuthen (not reading bugmail)
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-01-09 07:34 UTC by Allison Lortie (desrt)
Modified: 2012-01-10 12:03 UTC (History)
0 users

See Also:
i915 platform:
i915 features:


Attachments
Various builddir != srcdir fixes (4.61 KB, patch)
2012-01-09 07:34 UTC, Allison Lortie (desrt)
Details | Splinter Review
updated patch (4.72 KB, patch)
2012-01-09 08:30 UTC, Allison Lortie (desrt)
Details | Splinter Review
fixed patch (5.22 KB, patch)
2012-01-10 10:48 UTC, Allison Lortie (desrt)
Details | Splinter Review

Note You need to log in before you can comment on or make changes to this bug.
Description Allison Lortie (desrt) 2012-01-09 07:34:28 UTC
Created attachment 55336 [details] [review]
Various builddir != srcdir fixes

jhbuild calls autogen.sh from out of tree (whereas out-of-tree tarball builds don't call autogen at all).  this introduces a whole new set of issues.

see patch.
Comment 1 Allison Lortie (desrt) 2012-01-09 08:30:26 UTC
Created attachment 55341 [details] [review]
updated patch

the previous patch failed to build if polkit was not installed on the system.  this should fix that.
Comment 2 David Zeuthen (not reading bugmail) 2012-01-10 10:05:57 UTC
(In reply to comment #1)
> Created attachment 55341 [details] [review] [review]
> updated patch
> 
> the previous patch failed to build if polkit was not installed on the system. 
> this should fix that.

Patch does not apply:

$ git am -s ~/Downloads/polkit-build-fixes.patch
Applying: Various builddir != srcdir fixes
error: patch failed: autogen.sh:17
error: autogen.sh: patch does not apply
Patch failed at 0001 Various builddir != srcdir fixes
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".
Comment 3 Allison Lortie (desrt) 2012-01-10 10:48:05 UTC
Created attachment 55393 [details] [review]
fixed patch

ah sorry.

i had two patches applied.  i've merged them into one now (attached)
Comment 4 David Zeuthen (not reading bugmail) 2012-01-10 12:03:35 UTC
Looks good. Committed, thanks!


Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.