diff options
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm/rpm-macros.patch')
-rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-macros.patch | 64 |
1 files changed, 0 insertions, 64 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-macros.patch b/meta/recipes-devtools/rpm/rpm/rpm-macros.patch deleted file mode 100644 index c7ab2d2bb7..0000000000 --- a/meta/recipes-devtools/rpm/rpm/rpm-macros.patch +++ /dev/null | |||
@@ -1,64 +0,0 @@ | |||
1 | macros/macros.in: Revert settings to the same as RPM 5.4.0 | ||
2 | |||
3 | Enable a reasonable set of rpmdeps dependency helper macros. These sets | ||
4 | were used by RPM 5.4.0. | ||
5 | |||
6 | Upstream-Status: Inappropriate [configuration] | ||
7 | |||
8 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | ||
9 | |||
10 | Index: rpm-5.4.14/macros/macros.in | ||
11 | =================================================================== | ||
12 | --- rpm-5.4.14.orig/macros/macros.in | ||
13 | +++ rpm-5.4.14/macros/macros.in | ||
14 | @@ -1022,7 +1022,7 @@ $_arbitrary_tags_tests Foo:Bar | ||
15 | |||
16 | #============================================================================== | ||
17 | # ---- rpmbuild macros. | ||
18 | -#%%{load:%{_usrlibrpm}/macros.rpmbuild} | ||
19 | +%{load:%{_usrlibrpm}/macros.rpmbuild} | ||
20 | |||
21 | #------------------------------------------------------------------------ | ||
22 | # cmake(...) configuration | ||
23 | @@ -1038,15 +1038,15 @@ $_arbitrary_tags_tests Foo:Bar | ||
24 | |||
25 | #------------------------------------------------------------------------ | ||
26 | # perl(...) configuration | ||
27 | -#%%{load:%{_usrlibrpm}/macros.d/perl} | ||
28 | +%{load:%{_usrlibrpm}/macros.d/perl} | ||
29 | |||
30 | #------------------------------------------------------------------------ | ||
31 | # python(...) configuration. | ||
32 | -#%%{load:%{_usrlibrpm}/macros.d/python} | ||
33 | +%{load:%{_usrlibrpm}/macros.d/python} | ||
34 | |||
35 | #------------------------------------------------------------------------ | ||
36 | # php(...) configuration. | ||
37 | -#%%{load:%{_usrlibrpm}/macros.d/php} | ||
38 | +%{load:%{_usrlibrpm}/macros.d/php} | ||
39 | |||
40 | #------------------------------------------------------------------------ | ||
41 | # java(...) configuration. | ||
42 | @@ -1054,11 +1054,11 @@ $_arbitrary_tags_tests Foo:Bar | ||
43 | |||
44 | #------------------------------------------------------------------------ | ||
45 | # libtool(...) configuration. | ||
46 | -#%%{load:%{_usrlibrpm}/macros.d/libtool} | ||
47 | +%{load:%{_usrlibrpm}/macros.d/libtool} | ||
48 | |||
49 | #------------------------------------------------------------------------ | ||
50 | # pkgconfig(...) configuration. | ||
51 | -#%%{load:%{_usrlibrpm}/macros.d/pkgconfig} | ||
52 | +%{load:%{_usrlibrpm}/macros.d/pkgconfig} | ||
53 | |||
54 | #------------------------------------------------------------------------ | ||
55 | # mono(...) configuration. | ||
56 | @@ -1070,7 +1070,7 @@ $_arbitrary_tags_tests Foo:Bar | ||
57 | |||
58 | #------------------------------------------------------------------------ | ||
59 | # tcl(...) configuration. | ||
60 | -#%%{load:%{_usrlibrpm}/macros.d/tcl} | ||
61 | +%{load:%{_usrlibrpm}/macros.d/tcl} | ||
62 | |||
63 | #------------------------------------------------------------------------ | ||
64 | # typelib(...) configuration. | ||