diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-07-06 10:42:45 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-07-06 10:43:07 +0200 |
| commit | 5a5cb9f2ac710e34f633d22909271321e922ccdb (patch) | |
| tree | a58365532bb42431741572b0f080d44373b7f458 | |
| parent | 71addd0f7b6df0da3bf0cec50bdac4f92b4df1b3 (diff) | |
| download | ptxdist-5a5cb9f2ac710e34f633d22909271321e922ccdb.tar.gz ptxdist-5a5cb9f2ac710e34f633d22909271321e922ccdb.tar.xz | |
host-ckermit: add patch to improve multi-lib toolchain handling
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | patches/cku300/0002-improve-multi-lib-toolchain-handling.patch | 32 | ||||
| -rw-r--r-- | patches/cku300/series | 3 |
2 files changed, 34 insertions, 1 deletions
diff --git a/patches/cku300/0002-improve-multi-lib-toolchain-handling.patch b/patches/cku300/0002-improve-multi-lib-toolchain-handling.patch new file mode 100644 index 000000000..64caf3108 --- /dev/null +++ b/patches/cku300/0002-improve-multi-lib-toolchain-handling.patch @@ -0,0 +1,32 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Wed, 6 Jul 2011 10:39:24 +0200 +Subject: [PATCH] improve multi-lib toolchain handling + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + makefile | 7 ++++++- + 1 files changed, 6 insertions(+), 1 deletions(-) + +diff --git a/makefile b/makefile +index ba5e3ba..954c65c 100644 +--- a/makefile ++++ b/makefile +@@ -6107,12 +6107,17 @@ linux: + then echo -lresolv; fi` \ + `if test -f /usr/lib64/libcrypt.a || test -f /usr/lib64/libcrypt.so \ + || test -f /usr/lib/libcrypt.a || test -f /usr/lib/libcrypt.so \ ++ || test -f /usr/lib/i386-linux-gnu/libcrypt.a \ ++ || test -f /usr/lib/i386-linux-gnu/libcrypt.so \ + || ls /lib/x86_64-linux-gnu/libcrypt.* > /dev/null 2> /dev/null; \ + then echo -lcrypt; fi` \ + `if test -f /usr/lib64/liblockdev.a || \ + test -f /usr/lib64/liblockdev.so || \ + test -f /usr/lib/liblockdev.a || \ +- test -f /usr/lib/liblockdev.so; \ ++ test -f /usr/lib/liblockdev.so \ ++ || test -f /usr/lib/i386-linux-gnu/liblockdev.a \ ++ || test -f /usr/lib/i386-linux-gnu/liblockdev.so \ ++ || ls /lib/x86_64-linux-gnu/liblockdev.* > /dev/null 2> /dev/null; \ + then echo -llockdev; fi`" \ + linuxa + diff --git a/patches/cku300/series b/patches/cku300/series index 72202965c..b0fe9925d 100644 --- a/patches/cku300/series +++ b/patches/cku300/series @@ -1,3 +1,4 @@ # generated by git-ptx-patches 0001-add-variable-to-allow-external-wart.patch -# 926370d951efb2163ebb2240f84062f0 - git-ptx-patches magic +0002-improve-multi-lib-toolchain-handling.patch +# 30d6f9e1209825975c7ff0789bcc9891 - git-ptx-patches magic |