Hi all,
while building libjava on i386-pc-solaris2.11 I got a failure which
reminded me to PR23653, four years back.
'find -path' is not portable. Solaris native find complains about.
The attached patch fixes this. It produces the exact same
all-classes.lst as with the -path option on a darwin, linux of freebsd
machine.
Ok for gcc trunk? If yes, could someone please commit it also to classpath?
Thanks,
Andreas
2009-12-23 Andreas Tobler <a.tob...@schweiz.org>
* tools/Makefile.am (GJDOC_EX): Use find -name pattern -prune -o.
* tools/Makefile.in: Regenerate.
Index: Makefile.am
===================================================================
--- Makefile.am (revision 155394)
+++ Makefile.am (working copy)
@@ -277,12 +277,10 @@
$(gnu_classpath_tools_gjdoc_jar_XHTML)
$(gnu_classpath_tools_gjdoc_jar_XSLS)
if !CREATE_GJDOC
-GJDOC_EX = -path '*gnu/classpath/tools/gjdoc' -prune -o \
- -path '*gnu/classpath/tools/doclets' -prune -o \
- -path '*gnu/classpath/tools/taglets' -prune -o \
- -path '*com/sun/javadoc' -prune -o \
- -path '*com/sun/tools/doclets' -prune -o \
- -path '*com/sun/tools/javadoc' -prune -o
+GJDOC_EX = -name gjdoc -prune -o \
+ -name doclets -prune -o \
+ -name taglets -prune -o \
+ -name javadoc -prune -o
endif
# The zip files with classes we want to produce.
Index: Makefile.in
===================================================================
--- Makefile.in (revision 155394)
+++ Makefile.in (working copy)
@@ -684,12 +684,10 @@
$(gnu_classpath_tools_gjdoc_jar_RNGS)
$(gnu_classpath_tools_gjdoc_jar_TXTS) \
$(gnu_classpath_tools_gjdoc_jar_XHTML)
$(gnu_classpath_tools_gjdoc_jar_XSLS)
-...@create_gjdoc_false@GJDOC_EX = -path '*gnu/classpath/tools/gjdoc' -prune -o
\
-...@create_gjdoc_false@ -path '*gnu/classpath/tools/doclets' -prune -o \
-...@create_gjdoc_false@ -path '*gnu/classpath/tools/taglets' -prune -o \
-...@create_gjdoc_false@ -path '*com/sun/javadoc' -prune -o \
-...@create_gjdoc_false@ -path '*com/sun/tools/doclets' -prune -o \
-...@create_gjdoc_false@ -path '*com/sun/tools/javadoc' -prune -o
+...@create_gjdoc_false@GJDOC_EX = -name gjdoc -prune -o \
+...@create_gjdoc_false@ -name doclets -prune -o \
+...@create_gjdoc_false@ -name taglets -prune -o \
+...@create_gjdoc_false@ -name javadoc -prune -o
# The zip files with classes we want to produce.
