diff options
-rw-r--r-- | meta/recipes-devtools/rsync/files/acinclude.m4 | 95 | ||||
-rw-r--r-- | meta/recipes-devtools/rsync/rsync_3.1.2.bb | 5 |
2 files changed, 0 insertions, 100 deletions
diff --git a/meta/recipes-devtools/rsync/files/acinclude.m4 b/meta/recipes-devtools/rsync/files/acinclude.m4 deleted file mode 100644 index 735b41dec8..0000000000 --- a/meta/recipes-devtools/rsync/files/acinclude.m4 +++ /dev/null | |||
@@ -1,95 +0,0 @@ | |||
1 | dnl verbatim renamed from aclocal.m4 in rsync_3.0.7 | ||
2 | dnl 07/06/2010 - qhe | ||
3 | |||
4 | dnl AC_VALIDATE_CACHE_SYSTEM_TYPE[(cmd)] | ||
5 | dnl if the cache file is inconsistent with the current host, | ||
6 | dnl target and build system types, execute CMD or print a default | ||
7 | dnl error message. | ||
8 | AC_DEFUN(AC_VALIDATE_CACHE_SYSTEM_TYPE, [ | ||
9 | AC_REQUIRE([AC_CANONICAL_SYSTEM]) | ||
10 | AC_MSG_CHECKING([config.cache system type]) | ||
11 | if { test x"${ac_cv_host_system_type+set}" = x"set" && | ||
12 | test x"$ac_cv_host_system_type" != x"$host"; } || | ||
13 | { test x"${ac_cv_build_system_type+set}" = x"set" && | ||
14 | test x"$ac_cv_build_system_type" != x"$build"; } || | ||
15 | { test x"${ac_cv_target_system_type+set}" = x"set" && | ||
16 | test x"$ac_cv_target_system_type" != x"$target"; }; then | ||
17 | AC_MSG_RESULT([different]) | ||
18 | ifelse($#, 1, [$1], | ||
19 | [AC_MSG_ERROR(["you must remove config.cache and restart configure"])]) | ||
20 | else | ||
21 | AC_MSG_RESULT([same]) | ||
22 | fi | ||
23 | ac_cv_host_system_type="$host" | ||
24 | ac_cv_build_system_type="$build" | ||
25 | ac_cv_target_system_type="$target" | ||
26 | ]) | ||
27 | |||
28 | dnl Check for socklen_t: historically on BSD it is an int, and in | ||
29 | dnl POSIX 1g it is a type of its own, but some platforms use different | ||
30 | dnl types for the argument to getsockopt, getpeername, etc. So we | ||
31 | dnl have to test to find something that will work. | ||
32 | |||
33 | dnl This is no good, because passing the wrong pointer on C compilers is | ||
34 | dnl likely to only generate a warning, not an error. We don't call this at | ||
35 | dnl the moment. | ||
36 | |||
37 | AC_DEFUN([TYPE_SOCKLEN_T], | ||
38 | [ | ||
39 | AC_CHECK_TYPE([socklen_t], ,[ | ||
40 | AC_MSG_CHECKING([for socklen_t equivalent]) | ||
41 | AC_CACHE_VAL([rsync_cv_socklen_t_equiv], | ||
42 | [ | ||
43 | # Systems have either "struct sockaddr *" or | ||
44 | # "void *" as the second argument to getpeername | ||
45 | rsync_cv_socklen_t_equiv= | ||
46 | for arg2 in "struct sockaddr" void; do | ||
47 | for t in int size_t unsigned long "unsigned long"; do | ||
48 | AC_TRY_COMPILE([ | ||
49 | #include <sys/types.h> | ||
50 | #include <sys/socket.h> | ||
51 | |||
52 | int getpeername (int, $arg2 *, $t *); | ||
53 | ],[ | ||
54 | $t len; | ||
55 | getpeername(0,0,&len); | ||
56 | ],[ | ||
57 | rsync_cv_socklen_t_equiv="$t" | ||
58 | break | ||
59 | ]) | ||
60 | done | ||
61 | done | ||
62 | |||
63 | if test "x$rsync_cv_socklen_t_equiv" = x; then | ||
64 | AC_MSG_ERROR([Cannot find a type to use in place of socklen_t]) | ||
65 | fi | ||
66 | ]) | ||
67 | AC_MSG_RESULT($rsync_cv_socklen_t_equiv) | ||
68 | AC_DEFINE_UNQUOTED(socklen_t, $rsync_cv_socklen_t_equiv, | ||
69 | [type to use in place of socklen_t if not defined])], | ||
70 | [#include <sys/types.h> | ||
71 | #include <sys/socket.h>]) | ||
72 | ]) | ||
73 | |||
74 | dnl AC_HAVE_TYPE(TYPE,INCLUDES) | ||
75 | AC_DEFUN([AC_HAVE_TYPE], [ | ||
76 | AC_REQUIRE([AC_HEADER_STDC]) | ||
77 | cv=`echo "$1" | sed 'y%./+- %__p__%'` | ||
78 | AC_MSG_CHECKING(for $1) | ||
79 | AC_CACHE_VAL([ac_cv_type_$cv], | ||
80 | AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ | ||
81 | AC_INCLUDES_DEFAULT | ||
82 | $2]], | ||
83 | [[$1 foo;]])], | ||
84 | [eval "ac_cv_type_$cv=yes"], | ||
85 | [eval "ac_cv_type_$cv=no"]))dnl | ||
86 | ac_foo=`eval echo \\$ac_cv_type_$cv` | ||
87 | AC_MSG_RESULT($ac_foo) | ||
88 | if test "$ac_foo" = yes; then | ||
89 | ac_tr_hdr=HAVE_`echo $1 | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'` | ||
90 | if false; then | ||
91 | AC_CHECK_TYPES($1) | ||
92 | fi | ||
93 | AC_DEFINE_UNQUOTED($ac_tr_hdr, 1, [Define if you have type `$1']) | ||
94 | fi | ||
95 | ]) | ||
diff --git a/meta/recipes-devtools/rsync/rsync_3.1.2.bb b/meta/recipes-devtools/rsync/rsync_3.1.2.bb index 7237f43893..5f4733f7b7 100644 --- a/meta/recipes-devtools/rsync/rsync_3.1.2.bb +++ b/meta/recipes-devtools/rsync/rsync_3.1.2.bb | |||
@@ -1,9 +1,5 @@ | |||
1 | require rsync.inc | 1 | require rsync.inc |
2 | 2 | ||
3 | |||
4 | SRC_URI += "file://acinclude.m4 \ | ||
5 | " | ||
6 | |||
7 | SRC_URI[md5sum] = "0f758d7e000c0f7f7d3792610fad70cb" | 3 | SRC_URI[md5sum] = "0f758d7e000c0f7f7d3792610fad70cb" |
8 | SRC_URI[sha256sum] = "ecfa62a7fa3c4c18b9eccd8c16eaddee4bd308a76ea50b5c02a5840f09c0a1c2" | 4 | SRC_URI[sha256sum] = "ecfa62a7fa3c4c18b9eccd8c16eaddee4bd308a76ea50b5c02a5840f09c0a1c2" |
9 | 5 | ||
@@ -15,7 +11,6 @@ PACKAGECONFIG[attr] = "--enable-xattr-support,--disable-xattr-support,attr," | |||
15 | # makefile checks the existence of configure.sh | 11 | # makefile checks the existence of configure.sh |
16 | do_configure_prepend () { | 12 | do_configure_prepend () { |
17 | rm -f ${S}/configure ${S}/configure.sh | 13 | rm -f ${S}/configure ${S}/configure.sh |
18 | cp -f ${WORKDIR}/acinclude.m4 ${S}/ | ||
19 | 14 | ||
20 | # By default, if crosscompiling, rsync disables a number of | 15 | # By default, if crosscompiling, rsync disables a number of |
21 | # capabilities, hardlinking symlinks and special files (i.e. devices) | 16 | # capabilities, hardlinking symlinks and special files (i.e. devices) |