1 |
maksbotan 12/10/28 18:16:49 |
2 |
|
3 |
Added: 0001_add_gentoo_names_to_configure.patch |
4 |
0002_add_doc_more_option.patch |
5 |
0103_disable_php_bindings_makefile.patch |
6 |
0002_add_gentooway_to_remove_la_files.patch |
7 |
0003_add_icoutils_configure_drop_automagic.patch |
8 |
Log: |
9 |
Bump to 1.18.9, fixes bug 427842. Thanks to slepnoga |
10 |
|
11 |
(Portage version: 2.1.11.26/cvs/Linux x86_64) |
12 |
|
13 |
Revision Changes Path |
14 |
1.1 app-emulation/libguestfs/files/1.18/0001_add_gentoo_names_to_configure.patch |
15 |
|
16 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libguestfs/files/1.18/0001_add_gentoo_names_to_configure.patch?rev=1.1&view=markup |
17 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libguestfs/files/1.18/0001_add_gentoo_names_to_configure.patch?rev=1.1&content-type=text/plain |
18 |
|
19 |
Index: 0001_add_gentoo_names_to_configure.patch |
20 |
=================================================================== |
21 |
diff --git a/configure.ac b/configure.ac |
22 |
--- a/configure.ac |
23 |
+++ b/configure.ac |
24 |
@@ -384,6 +384,11 @@ |
25 |
DISTRO=UBUNTU |
26 |
fi |
27 |
fi |
28 |
+ |
29 |
+if test -f /etc/gentoo-release; then |
30 |
+ DISTRO=GENTOO |
31 |
+fi |
32 |
+ |
33 |
if test -f /etc/arch-release; then |
34 |
DISTRO=ARCHLINUX |
35 |
fi |
36 |
|
37 |
|
38 |
|
39 |
1.1 app-emulation/libguestfs/files/1.18/0002_add_doc_more_option.patch |
40 |
|
41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libguestfs/files/1.18/0002_add_doc_more_option.patch?rev=1.1&view=markup |
42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libguestfs/files/1.18/0002_add_doc_more_option.patch?rev=1.1&content-type=text/plain |
43 |
|
44 |
Index: 0002_add_doc_more_option.patch |
45 |
=================================================================== |
46 |
diff --git a/configure.ac b/configure.ac |
47 |
--- a/configure.ac |
48 |
+++ b/configure.ac |
49 |
@@ -422,7 +422,7 @@ |
50 |
AC_CHECK_FUNCS([aug_load aug_defvar aug_defnode]) |
51 |
LIBS="$old_LIBS" |
52 |
], |
53 |
- [AC_MSG_WARN([augeas not found, some core features will be disabled])]) |
54 |
+ [AC_MSG_ERROR([augeas not found, some core features will be disabled])]) |
55 |
|
56 |
dnl Check for libselinux (optional). |
57 |
AC_CHECK_HEADERS([selinux/selinux.h]) |
58 |
@@ -496,11 +496,20 @@ |
59 |
|
60 |
dnl Check for optional xmllint. |
61 |
AC_CHECK_PROG([XMLLINT],[xmllint],[xmllint],[no]) |
62 |
+AS_IF([test "xXMLLINT" = "xno"], [AC_MSG_ERROR([xmllint not installed])],[]) |
63 |
+ |
64 |
AM_CONDITIONAL([HAVE_XMLLINT],[test "x$XMLLINT" != "xno"]) |
65 |
|
66 |
dnl po4a for translating man pages and POD files (optional). |
67 |
AC_CHECK_PROG([PO4A],[po4a],[po4a],[no]) |
68 |
-AM_CONDITIONAL([HAVE_PO4A], [test "x$PO4A" != "xno"]) |
69 |
+ |
70 |
+AC_ARG_ENABLE([doc], |
71 |
+ AS_HELP_STRING([--enable-doc], [Enable generation translating man pages and doc]), |
72 |
+ [enable_doc=no], |
73 |
+ [enable_doc=yes]) |
74 |
+AS_IF([test "xPO4A" = "xno"], [AC_MSG_WARN([po4a not installed])],[]) |
75 |
+AM_CONDITIONAL([HAVE_PO4A],[test "x$PO4A" != "xno" && test "x$enable_doc" != "xno"]) |
76 |
+ |
77 |
|
78 |
dnl Check for db_dump, db_load (optional). |
79 |
AC_CHECK_PROGS([DB_DUMP], |
80 |
|
81 |
|
82 |
|
83 |
1.1 app-emulation/libguestfs/files/1.18/0103_disable_php_bindings_makefile.patch |
84 |
|
85 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libguestfs/files/1.18/0103_disable_php_bindings_makefile.patch?rev=1.1&view=markup |
86 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libguestfs/files/1.18/0103_disable_php_bindings_makefile.patch?rev=1.1&content-type=text/plain |
87 |
|
88 |
Index: 0103_disable_php_bindings_makefile.patch |
89 |
=================================================================== |
90 |
diff --git a/Makefile.am b/Makefile.am |
91 |
--- a/Makefile.am |
92 |
+++ b/Makefile.am |
93 |
@@ -79,9 +79,6 @@ |
94 |
if HAVE_HASKELL |
95 |
SUBDIRS += haskell |
96 |
endif |
97 |
-if HAVE_PHP |
98 |
-SUBDIRS += php |
99 |
-endif |
100 |
if HAVE_ERLANG |
101 |
SUBDIRS += erlang erlang/examples |
102 |
endif |
103 |
|
104 |
|
105 |
|
106 |
1.1 app-emulation/libguestfs/files/1.18/0002_add_gentooway_to_remove_la_files.patch |
107 |
|
108 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libguestfs/files/1.18/0002_add_gentooway_to_remove_la_files.patch?rev=1.1&view=markup |
109 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libguestfs/files/1.18/0002_add_gentooway_to_remove_la_files.patch?rev=1.1&content-type=text/plain |
110 |
|
111 |
Index: 0002_add_gentooway_to_remove_la_files.patch |
112 |
=================================================================== |
113 |
diff --git a/configure.ac b/configure.ac |
114 |
--- a/configure.ac |
115 |
+++ b/configure.ac |
116 |
@@ -1351,8 +1351,9 @@ |
117 |
|
118 |
dnl Replace libtool with a wrapper that clobbers dependency_libs in *.la files |
119 |
dnl http://lists.fedoraproject.org/pipermail/devel/2010-November/146343.html |
120 |
-LIBTOOL='bash $(top_srcdir)/libtool-kill-dependency_libs.sh $(top_builddir)/libtool' |
121 |
-AC_SUBST([LIBTOOL]) |
122 |
+#LIBTOOL='bash $(top_srcdir)/libtool-kill-dependency_libs.sh $(top_builddir)/libtool' |
123 |
+#AC_SUBST([LIBTOOL]) |
124 |
+LT_INIT |
125 |
|
126 |
dnl Produce output files. |
127 |
AC_CONFIG_HEADERS([config.h]) |
128 |
|
129 |
|
130 |
|
131 |
1.1 app-emulation/libguestfs/files/1.18/0003_add_icoutils_configure_drop_automagic.patch |
132 |
|
133 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libguestfs/files/1.18/0003_add_icoutils_configure_drop_automagic.patch?rev=1.1&view=markup |
134 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libguestfs/files/1.18/0003_add_icoutils_configure_drop_automagic.patch?rev=1.1&content-type=text/plain |
135 |
|
136 |
Index: 0003_add_icoutils_configure_drop_automagic.patch |
137 |
=================================================================== |
138 |
diff --git a/configure.ac b/configure.ac |
139 |
--- a/configure.ac |
140 |
+++ b/configure.ac |
141 |
@@ -524,29 +524,36 @@ |
142 |
fi |
143 |
|
144 |
dnl Check for netpbm programs (optional). |
145 |
-AC_CHECK_PROGS([PBMTEXT],[pbmtext],[no]) |
146 |
-AC_CHECK_PROGS([PNMTOPNG],[pnmtopng],[no]) |
147 |
-AC_CHECK_PROGS([BMPTOPNM],[bmptopnm],[no]) |
148 |
-AC_CHECK_PROGS([PAMCUT],[pamcut],[no]) |
149 |
-if test "x$PBMTEXT" != "xno"; then |
150 |
- AC_DEFINE_UNQUOTED([PBMTEXT],["$PBMTEXT"],[Name of pbmtext program.]) |
151 |
-fi |
152 |
-if test "x$PNMTOPNG" != "xno"; then |
153 |
- AC_DEFINE_UNQUOTED([PNMTOPNG],["$PNMTOPNG"],[Name of pnmtopng program.]) |
154 |
-fi |
155 |
-if test "x$BMPTOPNM" != "xno"; then |
156 |
- AC_DEFINE_UNQUOTED([BMPTOPNM],["$BMPTOPNM"],[Name of bmptopnm program.]) |
157 |
-fi |
158 |
-if test "x$PAMCUT" != "xno"; then |
159 |
- AC_DEFINE_UNQUOTED([PAMCUT],["$PAMCUT"],[Name of pamcut program.]) |
160 |
-fi |
161 |
+AC_ARG_ENABLE([icoutils], |
162 |
+ AS_HELP_STRING([with-icoutils], [ Enable ico and bmp icon file inspection]), |
163 |
+ [enable_icoutils=no], |
164 |
+ [enable_icoutils=yes]) |
165 |
+AS_IF([test "enable_icoutils" != "xno"], |
166 |
+ [ |
167 |
+ AC_CHECK_PROGS([PBMTEXT],[pbmtext],[no]) |
168 |
+ AC_CHECK_PROGS([PNMTOPNG],[pnmtopng],[no]) |
169 |
+ AC_CHECK_PROGS([BMPTOPNM],[bmptopnm],[no]) |
170 |
+ AC_CHECK_PROGS([PAMCUT],[pamcut],[no]) |
171 |
+ if test "x$PBMTEXT" != "xno"; then |
172 |
+ AC_DEFINE_UNQUOTED([PBMTEXT],["$PBMTEXT"],[Name of pbmtext program.]) |
173 |
+ fi |
174 |
+ if test "x$PNMTOPNG" != "xno"; then |
175 |
+ AC_DEFINE_UNQUOTED([PNMTOPNG],["$PNMTOPNG"],[Name of pnmtopng program.]) |
176 |
+ fi |
177 |
+ if test "x$BMPTOPNM" != "xno"; then |
178 |
+ AC_DEFINE_UNQUOTED([BMPTOPNM],["$BMPTOPNM"],[Name of bmptopnm program.]) |
179 |
+ fi |
180 |
+ if test "x$PAMCUT" != "xno"; then |
181 |
+ AC_DEFINE_UNQUOTED([PAMCUT],["$PAMCUT"],[Name of pamcut program.]) |
182 |
+ fi |
183 |
|
184 |
-dnl Check for icoutils (optional). |
185 |
-AC_CHECK_PROGS([WRESTOOL],[wrestool],[no]) |
186 |
-if test "x$WRESTOOL" != "xno"; then |
187 |
- AC_DEFINE_UNQUOTED([WRESTOOL],["$WRESTOOL"],[Name of wrestool program.]) |
188 |
-fi |
189 |
- |
190 |
+ dnl Check for icoutils (optional). |
191 |
+ AC_CHECK_PROGS([WRESTOOL],[wrestool],[no]) |
192 |
+ if test "x$WRESTOOL" != "xno"; then |
193 |
+ AC_DEFINE_UNQUOTED([WRESTOOL],["$WRESTOOL"],[Name of wrestool program.]) |
194 |
+ fi |
195 |
+], |
196 |
+[]) |
197 |
dnl Check for QEMU for running binaries on this $host_cpu, fall |
198 |
dnl back to basic 'qemu'. Allow the user to override it. |
199 |
qemu_system="`echo qemu-system-$host_cpu | $SED 's/i@<:@456@:>@86/i386/g'`" |