| 1 |
vapier 08/04/20 08:35:47 |
| 2 |
|
| 3 |
Added: lshw-02.12.01b-gcc43.patch |
| 4 |
Log: |
| 5 |
Add fix from upstream for building with gcc-4.3 #213912 by Sergey Dryabzhinsky. |
| 6 |
(Portage version: 2.2_pre5) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 sys-apps/lshw/files/lshw-02.12.01b-gcc43.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/lshw/files/lshw-02.12.01b-gcc43.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/lshw/files/lshw-02.12.01b-gcc43.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: lshw-02.12.01b-gcc43.patch |
| 15 |
=================================================================== |
| 16 |
fix from upstream for building with gcc-4.3 |
| 17 |
|
| 18 |
http://bugs.gentoo.org/213912 |
| 19 |
|
| 20 |
--- lshw-B.02.12.01/src/core/blockio.cc |
| 21 |
+++ lshw-B.02.12.01/src/core/blockio.cc |
| 22 |
@@ -11,6 +11,7 @@ |
| 23 |
#include "blockio.h" |
| 24 |
#include "osutils.h" |
| 25 |
#include <stdio.h> |
| 26 |
+#include <string.h> |
| 27 |
#include <sys/types.h> |
| 28 |
#include <sys/stat.h> |
| 29 |
#include <fcntl.h> |
| 30 |
--- lshw-B.02.12.01/src/core/cdrom.cc |
| 31 |
+++ lshw-B.02.12.01/src/core/cdrom.cc |
| 32 |
@@ -23,6 +23,7 @@ |
| 33 |
#include <sys/ioctl.h> |
| 34 |
#include <fcntl.h> |
| 35 |
#include <unistd.h> |
| 36 |
+#include <limits.h> |
| 37 |
#include <linux/cdrom.h> |
| 38 |
|
| 39 |
__ID("@(#) $Id: cdrom.cc 1907 2007-10-13 22:23:16Z lyonel $"); |
| 40 |
--- lshw-B.02.12.01/src/core/cpuid.cc |
| 41 |
+++ lshw-B.02.12.01/src/core/cpuid.cc |
| 42 |
@@ -1,6 +1,7 @@ |
| 43 |
#include "version.h" |
| 44 |
#include "cpuid.h" |
| 45 |
#include <stdio.h> |
| 46 |
+#include <string.h> |
| 47 |
#include <unistd.h> |
| 48 |
#include <fcntl.h> |
| 49 |
#include <sys/stat.h> |
| 50 |
--- lshw-B.02.12.01/src/core/cpuinfo.cc |
| 51 |
+++ lshw-B.02.12.01/src/core/cpuinfo.cc |
| 52 |
@@ -6,6 +6,7 @@ |
| 53 |
#include <fcntl.h> |
| 54 |
#include <unistd.h> |
| 55 |
#include <stdio.h> |
| 56 |
+#include <stdlib.h> |
| 57 |
#include <vector> |
| 58 |
|
| 59 |
__ID("@(#) $Id: cpuinfo.cc 1907 2007-10-13 22:23:16Z lyonel $"); |
| 60 |
--- lshw-B.02.12.01/src/core/device-tree.cc |
| 61 |
+++ lshw-B.02.12.01/src/core/device-tree.cc |
| 62 |
@@ -15,7 +15,9 @@ |
| 63 |
#include <sys/types.h> |
| 64 |
#include <sys/stat.h> |
| 65 |
#include <fcntl.h> |
| 66 |
+#include <stdlib.h> |
| 67 |
#include <stdio.h> |
| 68 |
+#include <string.h> |
| 69 |
#include <unistd.h> |
| 70 |
#include <dirent.h> |
| 71 |
|
| 72 |
--- lshw-B.02.12.01/src/core/fb.cc |
| 73 |
+++ lshw-B.02.12.01/src/core/fb.cc |
| 74 |
@@ -12,6 +12,7 @@ |
| 75 |
#include <fcntl.h> |
| 76 |
#include <unistd.h> |
| 77 |
#include <stdio.h> |
| 78 |
+#include <string.h> |
| 79 |
#include <errno.h> |
| 80 |
|
| 81 |
__ID("@(#) $Id: fb.cc 1907 2007-10-13 22:23:16Z lyonel $"); |
| 82 |
--- lshw-B.02.12.01/src/core/hw.cc |
| 83 |
+++ lshw-B.02.12.01/src/core/hw.cc |
| 84 |
@@ -4,12 +4,14 @@ |
| 85 |
#include "version.h" |
| 86 |
#include "options.h" |
| 87 |
#include "heuristics.h" |
| 88 |
+#include <cstring> |
| 89 |
#include <vector> |
| 90 |
#include <map> |
| 91 |
#include <sstream> |
| 92 |
#include <unistd.h> |
| 93 |
#include <stdio.h> |
| 94 |
#include <ctype.h> |
| 95 |
+#include <limits.h> |
| 96 |
#include <unistd.h> |
| 97 |
#include <sys/utsname.h> |
| 98 |
|
| 99 |
--- lshw-B.02.12.01/src/core/ide.cc |
| 100 |
+++ lshw-B.02.12.01/src/core/ide.cc |
| 101 |
@@ -23,6 +23,8 @@ |
| 102 |
#include <fcntl.h> |
| 103 |
#include <unistd.h> |
| 104 |
#include <stdio.h> |
| 105 |
+#include <string.h> |
| 106 |
+#include <stdlib.h> |
| 107 |
#include <dirent.h> |
| 108 |
#include <ctype.h> |
| 109 |
#include <vector> |
| 110 |
--- lshw-B.02.12.01/src/core/ideraid.cc |
| 111 |
+++ lshw-B.02.12.01/src/core/ideraid.cc |
| 112 |
@@ -17,6 +17,7 @@ |
| 113 |
#include <fcntl.h> |
| 114 |
#include <unistd.h> |
| 115 |
#include <stdio.h> |
| 116 |
+#include <string.h> |
| 117 |
#include <dirent.h> |
| 118 |
#include <ctype.h> |
| 119 |
#include <vector> |
| 120 |
--- lshw-B.02.12.01/src/core/lvm.cc |
| 121 |
+++ lshw-B.02.12.01/src/core/lvm.cc |
| 122 |
@@ -12,6 +12,7 @@ |
| 123 |
#include "version.h" |
| 124 |
#include "lvm.h" |
| 125 |
#include "osutils.h" |
| 126 |
+#include <string.h> |
| 127 |
|
| 128 |
__ID("@(#) $Id: lvm.cc 1907 2007-10-13 22:23:16Z lyonel $"); |
| 129 |
|
| 130 |
--- lshw-B.02.12.01/src/core/mounts.cc |
| 131 |
+++ lshw-B.02.12.01/src/core/mounts.cc |
| 132 |
@@ -11,6 +11,8 @@ |
| 133 |
#include <iostream> |
| 134 |
#include <sys/types.h> |
| 135 |
#include <sys/stat.h> |
| 136 |
+#include <stdlib.h> |
| 137 |
+#include <string.h> |
| 138 |
#include <unistd.h> |
| 139 |
|
| 140 |
|
| 141 |
--- lshw-B.02.12.01/src/core/osutils.cc |
| 142 |
+++ lshw-B.02.12.01/src/core/osutils.cc |
| 143 |
@@ -9,6 +9,7 @@ |
| 144 |
#include <dirent.h> |
| 145 |
#include <limits.h> |
| 146 |
#include <stdlib.h> |
| 147 |
+#include <string.h> |
| 148 |
#include <regex.h> |
| 149 |
#include <ctype.h> |
| 150 |
#include <stdio.h> |
| 151 |
--- lshw-B.02.12.01/src/core/parisc.cc |
| 152 |
+++ lshw-B.02.12.01/src/core/parisc.cc |
| 153 |
@@ -17,6 +17,8 @@ |
| 154 |
#include <sys/stat.h> |
| 155 |
#include <fcntl.h> |
| 156 |
#include <stdio.h> |
| 157 |
+#include <stdlib.h> |
| 158 |
+#include <string.h> |
| 159 |
#include <unistd.h> |
| 160 |
#include <dirent.h> |
| 161 |
|
| 162 |
--- lshw-B.02.12.01/src/core/partitions.cc |
| 163 |
+++ lshw-B.02.12.01/src/core/partitions.cc |
| 164 |
@@ -24,6 +24,8 @@ |
| 165 |
#include <sys/types.h> |
| 166 |
#include <sys/stat.h> |
| 167 |
#include <fcntl.h> |
| 168 |
+#include <string.h> |
| 169 |
+#include <stdlib.h> |
| 170 |
#include <unistd.h> |
| 171 |
#include <stdint.h> |
| 172 |
|
| 173 |
--- lshw-B.02.12.01/src/core/pci.cc |
| 174 |
+++ lshw-B.02.12.01/src/core/pci.cc |
| 175 |
@@ -6,6 +6,8 @@ |
| 176 |
#include <fcntl.h> |
| 177 |
#include <unistd.h> |
| 178 |
#include <stdio.h> |
| 179 |
+#include <string.h> |
| 180 |
+#include <stdlib.h> |
| 181 |
#include <dirent.h> |
| 182 |
|
| 183 |
__ID("@(#) $Id: pci.cc 1907 2007-10-13 22:23:16Z lyonel $"); |
| 184 |
--- lshw-B.02.12.01/src/core/pcmcia.cc |
| 185 |
+++ lshw-B.02.12.01/src/core/pcmcia.cc |
| 186 |
@@ -7,6 +7,8 @@ |
| 187 |
#include <fcntl.h> |
| 188 |
#include <unistd.h> |
| 189 |
#include <stdio.h> |
| 190 |
+#include <stdlib.h> |
| 191 |
+#include <string.h> |
| 192 |
#include <errno.h> |
| 193 |
#include <dirent.h> |
| 194 |
|
| 195 |
--- lshw-B.02.12.01/src/core/pcmcia-legacy.cc |
| 196 |
+++ lshw-B.02.12.01/src/core/pcmcia-legacy.cc |
| 197 |
@@ -7,6 +7,7 @@ |
| 198 |
#include <fcntl.h> |
| 199 |
#include <unistd.h> |
| 200 |
#include <stdio.h> |
| 201 |
+#include <string.h> |
| 202 |
#include <errno.h> |
| 203 |
|
| 204 |
__ID("@(#) $Id: pcmcia-legacy.cc 1907 2007-10-13 22:23:16Z lyonel $"); |
| 205 |
--- lshw-B.02.12.01/src/core/pnp.cc |
| 206 |
+++ lshw-B.02.12.01/src/core/pnp.cc |
| 207 |
@@ -9,6 +9,7 @@ |
| 208 |
#include "version.h" |
| 209 |
#include "pnp.h" |
| 210 |
|
| 211 |
+#include <stdlib.h> |
| 212 |
#include <string.h> |
| 213 |
|
| 214 |
__ID("@(#) $Id: pnp.cc 1907 2007-10-13 22:23:16Z lyonel $"); |
| 215 |
--- lshw-B.02.12.01/src/core/print.cc |
| 216 |
+++ lshw-B.02.12.01/src/core/print.cc |
| 217 |
@@ -11,10 +11,12 @@ |
| 218 |
#include "options.h" |
| 219 |
#include "version.h" |
| 220 |
#include "osutils.h" |
| 221 |
+#include <cstring> |
| 222 |
#include <iostream> |
| 223 |
#include <sstream> |
| 224 |
#include <iomanip> |
| 225 |
#include <unistd.h> |
| 226 |
+#include <stdlib.h> |
| 227 |
#include <stdio.h> |
| 228 |
#include <sys/ioctl.h> |
| 229 |
#include <termios.h> |
| 230 |
--- lshw-B.02.12.01/src/core/scsi.cc |
| 231 |
+++ lshw-B.02.12.01/src/core/scsi.cc |
| 232 |
@@ -12,6 +12,8 @@ |
| 233 |
#include <unistd.h> |
| 234 |
#include <dirent.h> |
| 235 |
#include <stdio.h> |
| 236 |
+#include <stdlib.h> |
| 237 |
+#include <string.h> |
| 238 |
#include <scsi/sg.h> |
| 239 |
#include <scsi/scsi.h> |
| 240 |
#ifndef MKDEV |
| 241 |
--- lshw-B.02.12.01/src/core/smp.cc |
| 242 |
+++ lshw-B.02.12.01/src/core/smp.cc |
| 243 |
@@ -9,6 +9,7 @@ |
| 244 |
#include <sys/types.h> |
| 245 |
#include <sys/stat.h> |
| 246 |
#include <fcntl.h> |
| 247 |
+#include <string.h> |
| 248 |
#include <unistd.h> |
| 249 |
|
| 250 |
#include "osutils.h" |
| 251 |
--- lshw-B.02.12.01/src/core/spd.cc |
| 252 |
+++ lshw-B.02.12.01/src/core/spd.cc |
| 253 |
@@ -5,6 +5,7 @@ |
| 254 |
#include <sys/stat.h> |
| 255 |
#include <fcntl.h> |
| 256 |
#include <unistd.h> |
| 257 |
+#include <string.h> |
| 258 |
#include <string> |
| 259 |
#include <dirent.h> |
| 260 |
#include <stdio.h> |
| 261 |
--- lshw-B.02.12.01/src/core/sysfs.cc |
| 262 |
+++ lshw-B.02.12.01/src/core/sysfs.cc |
| 263 |
@@ -11,6 +11,7 @@ |
| 264 |
#include <unistd.h> |
| 265 |
#include <stdlib.h> |
| 266 |
#include <stdio.h> |
| 267 |
+#include <string.h> |
| 268 |
#include <dirent.h> |
| 269 |
#include <libgen.h> |
| 270 |
#include <sys/stat.h> |
| 271 |
--- lshw-B.02.12.01/src/core/usb.cc |
| 272 |
+++ lshw-B.02.12.01/src/core/usb.cc |
| 273 |
@@ -18,6 +18,8 @@ |
| 274 |
#include <sys/ioctl.h> |
| 275 |
#include <errno.h> |
| 276 |
#include <fcntl.h> |
| 277 |
+#include <string.h> |
| 278 |
+#include <stdlib.h> |
| 279 |
#include <unistd.h> |
| 280 |
#include <dirent.h> |
| 281 |
|
| 282 |
--- lshw-B.02.12.01/src/core/volumes.cc |
| 283 |
+++ lshw-B.02.12.01/src/core/volumes.cc |
| 284 |
@@ -15,6 +15,7 @@ |
| 285 |
#include <sys/types.h> |
| 286 |
#include <sys/stat.h> |
| 287 |
#include <fcntl.h> |
| 288 |
+#include <string.h> |
| 289 |
#include <unistd.h> |
| 290 |
#include <stdint.h> |
| 291 |
#include <time.h> |
| 292 |
--- lshw-B.02.12.01/src/gui/engine.cc |
| 293 |
+++ lshw-B.02.12.01/src/gui/engine.cc |
| 294 |
@@ -9,6 +9,8 @@ |
| 295 |
#include <iostream> |
| 296 |
#include <fstream> |
| 297 |
#include <sys/utsname.h> |
| 298 |
+#include <stdlib.h> |
| 299 |
+#include <string.h> |
| 300 |
#include <libgen.h> |
| 301 |
|
| 302 |
static char *id = "@(#) $Id: engine.cc 1907 2007-10-13 22:23:16Z lyonel $"; |
| 303 |
--- lshw-B.02.12.01/src/lshw.cc |
| 304 |
+++ lshw-B.02.12.01/src/lshw.cc |
| 305 |
@@ -8,6 +8,8 @@ |
| 306 |
|
| 307 |
#include <unistd.h> |
| 308 |
#include <stdio.h> |
| 309 |
+#include <string.h> |
| 310 |
+#include <stdlib.h> |
| 311 |
#include <iostream> |
| 312 |
|
| 313 |
__ID("@(#) $Id: lshw.cc 1907 2007-10-13 22:23:16Z lyonel $"); |
| 314 |
|
| 315 |
|
| 316 |
|
| 317 |
-- |
| 318 |
gentoo-commits@l.g.o mailing list |
Archives