summaryrefslogtreecommitdiffstats
path: root/recipes-core/classpath/classpath-0.99/autotools.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-core/classpath/classpath-0.99/autotools.patch')
-rw-r--r--recipes-core/classpath/classpath-0.99/autotools.patch118
1 files changed, 118 insertions, 0 deletions
diff --git a/recipes-core/classpath/classpath-0.99/autotools.patch b/recipes-core/classpath/classpath-0.99/autotools.patch
new file mode 100644
index 0000000..6a077a0
--- /dev/null
+++ b/recipes-core/classpath/classpath-0.99/autotools.patch
@@ -0,0 +1,118 @@
1Index: classpath-0.99/configure.ac
2===================================================================
3--- classpath-0.99.orig/configure.ac 2012-03-08 19:03:15.000000000 +0100
4+++ classpath-0.99/configure.ac 2012-07-18 23:16:41.047796558 +0200
5@@ -42,6 +42,9 @@
6 AC_CONFIG_HEADERS([include/config.h])
7 AC_PREFIX_DEFAULT(/usr/local/classpath)
8
9+AC_PROG_MKDIR_P
10+AM_ICONV_LINK
11+
12 dnl -----------------------------------------------------------
13 dnl Enable collections.jar (disabled by default)
14 dnl -----------------------------------------------------------
15@@ -382,6 +385,7 @@
16 AC_PROG_CC
17 AM_PROG_CC_C_O
18 AC_PROG_CPP
19+AM_PROG_CC_C_O
20
21 # Handle -Werror default case.
22 if test "$ENABLE_WERROR" = default; then
23Index: classpath-0.99/examples/Makefile.am
24===================================================================
25--- classpath-0.99.orig/examples/Makefile.am 2008-09-14 18:49:43.000000000 +0200
26+++ classpath-0.99/examples/Makefile.am 2012-07-18 23:17:58.604498498 +0200
27@@ -96,9 +96,9 @@
28 endif
29
30 $(EXAMPLE_ZIP): $(EXAMPLE_JAVA_FILES)
31- @mkdir_p@ classes/gnu/classpath/examples/icons
32+ $(MKDIR_P) classes/gnu/classpath/examples/icons
33 cp $(EXAMPLE_ICONS) classes/gnu/classpath/examples/icons
34- @mkdir_p@ classes/gnu/classpath/examples/swing
35+ $(MKDIR_P) classes/gnu/classpath/examples/swing
36 cp $(EXAMPLE_HTML) classes/gnu/classpath/examples/swing
37 $(JCOMPILER) -d classes $(EXAMPLE_JAVA_FILES)
38 (cd classes; \
39Index: classpath-0.99/lib/Makefile.am
40===================================================================
41--- classpath-0.99.orig/lib/Makefile.am 2011-05-29 11:07:06.000000000 +0200
42+++ classpath-0.99/lib/Makefile.am 2012-07-18 23:18:55.769018757 +0200
43@@ -83,18 +83,18 @@
44 resources: copy-vmresources.sh
45 @list=`cd $(top_srcdir)/resource && $(FIND) gnu java javax org -name \*\.properties -print -o -name \*\.css -print`; for p in $$list; do \
46 dirname=`dirname $$p`; \
47- if ! test -d "$$dirname"; then @mkdir_p@ "$$dirname"; fi; \
48+ if ! test -d "$$dirname"; then $(MKDIR_P) "$$dirname"; fi; \
49 cp $(top_srcdir)/resource/$$p $$p; \
50 done
51 @list=`cd $(top_srcdir)/resource && $(FIND) META-INF -name CVS -prune -o -name .svn -prune -o -name \*\.in -prune -o -type f -print`; for p in $$list; do \
52 dirname=`dirname $$p`; \
53- if ! test -d "$$dirname"; then @mkdir_p@ "$$dirname"; fi; \
54+ if ! test -d "$$dirname"; then $(MKDIR_P) "$$dirname"; fi; \
55 cp $(top_srcdir)/resource/$$p $$p; \
56 done
57 @$(SHELL) ./copy-vmresources.sh
58 @list=`cd $(top_srcdir) && $(FIND) gnu/javax/swing/plaf/gtk/icons -name *.png -type f -print`; for p in $$list; do \
59 dirname=`dirname $$p`; \
60- if ! test -d "$$dirname"; then @mkdir_p@ "$$dirname"; fi; \
61+ if ! test -d "$$dirname"; then $(MKDIR_P) "$$dirname"; fi; \
62 cp $(top_srcdir)/$$p $$p; \
63 done
64 touch resources
65@@ -102,7 +102,7 @@
66 classes: genclasses
67
68 $(top_builddir)/gnu/java/locale/LocaleData.java: $(top_srcdir)/scripts/generate-locale-list.sh
69- @mkdir_p@ $(top_builddir)/gnu/java/locale
70+ $(MKDIR_P) $(top_builddir)/gnu/java/locale
71 $(top_srcdir)/scripts/generate-locale-list.sh > $(top_builddir)/gnu/java/locale/LocaleData.java
72
73 genclasses: gen-classlist.sh standard.omit $(top_builddir)/gnu/java/locale/LocaleData.java gen-xpath-parser
74@@ -160,7 +160,7 @@
75 -rm -rf lists
76
77 dist-hook:
78- @mkdir_p@ $(distdir)
79+ $(MKDIR_P) $(distdir)
80 cp -pdfR $(top_srcdir)/gnu $(top_srcdir)/java $(top_srcdir)/javax $(top_srcdir)/org $(top_srcdir)/sun $(top_srcdir)/vm $(top_srcdir)/resource $(distdir)/..
81 # Delete not wanted files.
82 $(FIND) $(distdir)/../gnu $(distdir)/../java $(distdir)/../javax $(distdir)/../org $(distdir)/../sun $(distdir)/../vm $(distdir)/../resource -name CVS -print | xargs rm -fr
83Index: classpath-0.99/tools/Makefile.am
84===================================================================
85--- classpath-0.99.orig/tools/Makefile.am 2012-07-18 23:13:23.782018215 +0200
86+++ classpath-0.99/tools/Makefile.am 2012-07-18 23:20:02.701629749 +0200
87@@ -314,11 +314,11 @@
88 # so they get also included.
89 $(TOOLS_ZIP): $(ALL_TOOLS_FILES)
90 @rm -rf classes asm
91- @mkdir_p@ classes asm
92+ $(MKDIR_P) classes asm
93 if CREATE_GJDOC
94 if CREATE_GJDOC_PARSER
95 ## Generate antlr sources.
96- @mkdir_p@ $(gjdoc_gendir)/gnu/classpath/tools/gjdoc/expr
97+ $(MKDIR_P) $(gjdoc_gendir)/gnu/classpath/tools/gjdoc/expr
98 $(ANTLR) -o $(gjdoc_gendir)/gnu/classpath/tools/gjdoc/expr/ \
99 $(srcdir)/gnu/classpath/tools/gjdoc/expr/java-expression.g
100 endif
101@@ -348,7 +348,7 @@
102 sun/rmi/rmic $(GJDOC_EX) -name \*.properties -print -o -name \*.jav -print`; \
103 for p in $$list; do \
104 dirname=classes/`dirname $$p`; \
105- if ! test -d "$$dirname"; then @mkdir_p@ "$$dirname"; fi; \
106+ if ! test -d "$$dirname"; then $(MKDIR_P) "$$dirname"; fi; \
107 echo " cp $(srcdir)/resource/$$p classes/$$p"; \
108 cp $(srcdir)/resource/$$p classes/$$p; \
109 done
110@@ -356,7 +356,7 @@
111 ## Copy over gjdoc resource files.
112 for res in $(gjdoc_resources); do \
113 dir=classes/`dirname $$res`; \
114- if ! test -d "$$dir"; then @mkdir_p@ "$$dir"; fi; \
115+ if ! test -d "$$dir"; then $(MKDIR_P) "$$dir"; fi; \
116 echo " cp $(srcdir)/resource/gnu/classpath/tools/gjdoc/$$res classes/$$res"; \
117 cp $(srcdir)/resource/gnu/classpath/tools/gjdoc/$$res classes/$$res; \
118 done