Qt5: Make 5.6 compile on OS X

conda-archive · Apr 19, 2016 · 0de76ec · 0de76ec
1 parent 3c1e5db
commit 0de76ec
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/qt5/build.sh b/qt5/build.sh
@@ -94,8 +94,19 @@ if [ `uname` == Darwin ]; then
                 -nomake examples \
                 -nomake tests \
                 -verbose \
-                -skip qtwebengine \
+                -skip webengine \
+                -skip enginio \
+                -skip location \
+                -skip sensors \
+                -skip serialport \
+                -skip script \
+                -skip serialbus \
+                -skip quickcontrols2 \
+                -skip wayland \
+                -skip canvas3d \
+                -skip 3d \
                 -qt-pcre \
+                -qt-freetype \
                 -platform macx-g++ \
                 -no-c++11 \
                 -no-framework \
@@ -107,7 +118,7 @@ if [ `uname` == Darwin ]; then
                 -no-libudev \
                 -no-egl
 
-    make -j $MAKE_JOBS
+    DYLD_FALLBACK_LIBRARY_PATH=$PREFIX/lib make -j $MAKE_JOBS
     make install
 
 fi

diff --git a/qt5/meta.yaml b/qt5/meta.yaml
@@ -18,8 +18,6 @@ requirements:
     - icu           54*
     - python
     - jom                         [win]
-    - freetype                    [unix]
-    - openssl                     [unix]
     - libpng        1.6*          [unix]
     - jpeg                        [unix]
     - zlib                        [unix]
@@ -30,18 +28,20 @@ requirements:
     - gst-plugins-base   1.8*     [linux]
     - libxcb                      [linux]
     - gcc                         [linux]
+    - freetype                    [linux]
+    - openssl                     [linux]
 
   run:
     - icu           54*
-    - freetype                    [unix]
     - zlib                        [unix]
-    - openssl                     [unix]
     - libpng        1.6*          [unix]
     - jpeg                        [unix]
     - fontconfig                  [linux]
     - gst-plugins-base   1.8*     [linux]
     - libxcb                      [linux]
     - libgcc                      [linux]
+    - freetype                    [linux]
+    - openssl                     [linux]
 
 about:
     home: http://www.qt.io