diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-10-10 17:42:03 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-10-10 17:42:03 +0200 |
| commit | c79390a977e277d0a3d4302c5c560b020754f021 (patch) | |
| tree | 148a3dd08ecc135178028f3b5113b8977e55843d | |
| parent | 1c38adbe0aa21137e3d4417779e7a33ec32b1a1b (diff) | |
| download | ptxdist-c79390a977e277d0a3d4302c5c560b020754f021.tar.gz ptxdist-c79390a977e277d0a3d4302c5c560b020754f021.tar.xz | |
host-ckermit: ignore broken library auto-detection
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 | 4 | ||||
| -rw-r--r-- | rules/host-ckermit.make | 14 |
3 files changed, 14 insertions, 36 deletions
diff --git a/patches/cku300/0002-improve-multi-lib-toolchain-handling.patch b/patches/cku300/0002-improve-multi-lib-toolchain-handling.patch deleted file mode 100644 index 64caf3108..000000000 --- a/patches/cku300/0002-improve-multi-lib-toolchain-handling.patch +++ /dev/null @@ -1,32 +0,0 @@ -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 b0fe9925d..d1bdfdfc1 100644 --- a/patches/cku300/series +++ b/patches/cku300/series @@ -1,4 +1,4 @@ # generated by git-ptx-patches +#tag:base --start-number 1 0001-add-variable-to-allow-external-wart.patch -0002-improve-multi-lib-toolchain-handling.patch -# 30d6f9e1209825975c7ff0789bcc9891 - git-ptx-patches magic +# 62307c69250ab9529434a6600a9b2bbe - git-ptx-patches magic diff --git a/rules/host-ckermit.make b/rules/host-ckermit.make index c037d2ff6..fa3534378 100644 --- a/rules/host-ckermit.make +++ b/rules/host-ckermit.make @@ -19,8 +19,6 @@ HOST_PACKAGES-$(PTXCONF_HOST_CKERMIT) += host-ckermit # HOST_CKERMIT_DIR = $(HOST_BUILDDIR)/$(CKERMIT) HOST_CKERMIT_STRIP_LEVEL := 0 -HOST_CKERMIT_MAKE_OPT := linux -HOST_CKERMIT_INSTALL_OPT := install prefix= # ---------------------------------------------------------------------------- # Prepare @@ -29,6 +27,18 @@ HOST_CKERMIT_INSTALL_OPT := install prefix= HOST_CKERMIT_CONF_TOOL := NO # ---------------------------------------------------------------------------- +# Compile +# ---------------------------------------------------------------------------- + +HOST_CKERMIT_MAKEVARS := \ + xermit \ + KTARGET=linuxa \ + prefix= \ + CFLAGS='$(HOST_CPPFLAGS) $(HOST_CFLAGS) -O2 -g -DLINUX -DFNFLOAT -DCK_POSIX_SIG -DCK_NEWTERM -DTCPSOCKET -DLINUXFSSTND -DNOCOTFMC -DPOSIX -DUSE_STRERROR -DCK_NCURSES -DHAVE_PTMX' \ + LNKFLAGS='$(HOST_LDFLAGS)' \ + LIBS='-lncurses -lutil -lresolv -lcrypt -lm' + +# ---------------------------------------------------------------------------- # Install # ---------------------------------------------------------------------------- |