summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXin Ouyang <Xin.Ouyang@windriver.com>2012-03-27 17:22:19 +0800
committerXin Ouyang <Xin.Ouyang@windriver.com>2012-03-27 17:22:19 +0800
commitb1508dbf5b9e147ff19df89da0ad8d77d27b4df7 (patch)
treea8793c4e5f7c4e638eb21c19a8af2e5aae39da0e
parent9a7b0ecb92cea4a9a8a2b420c2e2f5ff9941e922 (diff)
downloadmeta-selinux-b1508dbf5b9e147ff19df89da0ad8d77d27b4df7.tar.gz
audit: Add a patch for cross compiling.
-rw-r--r--recipes-security/audit/audit/audit-for-cross-compiling.patch257
-rw-r--r--recipes-security/audit/audit_2.1.3.bb2
2 files changed, 259 insertions, 0 deletions
diff --git a/recipes-security/audit/audit/audit-for-cross-compiling.patch b/recipes-security/audit/audit/audit-for-cross-compiling.patch
new file mode 100644
index 0000000..812fdf7
--- /dev/null
+++ b/recipes-security/audit/audit/audit-for-cross-compiling.patch
@@ -0,0 +1,257 @@
1From d4535ddce48f821a05cfa1409b7ff4611a09e84a Mon Sep 17 00:00:00 2001
2From: builder <builder@pek-yocto-build1.(none)>
3Date: Wed, 21 Mar 2012 14:56:32 +0800
4Subject: [PATCH] audit: for cross-compiling.
5
6---
7 auparse/Makefile.am | 26 ++++++++++++++++++++++++++
8 configure.ac | 9 +++++++++
9 lib/Makefile.am | 32 ++++++++++++++++++++++++++++++++
10 3 files changed, 67 insertions(+), 0 deletions(-)
11
12diff --git a/auparse/Makefile.am b/auparse/Makefile.am
13index ea2360d..eabaacf 100644
14--- a/auparse/Makefile.am
15+++ b/auparse/Makefile.am
16@@ -54,69 +54,95 @@ noinst_PROGRAMS = gen_captabs_h gen_clone-flagtabs_h gen_epoll_ctls_h \
17
18 gen_captabs_h_SOURCES = ../lib/gen_tables.c ../lib/gen_tables.h captab.h
19 gen_captabs_h_CFLAGS = $(AM_CFLAGS) '-DTABLE_H="captab.h"'
20+gen_captabs_h: $(gen_captabs_h_SOURCES)
21+ $(CC_FOR_BUILD) -DHAVE_CONFIG_H -I. -I.. -I../lib $(gen_captabs_h_CFLAGS) $(LDFLAGS) -o $@ $<
22 captabs.h: gen_captabs_h Makefile
23 ./gen_captabs_h --i2s cap > $@
24
25 gen_clone_flagtabs_h_SOURCES = ../lib/gen_tables.c ../lib/gen_tables.h \
26 clone-flagtab.h
27 gen_clone_flagtabs_h_CFLAGS = $(AM_CFLAGS) '-DTABLE_H="clone-flagtab.h"'
28+gen_clone-flagtabs_h: $(gen_clone_flagtabs_h_SOURCES)
29+ $(CC_FOR_BUILD) -DHAVE_CONFIG_H -I. -I.. -I../lib $(gen_clone_flagtabs_h_CFLAGS) $(LDFLAGS) -o $@ $<
30 clone-flagtabs.h: gen_clone-flagtabs_h Makefile
31 ./gen_clone-flagtabs_h --i2s-transtab clone_flag > $@
32
33 gen_epoll_ctls_h_SOURCES = ../lib/gen_tables.c ../lib/gen_tables.h epoll_ctl.h
34 gen_epoll_ctls_h_CFLAGS = $(AM_CFLAGS) '-DTABLE_H="epoll_ctl.h"'
35+gen_epoll_ctls_h: $(gen_epoll_ctls_h_SOURCES)
36+ $(CC_FOR_BUILD) -DHAVE_CONFIG_H -I. -I.. -I../lib $(gen_epoll_ctls_h_CFLAGS) $(LDFLAGS) -o $@ $<
37 epoll_ctls.h: gen_epoll_ctls_h Makefile
38 ./gen_epoll_ctls_h --i2s epoll_ctl > $@
39
40 gen_famtabs_h_SOURCES = ../lib/gen_tables.c ../lib/gen_tables.h famtab.h
41 gen_famtabs_h_CFLAGS = $(AM_CFLAGS) '-DTABLE_H="famtab.h"'
42+gen_famtabs_h: $(gen_famtabs_h_SOURCES)
43+ $(CC_FOR_BUILD) -DHAVE_CONFIG_H -I. -I.. -I../lib $(gen_famtabs_h_CFLAGS) $(LDFLAGS) -o $@ $<
44 famtabs.h: gen_famtabs_h Makefile
45 ./gen_famtabs_h --i2s fam > $@
46
47 gen_flagtabs_h_SOURCES = ../lib/gen_tables.c ../lib/gen_tables.h flagtab.h
48 # ../auparse/ is used to avoid using ../lib/flagtab.h
49 gen_flagtabs_h_CFLAGS = $(AM_CFLAGS) '-DTABLE_H="../auparse/flagtab.h"'
50+gen_flagtabs_h: $(gen_flagtabs_h_SOURCES)
51+ $(CC_FOR_BUILD) -DHAVE_CONFIG_H -I. -I.. -I../lib $(gen_flagtabs_h_CFLAGS) $(LDFLAGS) -o $@ $<
52 flagtabs.h: gen_flagtabs_h Makefile
53 ./gen_flagtabs_h --i2s-transtab flag > $@
54
55 gen_fcntl_cmdtabs_h_SOURCES = ../lib/gen_tables.c ../lib/gen_tables.h \
56 fcntl-cmdtab.h
57 gen_fcntl_cmdtabs_h_CFLAGS = $(AM_CFLAGS) '-DTABLE_H="fcntl-cmdtab.h"'
58+gen_fcntl-cmdtabs_h: $(gen_fcntl_cmdtabs_h_SOURCES)
59+ $(CC_FOR_BUILD) -DHAVE_CONFIG_H -I. -I.. -I../lib $(gen_fcntl_cmdtabs_h_CFLAGS) $(LDFLAGS) -o $@ $<
60 fcntl-cmdtabs.h: gen_fcntl-cmdtabs_h Makefile
61 ./gen_fcntl-cmdtabs_h --i2s fcntl > $@
62
63 gen_icmptypetabs_h_SOURCES = ../lib/gen_tables.c ../lib/gen_tables.h icmptypetab.h
64 gen_icmptypetabs_h_CFLAGS = $(AM_CFLAGS) '-DTABLE_H="icmptypetab.h"'
65+gen_icmptypetabs_h: $(gen_icmptypetabs_h_SOURCES)
66+ $(CC_FOR_BUILD) -DHAVE_CONFIG_H -I. -I.. -I../lib $(gen_icmptypetabs_h_CFLAGS) $(LDFLAGS) -o $@ $<
67 icmptypetabs.h: gen_icmptypetabs_h Makefile
68 ./gen_icmptypetabs_h --i2s icmptype > $@
69
70 gen_ipctabs_h_SOURCES = ../lib/gen_tables.c ../lib/gen_tables.h ipctab.h
71 gen_ipctabs_h_CFLAGS = $(AM_CFLAGS) '-DTABLE_H="ipctab.h"'
72+gen_ipctabs_h: $(gen_ipctabs_h_SOURCES)
73+ $(CC_FOR_BUILD) -DHAVE_CONFIG_H -I. -I.. -I../lib $(gen_ipctabs_h_CFLAGS) $(LDFLAGS) -o $@ $<
74 ipctabs.h: gen_ipctabs_h Makefile
75 ./gen_ipctabs_h --i2s ipc > $@
76
77 gen_nfprototabs_h_SOURCES = ../lib/gen_tables.c ../lib/gen_tables.h nfprototab.h
78 gen_nfprototabs_h_CFLAGS = $(AM_CFLAGS) '-DTABLE_H="nfprototab.h"'
79+gen_nfprototabs_h: $(gen_nfprototabs_h_SOURCES)
80+ $(CC_FOR_BUILD) -DHAVE_CONFIG_H -I. -I.. -I../lib $(gen_nfprototabs_h_CFLAGS) $(LDFLAGS) -o $@ $<
81 nfprototabs.h: gen_nfprototabs_h Makefile
82 ./gen_nfprototabs_h --i2s nfproto > $@
83
84 gen_open_flagtabs_h_SOURCES = ../lib/gen_tables.c ../lib/gen_tables.h \
85 open-flagtab.h
86 gen_open_flagtabs_h_CFLAGS = $(AM_CFLAGS) '-DTABLE_H="open-flagtab.h"'
87+gen_open-flagtabs_h: $(gen_open_flagtabs_h_SOURCES)
88+ $(CC_FOR_BUILD) -DHAVE_CONFIG_H -I. -I.. -I../lib $(gen_open_flagtabs_h_CFLAGS) $(LDFLAGS) -o $@ $<
89 open-flagtabs.h: gen_open-flagtabs_h Makefile
90 ./gen_open-flagtabs_h --i2s-transtab open_flag > $@
91
92 gen_seeks_h_SOURCES = ../lib/gen_tables.c ../lib/gen_tables.h seek.h
93 gen_seeks_h_CFLAGS = $(AM_CFLAGS) '-DTABLE_H="seek.h"'
94+gen_seeks_h: $(gen_seeks_h_SOURCES)
95+ $(CC_FOR_BUILD) -DHAVE_CONFIG_H -I. -I.. -I../lib $(gen_seeks_h_CFLAGS) $(LDFLAGS) -o $@ $<
96 seeks.h: gen_seeks_h Makefile
97 ./gen_seeks_h --i2s seek > $@
98
99 gen_socktabs_h_SOURCES = ../lib/gen_tables.c ../lib/gen_tables.h socktab.h
100 gen_socktabs_h_CFLAGS = $(AM_CFLAGS) '-DTABLE_H="socktab.h"'
101+gen_socktabs_h: $(gen_socktabs_h_SOURCES)
102+ $(CC_FOR_BUILD) -DHAVE_CONFIG_H -I. -I.. -I../lib $(gen_socktabs_h_CFLAGS) $(LDFLAGS) -o $@ $<
103 socktabs.h: gen_socktabs_h Makefile
104 ./gen_socktabs_h --i2s sock > $@
105
106 gen_typetabs_h_SOURCES = ../lib/gen_tables.c ../lib/gen_tables.h typetab.h
107 gen_typetabs_h_CFLAGS = $(AM_CFLAGS) '-DTABLE_H="typetab.h"'
108+gen_typetabs_h: $(gen_typetabs_h_SOURCES)
109+ $(CC_FOR_BUILD) -DHAVE_CONFIG_H -I. -I.. -I../lib $(gen_typetabs_h_CFLAGS) $(LDFLAGS) -o $@ $<
110 typetabs.h: gen_typetabs_h Makefile
111 ./gen_typetabs_h --s2i type > $@
112diff --git a/configure.ac b/configure.ac
113index 3c2efb1..23a7d02 100644
114--- a/configure.ac
115+++ b/configure.ac
116@@ -79,6 +79,15 @@ if test x"$GCC" = x"yes"; then
117 esac
118 fi
119
120+if test -z "$CC_FOR_BUILD"; then
121+ if test "x$cross_compiling" = "xno"; then
122+ CC_FOR_BUILD='$(CC)'
123+ else
124+ CC_FOR_BUILD=gcc
125+ fi
126+fi
127+AC_SUBST(CC_FOR_BUILD)
128+
129 #gssapi
130 AC_ARG_ENABLE(gssapi_krb5,
131 [AS_HELP_STRING([--enable-gssapi-krb5],[Enable GSSAPI Kerberos 5 support @<:@default=no@:>@])],
132diff --git a/lib/Makefile.am b/lib/Makefile.am
133index c5952f9..ad744c2 100644
134--- a/lib/Makefile.am
135+++ b/lib/Makefile.am
136@@ -60,12 +60,16 @@ noinst_PROGRAMS += gen_armeb_tables_h
137 endif
138 gen_actiontabs_h_SOURCES = gen_tables.c gen_tables.h actiontab.h
139 gen_actiontabs_h_CFLAGS = $(AM_CFLAGS) '-DTABLE_H="actiontab.h"'
140+gen_actiontabs_h: $(gen_actiontabs_h_SOURCES)
141+ $(CC_FOR_BUILD) -DHAVE_CONFIG_H -I. -I.. -I../auparse $(gen_actiontabs_h_CFLAGS) $(LDFLAGS) -o $@ $<
142 actiontabs.h: gen_actiontabs_h Makefile
143 ./gen_actiontabs_h --lowercase --i2s --s2i action > $@
144
145 if USE_ALPHA
146 gen_alpha_tables_h_SOURCES = gen_tables.c gen_tables.h alpha_table.h
147 gen_alpha_tables_h_CFLAGS = $(AM_CFLAGS) '-DTABLE_H="alpha_table.h"'
148+gen_alpha_tables_h: $(gen_alpha_tables_h_SOURCES)
149+ $(CC_FOR_BUILD) -DHAVE_CONFIG_H -I. -I.. -I../auparse $(gen_alpha_tables_h_CFLAGS) $(LDFLAGS) -o $@ $<
150 alpha_tables.h: gen_alpha_tables_h Makefile
151 ./gen_alpha_tables_h --lowercase --i2s --s2i alpha_syscall > $@
152 endif
153@@ -73,73 +77,101 @@ endif
154 if USE_ARMEB
155 gen_armeb_tables_h_SOURCES = gen_tables.c gen_tables.h armeb_table.h
156 gen_armeb_tables_h_CFLAGS = $(AM_CFLAGS) '-DTABLE_H="armeb_table.h"'
157+gen_armeb_tables_h: $(gen_armeb_tables_h_SOURCES)
158+ $(CC_FOR_BUILD) -DHAVE_CONFIG_H -I. -I.. -I../auparse $(gen_armeb_tables_h_CFLAGS) $(LDFLAGS) -o $@ $<
159 armeb_tables.h: gen_armeb_tables_h Makefile
160 ./gen_armeb_tables_h --lowercase --i2s --s2i armeb_syscall > $@
161 endif
162
163 gen_errtabs_h_SOURCES = gen_tables.c gen_tables.h errtab.h
164 gen_errtabs_h_CFLAGS = $(AM_CFLAGS) '-DTABLE_H="errtab.h"'
165+gen_errtabs_h: $(gen_errtabs_h_SOURCES)
166+ $(CC_FOR_BUILD) -DHAVE_CONFIG_H -I. -I.. -I../auparse $(gen_errtabs_h_CFLAGS) $(LDFLAGS) -o $@ $<
167 errtabs.h: gen_errtabs_h Makefile
168 ./gen_errtabs_h --duplicate-ints --uppercase --i2s --s2i err > $@
169
170 gen_fieldtabs_h_SOURCES = gen_tables.c gen_tables.h fieldtab.h
171 gen_fieldtabs_h_CFLAGS = $(AM_CFLAGS) '-DTABLE_H="fieldtab.h"'
172+gen_fieldtabs_h: $(gen_fieldtabs_h_SOURCES)
173+ $(CC_FOR_BUILD) -DHAVE_CONFIG_H -I. -I.. -I../auparse $(gen_fieldtabs_h_CFLAGS) $(LDFLAGS) -o $@ $<
174 fieldtabs.h: gen_fieldtabs_h Makefile
175 ./gen_fieldtabs_h --duplicate-ints --lowercase --i2s --s2i field > $@
176
177 gen_flagtabs_h_SOURCES = gen_tables.c gen_tables.h flagtab.h
178 gen_flagtabs_h_CFLAGS = $(AM_CFLAGS) '-DTABLE_H="flagtab.h"'
179+gen_flagtabs_h: $(gen_flagtabs_h_SOURCES)
180+ $(CC_FOR_BUILD) -DHAVE_CONFIG_H -I. -I.. -I../auparse $(gen_flagtabs_h_CFLAGS) $(LDFLAGS) -o $@ $<
181 flagtabs.h: gen_flagtabs_h Makefile
182 ./gen_flagtabs_h --lowercase --i2s --s2i flag > $@
183
184 gen_ftypetabs_h_SOURCES = gen_tables.c gen_tables.h ftypetab.h
185 gen_ftypetabs_h_CFLAGS = $(AM_CFLAGS) '-DTABLE_H="ftypetab.h"'
186+gen_ftypetabs_h: $(gen_ftypetabs_h_SOURCES)
187+ $(CC_FOR_BUILD) -DHAVE_CONFIG_H -I. -I.. -I../auparse $(gen_ftypetabs_h_CFLAGS) $(LDFLAGS) -o $@ $<
188 ftypetabs.h: gen_ftypetabs_h Makefile
189 ./gen_ftypetabs_h --lowercase --i2s --s2i ftype > $@
190
191 gen_i386_tables_h_SOURCES = gen_tables.c gen_tables.h i386_table.h
192 gen_i386_tables_h_CFLAGS = $(AM_CFLAGS) '-DTABLE_H="i386_table.h"'
193+gen_i386_tables_h: $(gen_i386_tables_h_SOURCES)
194+ $(CC_FOR_BUILD) -DHAVE_CONFIG_H -I. -I.. -I../auparse $(gen_i386_tables_h_CFLAGS) $(LDFLAGS) -o $@ $<
195 i386_tables.h: gen_i386_tables_h Makefile
196 ./gen_i386_tables_h --duplicate-ints --lowercase --i2s --s2i \
197 i386_syscall > $@
198
199 gen_ia64_tables_h_SOURCES = gen_tables.c gen_tables.h ia64_table.h
200 gen_ia64_tables_h_CFLAGS = $(AM_CFLAGS) '-DTABLE_H="ia64_table.h"'
201+gen_ia64_tables_h: $(gen_ia64_tables_h_SOURCES)
202+ $(CC_FOR_BUILD) -DHAVE_CONFIG_H -I. -I.. -I../auparse $(gen_ia64_tables_h_CFLAGS) $(LDFLAGS) -o $@ $<
203 ia64_tables.h: gen_ia64_tables_h Makefile
204 ./gen_ia64_tables_h --lowercase --i2s --s2i ia64_syscall > $@
205
206 gen_machinetabs_h_SOURCES = gen_tables.c gen_tables.h machinetab.h
207 gen_machinetabs_h_CFLAGS = $(AM_CFLAGS) '-DTABLE_H="machinetab.h"'
208+gen_machinetabs_h: $(gen_machinetabs_h_SOURCES)
209+ $(CC_FOR_BUILD) -DHAVE_CONFIG_H -I. -I.. -I../auparse $(gen_machinetabs_h_CFLAGS) $(LDFLAGS) -o $@ $<
210 machinetabs.h: gen_machinetabs_h Makefile
211 ./gen_machinetabs_h --duplicate-ints --lowercase --i2s --s2i machine \
212 > $@
213
214 gen_msg_typetabs_h_SOURCES = gen_tables.c gen_tables.h msg_typetab.h
215 gen_msg_typetabs_h_CFLAGS = $(AM_CFLAGS) '-DTABLE_H="msg_typetab.h"'
216+gen_msg_typetabs_h: $(gen_msg_typetabs_h_SOURCES)
217+ $(CC_FOR_BUILD) -DHAVE_CONFIG_H -I. -I.. -I../auparse $(gen_msg_typetabs_h_CFLAGS) $(LDFLAGS) -o $@ $<
218 msg_typetabs.h: gen_msg_typetabs_h Makefile
219 ./gen_msg_typetabs_h --uppercase --i2s --s2i msg_type > $@
220
221 gen_optabs_h_SOURCES = gen_tables.c gen_tables.h optab.h
222 gen_optabs_h_CFLAGS = $(AM_CFLAGS) '-DTABLE_H="optab.h"'
223+gen_optabs_h: $(gen_optabs_h_SOURCES)
224+ $(CC_FOR_BUILD) -DHAVE_CONFIG_H -I. -I.. -I../auparse $(gen_optabs_h_CFLAGS) $(LDFLAGS) -o $@ $<
225 optabs.h: gen_optabs_h Makefile
226 ./gen_optabs_h --i2s op > $@
227
228 gen_ppc_tables_h_SOURCES = gen_tables.c gen_tables.h ppc_table.h
229 gen_ppc_tables_h_CFLAGS = $(AM_CFLAGS) '-DTABLE_H="ppc_table.h"'
230+gen_ppc_tables_h: $(gen_ppc_tables_h_SOURCES)
231+ $(CC_FOR_BUILD) -DHAVE_CONFIG_H -I. -I.. -I../auparse $(gen_ppc_tables_h_CFLAGS) $(LDFLAGS) -o $@ $<
232 ppc_tables.h: gen_ppc_tables_h Makefile
233 ./gen_ppc_tables_h --lowercase --i2s --s2i ppc_syscall > $@
234
235 gen_s390_tables_h_SOURCES = gen_tables.c gen_tables.h s390_table.h
236 gen_s390_tables_h_CFLAGS = $(AM_CFLAGS) '-DTABLE_H="s390_table.h"'
237+gen_s390_tables_h: $(gen_s390_tables_h_SOURCES)
238+ $(CC_FOR_BUILD) -DHAVE_CONFIG_H -I. -I.. -I../auparse $(gen_s390_tables_h_CFLAGS) $(LDFLAGS) -o $@ $<
239 s390_tables.h: gen_s390_tables_h Makefile
240 ./gen_s390_tables_h --lowercase --i2s --s2i s390_syscall > $@
241
242 gen_s390x_tables_h_SOURCES = gen_tables.c gen_tables.h s390x_table.h
243 gen_s390x_tables_h_CFLAGS = $(AM_CFLAGS) '-DTABLE_H="s390x_table.h"'
244+gen_s390x_tables_h: $(gen_s390x_tables_h_SOURCES)
245+ $(CC_FOR_BUILD) -DHAVE_CONFIG_H -I. -I.. -I../auparse $(gen_s390x_tables_h_CFLAGS) $(LDFLAGS) -o $@ $<
246 s390x_tables.h: gen_s390x_tables_h Makefile
247 ./gen_s390x_tables_h --lowercase --i2s --s2i s390x_syscall > $@
248
249 gen_x86_64_tables_h_SOURCES = gen_tables.c gen_tables.h x86_64_table.h
250 gen_x86_64_tables_h_CFLAGS = $(AM_CFLAGS) '-DTABLE_H="x86_64_table.h"'
251+gen_x86_64_tables_h: $(gen_x86_64_tables_h_SOURCES)
252+ $(CC_FOR_BUILD) -DHAVE_CONFIG_H -I. -I.. -I../auparse $(gen_x86_64_tables_h_CFLAGS) $(LDFLAGS) -o $@ $<
253 x86_64_tables.h: gen_x86_64_tables_h Makefile
254 ./gen_x86_64_tables_h --lowercase --i2s --s2i x86_64_syscall > $@
255--
2561.7.5.4
257
diff --git a/recipes-security/audit/audit_2.1.3.bb b/recipes-security/audit/audit_2.1.3.bb
index 7e6fac4..c12ddb2 100644
--- a/recipes-security/audit/audit_2.1.3.bb
+++ b/recipes-security/audit/audit_2.1.3.bb
@@ -12,6 +12,8 @@ SRC_URI = "http://people.redhat.com/sgrubb/audit/audit-2.1.3.tar.gz \
12 file://disable-ldap.patch \ 12 file://disable-ldap.patch \
13 file://audit-python.patch" 13 file://audit-python.patch"
14 14
15SRC_URI += "file://audit-for-cross-compiling.patch"
16
15inherit autotools 17inherit autotools
16 18
17SRC_URI[md5sum] = "abf26e3ac09f666905c5636dd24611fa" 19SRC_URI[md5sum] = "abf26e3ac09f666905c5636dd24611fa"