Merge pull request #41 from conda-forge-admin/conda_forge_admin_40

ENH carry patch for UTF-8-MAC

recipe/build.sh

@@ -1,16 +1,22 @@
 #!/usr/bin/env sh
+
+set -euxo pipefail
+
 # Get an updated config.sub and config.guess
 cp $BUILD_PREFIX/share/libtool/build-aux/config.* ./build-aux
 cp $BUILD_PREFIX/share/libtool/build-aux/config.* ./libcharset/build-aux
-set -ex
 
 ./configure --prefix=${PREFIX}  \
             --host=${HOST}      \
             --build=${BUILD}    \
             --enable-static     \
             --disable-rpath
 
-make -j${CPU_COUNT} ${VERBOSE_AT}
-if [[ "${CONDA_BUILD_CROSS_COMPILATION}" != "1" ]]; then
+if [[ "${target_platform}" == osx-* ]]; then
+    make -f Makefile.devel CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS}"
+fi
+
+make -j${CPU_COUNT}
+if [[ "${CONDA_BUILD_CROSS_COMPILATION:-0}" != "1" ]]; then
   make check
 fi

recipe/meta.yaml

@@ -12,13 +12,17 @@ source:
     - CMakeLists.txt.patch  # [win]
     - config.h.patch  # [win]
     - configure.cmake.patch  # [win]
+    - utf_8_mac.patch  # [osx]
 
 build:
-  number: 1
-
+  number: 2
 
 requirements:
   build:
+    - automake  # [osx]
+    - autoconf  # [osx]
+    - groff     # [osx]
+    - gperf     # [osx]
     - libtool   # [unix]
     - {{ compiler('c') }}
     - cmake     # [win]
@@ -72,6 +76,7 @@ outputs:
       license: LGPL-2.1-only
       license_file: COPYING.LIB
       summary: Provides iconv for systems which don't have one (or that cannot convert from/to Unicode.)
+
   - name: iconv
     script: install.sh
     # there is no executable available on windows, see
@@ -90,11 +95,18 @@ outputs:
     test:
       commands:
         - iconv --help
+        # print all supported encodings
+        - iconv -l | grep "UTF-8-MAC"  # [osx]
+        # Ensure we run the built iconv and not the one from the base system.
+        - test "$(command -v iconv)" = "${PREFIX}/bin/iconv"  # [unix]
+        # Test working patched-in UTF-8-MAC encoding.
+        - test "$(printf '\xc3\xa4' | iconv --from-code=UTF-8 --to-code=UTF-8-MAC)" = "$(printf '\x61\xcc\x88')"  # [osx]        
     about:
       home: https://www.gnu.org/software/libiconv/
       license: GPL-3.0-only
       license_file: COPYING
       summary: Provides iconv for systems which don't have one (or that cannot convert from/to Unicode.)
+
 about:
   home: https://www.gnu.org/software/libiconv/
   license: GPL-3.0-only AND LGPL-2.1-only
@@ -110,3 +122,4 @@ extra:
     - jakirkham
     - jhamman
     - scopatz
+    - mbargull