diff options
| -rw-r--r-- | packages/alsa/alsa-utils_1.0.18.bb | 1 | ||||
| -rw-r--r-- | packages/alsa/files/alsa-utils-autoconf-strl-funcs.patch | 43 | ||||
| -rw-r--r-- | packages/alsa/files/alsa-utils-strl-funcs-non-static.patch | 22 |
3 files changed, 66 insertions, 0 deletions
diff --git a/packages/alsa/alsa-utils_1.0.18.bb b/packages/alsa/alsa-utils_1.0.18.bb index 5bcad4f525..2931545252 100644 --- a/packages/alsa/alsa-utils_1.0.18.bb +++ b/packages/alsa/alsa-utils_1.0.18.bb @@ -8,6 +8,7 @@ PR = "r1" SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \ file://alsa-utils-automake.patch;patch=1 \ file://alsa-utils-remove-xmlto.patch;patch=1 \ + file://alsa-utils-autoconf-strl-funcs.patch;patch=1 \ " inherit autotools diff --git a/packages/alsa/files/alsa-utils-autoconf-strl-funcs.patch b/packages/alsa/files/alsa-utils-autoconf-strl-funcs.patch new file mode 100644 index 0000000000..0c8404de5b --- /dev/null +++ b/packages/alsa/files/alsa-utils-autoconf-strl-funcs.patch @@ -0,0 +1,43 @@ +Index: alsa-utils-1.0.18/alsactl/init_sysdeps.c +=================================================================== +--- alsa-utils-1.0.18.orig/alsactl/init_sysdeps.c 2008-10-29 05:42:11.000000000 -0700 ++++ alsa-utils-1.0.18/alsactl/init_sysdeps.c 2009-02-10 23:17:47.000000000 -0800 +@@ -17,7 +17,7 @@ + * + */ + +-#ifdef __GLIBC__ ++#if !HAVE_STRLCPY + static size_t strlcpy(char *dst, const char *src, size_t size) + { + size_t bytes = 0; +@@ -36,7 +36,10 @@ + *q = '\0'; + return bytes; + } ++#endif /* !HAVE_STRLCPY */ + ++ ++#if !HAVE_STRLCAT + static size_t strlcat(char *dst, const char *src, size_t size) + { + size_t bytes = 0; +@@ -60,4 +63,4 @@ + *q = '\0'; + return bytes; + } +-#endif /* __GLIBC__ */ ++#endif /* !HAVE_STRLCAT */ +Index: alsa-utils-1.0.18/configure.in +=================================================================== +--- alsa-utils-1.0.18.orig/configure.in 2008-10-29 05:48:01.000000000 -0700 ++++ alsa-utils-1.0.18/configure.in 2009-02-10 23:02:07.000000000 -0800 +@@ -6,7 +6,7 @@ + + AM_GNU_GETTEXT([external]) + AM_GNU_GETTEXT_VERSION([0.15]) +- ++AC_CHECK_FUNCS(strlcat strlcpy) + dnl Checks for programs. + + dnl try to gues cross-compiler if not set diff --git a/packages/alsa/files/alsa-utils-strl-funcs-non-static.patch b/packages/alsa/files/alsa-utils-strl-funcs-non-static.patch new file mode 100644 index 0000000000..db6bacfca0 --- /dev/null +++ b/packages/alsa/files/alsa-utils-strl-funcs-non-static.patch @@ -0,0 +1,22 @@ +Index: alsa-utils-1.0.18/alsactl/init_sysdeps.c +=================================================================== +--- alsa-utils-1.0.18.orig/alsactl/init_sysdeps.c 2009-01-25 21:12:40.000000000 -0800 ++++ alsa-utils-1.0.18/alsactl/init_sysdeps.c 2009-01-25 21:12:56.000000000 -0800 +@@ -18,7 +18,7 @@ + */ + + #ifdef __GLIBC__ +-static size_t strlcpy(char *dst, const char *src, size_t size) ++size_t strlcpy(char *dst, const char *src, size_t size) + { + size_t bytes = 0; + char *q = dst; +@@ -37,7 +37,7 @@ + return bytes; + } + +-static size_t strlcat(char *dst, const char *src, size_t size) ++size_t strlcat(char *dst, const char *src, size_t size) + { + size_t bytes = 0; + char *q = dst; |