diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-02-10 14:58:33 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-02-12 21:22:29 +0100 |
| commit | 565bdc7982759bf6b297e348608f07ac0835ac2d (patch) | |
| tree | a7db399cb5a73dce607dda9b9ffc4d01c4189c40 /patches | |
| parent | 2c821b074605d0f7ba0f193960adfe4225ee4aab (diff) | |
| download | ptxdist-565bdc7982759bf6b297e348608f07ac0835ac2d.tar.gz ptxdist-565bdc7982759bf6b297e348608f07ac0835ac2d.tar.xz | |
lshw: add patch to fix compiling with g++ 4.5
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/lshw-B.02.14/0003-fix-compiling-with-g-4.5.patch | 27 | ||||
| -rw-r--r-- | patches/lshw-B.02.14/series | 1 |
2 files changed, 28 insertions, 0 deletions
diff --git a/patches/lshw-B.02.14/0003-fix-compiling-with-g-4.5.patch b/patches/lshw-B.02.14/0003-fix-compiling-with-g-4.5.patch new file mode 100644 index 000000000..903b87dd5 --- /dev/null +++ b/patches/lshw-B.02.14/0003-fix-compiling-with-g-4.5.patch @@ -0,0 +1,27 @@ +From: unknown author <unknown.author@example.com> +Date: Mon, 23 Aug 2010 10:45:58 +0200 +Subject: [PATCH] fix compiling with g++ 4.5 + +g++ 4.5 is stricter and won't compile without this patch. + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + src/core/scsi.cc | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/core/scsi.cc b/src/core/scsi.cc +index ef49677..e72376b 100644 +--- a/src/core/scsi.cc ++++ b/src/core/scsi.cc +@@ -842,7 +842,7 @@ static bool scan_hosts(hwNode & node) + + if (!controller) + { +- controller = node.addChild(hwNode::hwNode("scsi", hw::storage)); ++ controller = node.addChild(hwNode("scsi", hw::storage)); + if (controller) + { + controller->setLogicalName(host_logicalname(number)); +-- +1.7.1 + diff --git a/patches/lshw-B.02.14/series b/patches/lshw-B.02.14/series index c41c259fd..c740bfba6 100644 --- a/patches/lshw-B.02.14/series +++ b/patches/lshw-B.02.14/series @@ -1,2 +1,3 @@ 0001-fix-cross-compilation.patch 0002-Replace-keyword-node-with-hwnode-for-TinyXpath-compa.patch +0003-fix-compiling-with-g-4.5.patch |