1 |
vapier 07/09/08 06:46:29 |
2 |
|
3 |
Added: automake-1.6.3-test-fixes.patch |
4 |
automake-1.8.5-test-fixes.patch |
5 |
automake-1.7.9-test-fixes.patch |
6 |
Log: |
7 |
Fixup misc false test failures related to newer versions of autotools in general. |
8 |
(Portage version: 2.1.3.7) |
9 |
|
10 |
Revision Changes Path |
11 |
1.1 sys-devel/automake/files/automake-1.6.3-test-fixes.patch |
12 |
|
13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/automake/files/automake-1.6.3-test-fixes.patch?rev=1.1&view=markup |
14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/automake/files/automake-1.6.3-test-fixes.patch?rev=1.1&content-type=text/plain |
15 |
|
16 |
Index: automake-1.6.3-test-fixes.patch |
17 |
=================================================================== |
18 |
Fix the tests so they don't fail :) |
19 |
|
20 |
depcomp2: #159557 #181484 |
21 |
fix false positive when using newer autoconf -- it throws a warning based |
22 |
on dataroot which causes a failure when there was none |
23 |
|
24 |
man2: #159557 |
25 |
grab update from newer automake |
26 |
|
27 |
--- automake-1.6.3/tests/depcomp2.test |
28 |
+++ automake-1.6.3/tests/depcomp2.test |
29 |
@@ -17,4 +17,5 @@ |
30 |
cat > Makefile.am << 'END' |
31 |
SUBDIRS = subdir |
32 |
+datarootdir = @datarootdir@ |
33 |
END |
34 |
|
35 |
--- automake-1.6.3/tests/man2.test |
36 |
+++ automake-1.6.3/tests/man2.test |
37 |
@@ -23,7 +23,7 @@ |
38 |
$AUTOMAKE |
39 |
|
40 |
# Let's play with $DESTDIR too, it shouldn't hurt. |
41 |
-./configure --prefix='' |
42 |
+./configure --prefix='' --mandir=/man |
43 |
DESTDIR="`pwd`/=inst" $MAKE -e SHELL=/bin/sh install |
44 |
|
45 |
test -f ./=inst/man/man2/foo.2 |
46 |
|
47 |
|
48 |
|
49 |
1.1 sys-devel/automake/files/automake-1.8.5-test-fixes.patch |
50 |
|
51 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/automake/files/automake-1.8.5-test-fixes.patch?rev=1.1&view=markup |
52 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/automake/files/automake-1.8.5-test-fixes.patch?rev=1.1&content-type=text/plain |
53 |
|
54 |
Index: automake-1.8.5-test-fixes.patch |
55 |
=================================================================== |
56 |
Fix the tests so they don't fail :) |
57 |
|
58 |
exdir2 man2 transform: #159557 #162565 |
59 |
grab updates from newer automake |
60 |
|
61 |
--- automake-1.8.5/tests/man2.test |
62 |
+++ automake-1.8.5/tests/man2.test |
63 |
@@ -41,7 +41,7 @@ |
64 |
$AUTOMAKE |
65 |
|
66 |
# Let's play with $DESTDIR too, it shouldn't hurt. |
67 |
-./configure --prefix='' |
68 |
+./configure --prefix='' --mandir=/man |
69 |
DESTDIR="`pwd`/_inst" $MAKE -e install |
70 |
|
71 |
test -f ./_inst/man/man2/foo.2 |
72 |
--- automake-1.8.5/tests/transform.test |
73 |
+++ automake-1.8.5/tests/transform.test |
74 |
@@ -56,7 +56,7 @@ |
75 |
$AUTOCONF |
76 |
$AUTOMAKE |
77 |
|
78 |
-./configure --program-prefix=gnu- --prefix `pwd`/inst |
79 |
+./configure --program-prefix=gnu- --prefix `pwd`/inst --mandir `pwd`/inst/man |
80 |
$MAKE |
81 |
$MAKE test-install |
82 |
$MAKE uninstall |
83 |
--- automake-1.8.5/tests/exdir2.test |
84 |
+++ automake-1.8.5/tests/exdir2.test |
85 |
@@ -25,11 +25,11 @@ |
86 |
set -e |
87 |
|
88 |
cat > Makefile.am << 'EOF' |
89 |
-html_DATA = zot.html |
90 |
+quuz_DATA = zot.html |
91 |
pkgdata_DATA = qbert |
92 |
EOF |
93 |
|
94 |
$ACLOCAL |
95 |
AUTOMAKE_fails |
96 |
grep 'pkgdatadir' stderr && exit 1 |
97 |
-grep 'Makefile.am:1:.*htmldir.*undefined' stderr |
98 |
+grep 'Makefile.am:1:.*quuzdir.*undefined' stderr |
99 |
|
100 |
|
101 |
|
102 |
1.1 sys-devel/automake/files/automake-1.7.9-test-fixes.patch |
103 |
|
104 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/automake/files/automake-1.7.9-test-fixes.patch?rev=1.1&view=markup |
105 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/automake/files/automake-1.7.9-test-fixes.patch?rev=1.1&content-type=text/plain |
106 |
|
107 |
Index: automake-1.7.9-test-fixes.patch |
108 |
=================================================================== |
109 |
Fix the tests so they don't fail :) |
110 |
|
111 |
exdir2 man2 transform: #159557 #162565 |
112 |
grab updates from newer automake |
113 |
|
114 |
mkdir-tests.m4: |
115 |
when mixing newer gettext with this automake, the tests bomb out |
116 |
as AM_PROG_MKDIR_P is not provided properly |
117 |
|
118 |
--- automake-1.7.9/tests/man2.test |
119 |
+++ automake-1.7.9/tests/man2.test |
120 |
@@ -41,7 +41,7 @@ |
121 |
$AUTOMAKE |
122 |
|
123 |
# Let's play with $DESTDIR too, it shouldn't hurt. |
124 |
-./configure --prefix='' |
125 |
+./configure --prefix='' --mandir=/man |
126 |
DESTDIR="`pwd`/_inst" $MAKE -e install |
127 |
|
128 |
test -f ./_inst/man/man2/foo.2 |
129 |
--- automake-1.7.9/tests/transform.test |
130 |
+++ automake-1.7.9/tests/transform.test |
131 |
@@ -56,7 +56,7 @@ |
132 |
$AUTOCONF |
133 |
$AUTOMAKE |
134 |
|
135 |
-./configure --program-prefix=gnu- --prefix `pwd`/inst |
136 |
+./configure --program-prefix=gnu- --prefix `pwd`/inst --mandir `pwd`/inst/man |
137 |
$MAKE |
138 |
$MAKE test-install |
139 |
$MAKE uninstall |
140 |
--- automake-1.7.9/tests/exdir2.test |
141 |
+++ automake-1.7.9/tests/exdir2.test |
142 |
@@ -23,7 +23,7 @@ |
143 |
. ./defs || exit 1 |
144 |
|
145 |
cat > Makefile.am << 'EOF' |
146 |
-html_DATA = zot.html |
147 |
+quuz_DATA = zot.html |
148 |
pkgdata_DATA = qbert |
149 |
EOF |
150 |
|
151 |
--- automake-1.7.9/m4/mkdir-tests.m4 |
152 |
+++ automake-1.7.9/m4/mkdir-tests.m4 |
153 |
@@ -0,0 +1 @@ |
154 |
+AC_DEFUN([AM_PROG_MKDIR_P]) |
155 |
|
156 |
|
157 |
|
158 |
-- |
159 |
gentoo-commits@g.o mailing list |