diff options
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm/rpm-autogen.patch')
-rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-autogen.patch | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-autogen.patch b/meta/recipes-devtools/rpm/rpm/rpm-autogen.patch new file mode 100644 index 0000000000..323bb7151e --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm/rpm-autogen.patch | |||
@@ -0,0 +1,54 @@ | |||
1 | Remove the sanity checking from the rpm autogen.sh. This is required because | ||
2 | we may have slightly different, but yet compatible versions. If we do end | ||
3 | up breaking things, we'll deal with it at that time. | ||
4 | |||
5 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | ||
6 | |||
7 | diff -ur rpm-5.4.0.orig/autogen.sh rpm-5.4.0/autogen.sh | ||
8 | --- rpm-5.4.0.orig/autogen.sh 2010-11-02 11:55:53.000000000 -0500 | ||
9 | +++ rpm-5.4.0/autogen.sh 2011-01-06 00:15:05.158946295 -0600 | ||
10 | @@ -34,12 +34,6 @@ | ||
11 | eval $_libtoolize $_libtoolize_args | ||
12 | } | ||
13 | |||
14 | -# requirements sanity check | ||
15 | -[ "`automake --version | head -1`" != "$AMV" ] && echo "$USAGE" # && exit 1 | ||
16 | -[ "`autoconf --version | head -1`" != "$ACV" ] && echo "$USAGE" # && exit 1 | ||
17 | -[ "`libtoolize --version | head -1`" != "$LTV" ] && echo "$USAGE" # && exit 1 | ||
18 | -[ "`gettextize --version | head -1 | sed -e 's;^.*/\\(gettextize\\);\\1;'`" != "$GTT" ] && echo "$USAGE" # && exit 1 | ||
19 | - | ||
20 | for dir in bash beecrypt file neon pcre popt rc syck xar xz; do | ||
21 | |||
22 | if [ -d $dir ]; then | ||
23 | diff -ur rpm-5.4.0.orig/neon/autogen.sh rpm-5.4.0/neon/autogen.sh | ||
24 | --- rpm-5.4.0.orig/neon/autogen.sh 2010-10-30 19:11:33.000000000 -0500 | ||
25 | +++ rpm-5.4.0/neon/autogen.sh 2011-01-06 00:15:17.863962139 -0600 | ||
26 | @@ -34,12 +34,6 @@ | ||
27 | eval $_libtoolize $_libtoolize_args | ||
28 | } | ||
29 | |||
30 | -# requirements sanity check | ||
31 | -[ "`automake --version | head -1`" != "$AMV" ] && echo "$USAGE" # && exit 1 | ||
32 | -[ "`autoconf --version | head -1`" != "$ACV" ] && echo "$USAGE" # && exit 1 | ||
33 | -[ "`libtoolize --version | head -1`" != "$LTV" ] && echo "$USAGE" # && exit 1 | ||
34 | -[ "`gettextize --version | head -1 | sed -e 's;^.*/\\(gettextize\\);\\1;'`" != "$GTT" ] && echo "$USAGE" # && exit 1 | ||
35 | - | ||
36 | echo "---> generate files via GNU libtool (libtoolize)" | ||
37 | libtoolize --quiet --copy --force --install | ||
38 | echo "---> generate files via GNU autoconf (aclocal, autoheader)" | ||
39 | diff -ur rpm-5.4.0.orig/syck/autogen.sh rpm-5.4.0/syck/autogen.sh | ||
40 | --- rpm-5.4.0.orig/syck/autogen.sh 2010-11-02 11:55:56.000000000 -0500 | ||
41 | +++ rpm-5.4.0/syck/autogen.sh 2011-01-06 00:15:27.103949601 -0600 | ||
42 | @@ -34,12 +34,6 @@ | ||
43 | eval $_libtoolize $_libtoolize_args | ||
44 | } | ||
45 | |||
46 | -# requirements sanity check | ||
47 | -[ "`automake --version | head -1`" != "$AMV" ] && echo "$USAGE" # && exit 1 | ||
48 | -[ "`autoconf --version | head -1`" != "$ACV" ] && echo "$USAGE" # && exit 1 | ||
49 | -[ "`libtoolize --version | head -1`" != "$LTV" ] && echo "$USAGE" # && exit 1 | ||
50 | -[ "`gettextize --version | head -1 | sed -e 's;^.*/\\(gettextize\\);\\1;'`" != "$GTT" ] && echo "$USAGE" # && exit 1 | ||
51 | - | ||
52 | echo "---> generate files via GNU libtool (libtoolize)" | ||
53 | libtoolize --quiet --copy --force --install | ||
54 | echo "---> generate files via GNU autoconf (aclocal, autoheader)" | ||