Simplify overrides, and add shared build support to poppler.

3 files changed, 12 insertions, 67 deletions

diff --git a/plugins/qt5-deps/overrides.mk b/plugins/qt5-deps/overrides.mk
index 403f1b3..c437086 100644
--- a/plugins/qt5-deps/overrides.mk
+++ b/plugins/qt5-deps/overrides.mk
@@ -1,60 +1,5 @@
 # This file is part of MXE.
 # See index.html for further information.
 
-poppler_DEPS     := gcc cairo curl freetype glib jpeg lcms libpng qtbase tiff zlib
-
-define poppler_BUILD
-    # Note: Specifying LIBS explicitly is necessary for configure to properly
-    #       pick up libtiff (otherwise linking a minimal test program fails not
-    #       because libtiff is not found, but because some references are
-    #       undefined)
-    cd '$(1)' \
-        && PATH='$(PREFIX)/$(TARGET)/qt/bin:$(PATH)' \
-        ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
-        --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-silent-rules \
-        --disable-shared \
-        --enable-static \
-        --enable-xpdf-headers \
-        --enable-poppler-qt5 \
-        --enable-zlib \
-        --enable-cms=lcms2 \
-        --enable-libcurl \
-        --enable-libtiff \
-        --enable-libjpeg \
-        --enable-libpng \
-        --enable-poppler-glib \
-        --enable-poppler-cpp \
-        --enable-cairo-output \
-        --enable-splash-output \
-        --enable-compile-warnings=yes \
-        --enable-introspection=auto \
-        --disable-libopenjpeg \
-        --disable-gtk-test \
-        --disable-utils \
-        --disable-gtk-doc \
-        --disable-gtk-doc-html \
-        --disable-gtk-doc-pdf \
-        --with-font-configuration=win32 \
-        PKG_CONFIG_PATH_$(subst .,_,$(subst -,_,$(TARGET)))='$(PREFIX)/$(TARGET)/qt/lib/pkgconfig' \
-        CXXFLAGS=-D_WIN32_WINNT=0x0500 \
-        LIBTIFF_LIBS="`'$(TARGET)-pkg-config' libtiff-4 --libs`"
-    PATH='$(PREFIX)/$(TARGET)/qt/bin:$(PATH)' \
-        $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
-    $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
-
-    # Test program
-    '$(TARGET)-g++' \
-        -W -Wall -Werror -ansi -pedantic \
-        '$(2).cxx' -o '$(PREFIX)/$(TARGET)/bin/test-poppler.exe' \
-        `'$(TARGET)-pkg-config' poppler poppler-cpp --cflags --libs`
-endef
-
-poppler_BUILD_SHARED =
-
-openscenegraph_DEPS     := gcc boost curl dcmtk freetype gdal giflib gstreamer \
-                   gta jasper jpeg libpng openal openexr openthreads poppler \
-                   qtbase tiff zlib
-
+poppler_DEPS := $(filter-out qt ,$(poppler_DEPS)) qtbase
+openscenegraph_DEPS := $(filter-out qt ,$(openscenegraph_DEPS)) qtbase
diff --git a/src/openscenegraph.mk b/src/openscenegraph.mk
index de3fda2..0ebb2e2 100644
--- a/src/openscenegraph.mk
+++ b/src/openscenegraph.mk
@@ -32,6 +32,9 @@ define $(PKG)_BUILD
         -DBUILD_OSG_APPLICATIONS=OFF \
         -DPOPPLER_HAS_CAIRO_EXITCODE=0 \
         -D_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS_EXITCODE=1 \
-        -D_OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED=1
+        -D_OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED=1 \
+        $(if $(filter qtbase,$(PKG)_DEPS), \
+          -DDESIRED_QT_VERSION=4, \
+          -DDESIRED_QT_VERSION=5)
     $(MAKE) -C '$(1).build' -j '$(JOBS)' install VERBOSE=1
 endef
diff --git a/src/poppler.mk b/src/poppler.mk
index e569d84..305b40f 100644
--- a/src/poppler.mk
+++ b/src/poppler.mk
@@ -24,14 +24,14 @@ define $(PKG)_BUILD
     cd '$(1)' \
         && PATH='$(PREFIX)/$(TARGET)/qt/bin:$(PATH)' \
         ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
-        --prefix='$(PREFIX)/$(TARGET)' \
+        $(MXE_CONFIGURE_OPTS) \
         --disable-silent-rules \
-        --disable-shared \
-        --enable-static \
         --enable-xpdf-headers \
-        --enable-poppler-qt4 \
+        $(if $(filter qtbase,$(PKG)_DEPS), \
+          --enable-poppler-qt4 \
+          --disable-poppler-qt5, \
+          --disable-poppler-qt4 \
+          --enable-poppler-qt5) \
         --enable-zlib \
         --enable-cms=lcms2 \
         --enable-libcurl \
@@ -64,6 +64,3 @@ define $(PKG)_BUILD
         '$(2).cxx' -o '$(PREFIX)/$(TARGET)/bin/test-poppler.exe' \
         `'$(TARGET)-pkg-config' poppler poppler-cpp --cflags --libs`
 endef
-
-$(PKG)_BUILD_SHARED =
-