diff options
author | Xin Ouyang <Xin.Ouyang@windriver.com> | 2012-02-21 14:55:39 +0800 |
---|---|---|
committer | Xin Ouyang <Xin.Ouyang@windriver.com> | 2012-02-21 14:55:39 +0800 |
commit | 6fbf5e8eb7b027760018983dc46716c815a79e2d (patch) | |
tree | 35ae6618f38dfcbcca4b12e634bc497602d0a6cc | |
parent | 354213d8e8b295a99deec4bd586f076eb3b8d3e3 (diff) | |
download | meta-selinux-6fbf5e8eb7b027760018983dc46716c815a79e2d.tar.gz |
libsepol: Apply ranlib patch for cross compiling.
3 files changed, 35 insertions, 0 deletions
diff --git a/recipes-security/selinux/libsepol/libsepol-Change-ranlib-for-cross-compiling.patch b/recipes-security/selinux/libsepol/libsepol-Change-ranlib-for-cross-compiling.patch new file mode 100644 index 0000000..f2fc313 --- /dev/null +++ b/recipes-security/selinux/libsepol/libsepol-Change-ranlib-for-cross-compiling.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From 2ee1e9651ec4aa78daf15dfef74e0b6aaeb8db1e Mon Sep 17 00:00:00 2001 | ||
2 | From: Xin Ouyang <Xin.Ouyang@windriver.com> | ||
3 | Date: Tue, 21 Feb 2012 14:47:45 +0800 | ||
4 | Subject: [PATCH] libsepol: Change ranlib for cross compiling. | ||
5 | |||
6 | Use target host-tools to encapsulate any difference between local tools | ||
7 | on different machines. For example, on local PC, libsepol.a's index could | ||
8 | be added successfully by local ranlib, however, it will fail on some sever, | ||
9 | so we'd better use host-tools $(AR) rather than any local ranlib. | ||
10 | |||
11 | Signed-off-by: Harry Ciao<qingtao.cao@windriver.com> | ||
12 | --- | ||
13 | src/Makefile | 2 +- | ||
14 | 1 files changed, 1 insertions(+), 1 deletions(-) | ||
15 | |||
16 | diff --git a/src/Makefile b/src/Makefile | ||
17 | index cd8e767..beea232 100644 | ||
18 | --- a/src/Makefile | ||
19 | +++ b/src/Makefile | ||
20 | @@ -21,7 +21,7 @@ all: $(LIBA) $(LIBSO) $(LIBPC) | ||
21 | |||
22 | $(LIBA): $(OBJS) | ||
23 | $(AR) rcs $@ $^ | ||
24 | - ranlib $@ | ||
25 | + $(AR) s $@ | ||
26 | |||
27 | $(LIBSO): $(LOBJS) | ||
28 | $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -Wl,-soname,$(LIBSO),--version-script=libsepol.map,-z,defs | ||
29 | -- | ||
30 | 1.7.5.4 | ||
31 | |||
diff --git a/recipes-security/selinux/libsepol_2.1.4.bb b/recipes-security/selinux/libsepol_2.1.4.bb index 2a7633b..4e795a2 100644 --- a/recipes-security/selinux/libsepol_2.1.4.bb +++ b/recipes-security/selinux/libsepol_2.1.4.bb | |||
@@ -14,5 +14,7 @@ inherit lib_package | |||
14 | SRC_URI[md5sum] = "909dae553edb34ea2224002a0c529cb0" | 14 | SRC_URI[md5sum] = "909dae553edb34ea2224002a0c529cb0" |
15 | SRC_URI[sha256sum] = "8f5ea42ae6cc00b21f0e5f31f354d19fcce3edfe9328971d266245718714b1e8" | 15 | SRC_URI[sha256sum] = "8f5ea42ae6cc00b21f0e5f31f354d19fcce3edfe9328971d266245718714b1e8" |
16 | 16 | ||
17 | SRC_URI += "file://libsepol-Change-ranlib-for-cross-compiling.patch" | ||
18 | |||
17 | BBCLASSEXTEND = "native" | 19 | BBCLASSEXTEND = "native" |
18 | 20 | ||
diff --git a/recipes-security/selinux/libsepol_git.bb b/recipes-security/selinux/libsepol_git.bb index a66fee2..310692b 100644 --- a/recipes-security/selinux/libsepol_git.bb +++ b/recipes-security/selinux/libsepol_git.bb | |||
@@ -14,5 +14,7 @@ inherit lib_package | |||
14 | SRCREV = "339f8079d7b9dd1e0b0138e2d096dc7c60b2092e" | 14 | SRCREV = "339f8079d7b9dd1e0b0138e2d096dc7c60b2092e" |
15 | PV = "2.1.4+git${SRCPV}" | 15 | PV = "2.1.4+git${SRCPV}" |
16 | 16 | ||
17 | SRC_URI += "file://libsepol-Change-ranlib-for-cross-compiling.patch" | ||
18 | |||
17 | BBCLASSEXTEND = "native" | 19 | BBCLASSEXTEND = "native" |
18 | 20 | ||