diff options
| -rw-r--r-- | main/znc/APKBUILD | 2 | ||||
| -rw-r--r-- | main/znc/libiconv.patch | 17 |
2 files changed, 1 insertions, 18 deletions
diff --git a/main/znc/APKBUILD b/main/znc/APKBUILD index 27081233c5..e5653ae638 100644 --- a/main/znc/APKBUILD +++ b/main/znc/APKBUILD @@ -10,7 +10,7 @@ license="ASL 2.0" depends="" depends_dev="" makedepends="perl-dev openssl-dev cyrus-sasl-dev python-dev c-ares-dev swig - gettext-dev libiconv-dev tcl-dev autoconf automake" + gettext-dev tcl-dev autoconf automake" install="$pkgname.pre-install" pkgusers="$pkgname" subpackages="$pkgname-dev $pkgname-doc $pkgname-extra $pkgname-modtcl diff --git a/main/znc/libiconv.patch b/main/znc/libiconv.patch deleted file mode 100644 index 1fd5838c21..0000000000 --- a/main/znc/libiconv.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- ./configure.ac.orig -+++ ./configure.ac -@@ -504,7 +504,13 @@ - fi - - AC_CHECK_FUNC( iconv, CHARSET=1 ) --AC_CHECK_LIB( iconv, iconv_open, LIBICONV=-liconv ; CHARSET=1 ) -+dnl On some systems iconv is in a separate library, and may actually -+dnl be named libiconv. -+AC_CHECK_LIB( iconv, libiconv_open, LIBICONV=-liconv ; CHARSET=1 ) -+if test $ac_cv_lib_iconv_libiconv = no; then -+ AC_CHECK_LIB( iconv, iconv_open, LIBICONV=-liconv ; CHARSET=1 ) -+fi -+ - if test "x$CHARSET" = "x1" - then - AC_MSG_CHECKING([whether iconv expects a const second argument]) |