1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
|
Real tweaks for http://gcc.gnu.org/bugzilla/show_bug.cgi?id=28442
never be upstreamed. correct solution might be upgrading libtool(?)
--- libjava/configure.orig Sat Jul 15 07:34:33 2006
+++ libjava/configure Fri Jul 21 16:37:48 2006
@@ -5867,6 +5867,7 @@
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh $ac_aux_dir/ltcf-c.sh"
+cp %%LOCALBASE%%/bin/libtool .
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
--- libjava/classpath/configure~ Wed Jun 14 22:46:33 2006
+++ libjava/classpath/configure Fri Jul 21 16:38:43 2006
@@ -5449,6 +5449,7 @@
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh $ac_aux_dir/ltcf-c.sh"
+cp %%LOCALBASE%%/bin/libtool .
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
--- ltconfig~ Wed Jul 5 05:30:34 2006
+++ ltconfig Fri Jul 21 19:59:52 2006
@@ -2236,7 +2236,7 @@
EOF
else
echo "appending configuration tag \"$tagname\" to $ofile"
- echo "### BEGIN LIBTOOL TAG CONFIG: $tagname" >> "$ofile"
+ echo "# ### BEGIN LIBTOOL TAG CONFIG: $tagname" >> "$ofile"
fi
cfgfile="$ofile"
;;
@@ -2266,7 +2266,7 @@
EOF
else
echo "appending to $cfgfile"
- echo "### BEGIN LIBTOOL TAG CONFIG: $tagname" >> "$ofile"
+ echo "# ### BEGIN LIBTOOL TAG CONFIG: $tagname" >> "$ofile"
fi
;;
esac
--- libjava/classpath/ltconfig~ Wed Jul 5 05:30:34 2006
+++ libjava/classpath/ltconfig Fri Jul 21 20:00:44 2006
@@ -2236,7 +2236,7 @@
EOF
else
echo "appending configuration tag \"$tagname\" to $ofile"
- echo "### BEGIN LIBTOOL TAG CONFIG: $tagname" >> "$ofile"
+ echo "# ### BEGIN LIBTOOL TAG CONFIG: $tagname" >> "$ofile"
fi
cfgfile="$ofile"
;;
@@ -2266,7 +2266,7 @@
EOF
else
echo "appending to $cfgfile"
- echo "### BEGIN LIBTOOL TAG CONFIG: $tagname" >> "$ofile"
+ echo "# ### BEGIN LIBTOOL TAG CONFIG: $tagname" >> "$ofile"
fi
;;
esac
--- libjava/configure~ Sun Jul 23 11:01:24 2006
+++ libjava/configure Sun Jul 23 11:04:35 2006
@@ -6118,11 +6118,11 @@
objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
deplibs_check_method="$deplibs_check_method" \
file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
---build="$build" --add-tag=CXX $ac_aux_dir/ltcf-cxx.sh $host \
-|| { { echo "$as_me:$LINENO: error: libtool tag configuration failed" >&5
-echo "$as_me: error: libtool tag configuration failed" >&2;}
- { (exit 1); exit 1; }; }
+#${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
+#--build="$build" --add-tag=CXX $ac_aux_dir/ltcf-cxx.sh $host \
+#|| { { echo "$as_me:$LINENO: error: libtool tag configuration failed" >&5
+#echo "$as_me: error: libtool tag configuration failed" >&2;}
+# { (exit 1); exit 1; }; }
CC="$lt_save_CC"
CFLAGS="$lt_save_CFLAGS"
|
