Merge pull request conda-forge#7 from ccordoba12/patch-1

Don't use system jpeg and png libraries in OS X to avoid mixing libc++ and libstdc++
ccordoba12 · Jun 4, 2016 · b9e9c15 · b9e9c15
2 parents 122940b + 3bd0327
commit b9e9c15
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/recipes/qt5/build.sh b/recipes/qt5/build.sh
@@ -89,11 +89,11 @@ if [ `uname` == Darwin ]; then
                 -skip wayland \
                 -skip canvas3d \
                 -skip 3d \
-                -system-libjpeg \
-                -system-libpng \
                 -system-zlib \
                 -qt-pcre \
                 -qt-freetype \
+                -qt-libjpeg \
+                -qt-libpng \
                 -c++11 \
                 -no-framework \
                 -no-dbus \
@@ -102,7 +102,8 @@ if [ `uname` == Darwin ]; then
                 -no-xinput2 \
                 -no-xcb-xlib \
                 -no-libudev \
-                -no-egl
+                -no-egl \
+                -no-openssl
 
     DYLD_FALLBACK_LIBRARY_PATH=$PREFIX/lib make -j $MAKE_JOBS
     make install

diff --git a/recipes/qt5/meta.yaml b/recipes/qt5/meta.yaml
@@ -45,14 +45,14 @@ requirements:
     - gst-plugins-base       # [linux]
     - icu           56*
     - jom                    # [win]
-    - jpeg
-    - libpng        1.6*
+    - jpeg                   # [not osx]
+    - libpng        1.6*     # [not osx]
     - libxcb                 # [linux]
     - m2-gperf               # [win]
     - m2-bison               # [win]
     - m2-flex                # [win]
     - m2-git                 # [win]
-    - openssl                # [win or linux]
+    - openssl                # [not osx]
     - perl       >=5.20      # [win]
     - python
     - xz                     # [unix]
@@ -62,12 +62,12 @@ requirements:
     - fontconfig             # [linux]
     - freetype               # [linux]
     - gst-plugins-base       # [linux]
-    - jpeg
+    - jpeg                   # [not osx]
     - icu           56*
     - libgcc                 # [linux]
-    - libpng        1.6*
+    - libpng        1.6*     # [not osx]
     - libxcb                 # [linux]
-    - openssl                # [win or linux]
+    - openssl                # [not osx]
     - zlib
 
 about: