diff options
| author | Andrew Manison <amanison@anselsystems.com> | 2010-07-14 15:39:29 +0000 |
|---|---|---|
| committer | Andrew Manison <amanison@anselsystems.com> | 2010-07-14 15:39:29 +0000 |
| commit | 6e8020140bbfb5e42802eed7c1491e675924cc01 (patch) | |
| tree | cc54f3cce7238609561da3b2de59e2d3780c1085 /testing/open-vm-tools/iconv-uclibc.patch | |
| parent | 4ae2c3d81c309f93d2c41e22e71c5cf445123896 (diff) | |
| parent | daa6e0d05fff7a0d1216fd6719e32d5426b24e8b (diff) | |
| download | aports-6e8020140bbfb5e42802eed7c1491e675924cc01.tar.bz2 aports-6e8020140bbfb5e42802eed7c1491e675924cc01.tar.xz | |
Merge remote branch 'alpine/master'
Conflicts:
main/man-pages/APKBUILD
Diffstat (limited to 'testing/open-vm-tools/iconv-uclibc.patch')
| -rw-r--r-- | testing/open-vm-tools/iconv-uclibc.patch | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/testing/open-vm-tools/iconv-uclibc.patch b/testing/open-vm-tools/iconv-uclibc.patch new file mode 100644 index 000000000..6b256db88 --- /dev/null +++ b/testing/open-vm-tools/iconv-uclibc.patch @@ -0,0 +1,12 @@ +--- ./configure.ac.orig ++++ ./configure.ac +@@ -1059,6 +1059,9 @@ + AC_DEFINE([NO_MULTIMON], 1, [Define to 1 if building without multimon support.]) + fi + ++AM_ICONV ++LIBVMTOOLS_LIBADD="$LIBVMTOOLS_LIBADD $LIBICONV" ++ + if test "$os$userSpaceBitness" = "linux64" || test "$HAVE_SYS_SETUID" = "yes"; then + LIB_MISC_CPPFLAGS="$LIB_MISC_CPPFLAGS -DGLIBC_VERSION_21" + fi |