Apache OpenOffice (AOO) Bugzilla – Full Text Issue Listing |
Summary: | javadoc fails to build | ||||||||
---|---|---|---|---|---|---|---|---|---|
Product: | General | Reporter: | hramrach | ||||||
Component: | code | Assignee: | AOO issues mailing list <issues> | ||||||
Status: | CLOSED FIXED | QA Contact: | |||||||
Severity: | Trivial | ||||||||
Priority: | P5 (lowest) | CC: | alp, kschenk, pescetti | ||||||
Version: | 4.2.0-dev | Flags: | pescetti:
4.1.2_release_blocker+
|
||||||
Target Milestone: | --- | ||||||||
Hardware: | PC | ||||||||
OS: | Linux, all | ||||||||
Issue Type: | DEFECT | Latest Confirmation in: | --- | ||||||
Developer Difficulty: | --- | ||||||||
Attachments: |
|
Description
hramrach
2015-04-22 08:55:50 UTC
What version of java are you using? My build on linux-32 with an older java 7 is fine. What version of GNU patch are you using? Created attachment 84831 [details]
Don't patch files accross ../
The issue seems to be in GNU patch - it refuses to patch files outside of current directory:
$ echo aa> file1
$ echo bb> file2
$ mkdir 1
$ diff -u file1 file2> 1/patch
$ cd 1
$ patch ../file1 patch
Invalid file name ../file1 -- skipping patch
And OO makes
patch ../../unxsogi.pro/bin/odkcommon/docs/java/ref/index.html idl_ref_javadoc.patch
which leads to
Invalid file name ../../unxsogi.pro/bin/odkcommon/docs/java/ref/index.html -- skipping patch
Thanks for looking into this. I have GNU patch 2.7.5 I will try the attached patch later ok, it seems javadoc works with this patch. I suggest that we include this patch in 4.1.2: - One-line patch - Fixes a build problem when using a recent version of GNU Patch, which does not support patching files in the ".." directory any longer, see http://savannah.gnu.org/forum/forum.php?forum_id=7361 - Affects the build process only and not the program operations It is needed unless one builds with --disable-odk or on an old system; so it's very helpful to include it in 4.1.2. "pescetti" committed SVN revision 1700078 into trunk: #i126258# Fix build on systems using a recent version of GNU Patch. As discussed on dev list: accepted for OpenOffice 4.1.2. "pescetti" committed SVN revision 1705171 into branches/AOO410: #i126258# Fix build on systems using a recent version of GNU Patch. Committed to both trunk and AOO410 for OpenOffice 4.1.2. @Alexander: Thank you for the fix! Closing, no QA needed since this is a build fix. |