From 7d265e6f7071245dc83d91972ef5342edc7d373a Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Tue, 14 Oct 2014 01:42:11 +0000 Subject: Remove i686-pc-mingw32 package recipes Signed-off-by: Timothy Gu --- src/gdal.mk | 1 - src/libvpx.mk | 1 - src/libwebsockets.mk | 3 --- src/oce.mk | 1 - src/openssl.mk | 1 - src/portaudio.mk | 9 +-------- src/qscintilla2.mk | 1 - src/qt3d.mk | 1 - src/qtactiveqt.mk | 1 - src/qtbase.mk | 1 - src/qtconnectivity.mk | 1 - src/qtdeclarative.mk | 1 - src/qtenginio.mk | 1 - src/qtgraphicaleffects.mk | 1 - src/qtimageformats.mk | 1 - src/qtlocation.mk | 1 - src/qtmultimedia.mk | 1 - src/qtquick1.mk | 1 - src/qtquickcontrols.mk | 1 - src/qtscript.mk | 1 - src/qtsensors.mk | 1 - src/qtserialport.mk | 1 - src/qtservice.mk | 1 - src/qtsvg.mk | 1 - src/qtsystems.mk | 1 - src/qttools.mk | 1 - src/qttranslations.mk | 1 - src/qtwebkit.mk | 1 - src/qtwebsockets.mk | 1 - src/qtwinextras.mk | 1 - src/qtxmlpatterns.mk | 1 - src/qwt.mk | 1 - src/sdl2.mk | 3 --- src/sdl2_gfx.mk | 3 --- src/sdl2_image.mk | 3 --- src/sdl2_mixer.mk | 1 - src/sdl2_net.mk | 1 - src/sdl2_ttf.mk | 1 - src/smpeg2.mk | 1 - 39 files changed, 1 insertion(+), 54 deletions(-) diff --git a/src/gdal.mk b/src/gdal.mk index fdf39eb..9e72054 100644 --- a/src/gdal.mk +++ b/src/gdal.mk @@ -108,6 +108,5 @@ define $(PKG)_BUILD_i686-w64-mingw32 $($(PKG)_MAKE) endef -$(PKG)_BUILD_i686-pc-mingw32.shared = $(PKG)_BUILD_i686-w64-mingw32.shared = $(PKG)_BUILD_x86_64-w64-mingw32.shared = diff --git a/src/libvpx.mk b/src/libvpx.mk index 7eac571..bc2f774 100644 --- a/src/libvpx.mk +++ b/src/libvpx.mk @@ -31,6 +31,5 @@ define $(PKG)_BUILD $(TARGET)-ranlib $(PREFIX)/$(TARGET)/lib/libvpx.a endef -$(PKG)_BUILD_i686-pc-mingw32 = $(subst @libvpx-target@,x86-win32-gcc,$($(PKG)_BUILD)) $(PKG)_BUILD_i686-w64-mingw32 = $(subst @libvpx-target@,x86-win32-gcc,$($(PKG)_BUILD)) $(PKG)_BUILD_x86_64-w64-mingw32 = $(subst @libvpx-target@,x86_64-win64-gcc,$($(PKG)_BUILD)) diff --git a/src/libwebsockets.mk b/src/libwebsockets.mk index 36a2450..f1367d5 100644 --- a/src/libwebsockets.mk +++ b/src/libwebsockets.mk @@ -23,6 +23,3 @@ define $(PKG)_BUILD $(MAKE) -C '$(1)' -j $(JOBS) $(MAKE) -C '$(1)' install endef - -# MinGW 32 lacks mstcpip.h -$(PKG)_BUILD_i686-pc-mingw32 = \ No newline at end of file diff --git a/src/oce.mk b/src/oce.mk index d03e566..ce499fa 100644 --- a/src/oce.mk +++ b/src/oce.mk @@ -32,4 +32,3 @@ define $(PKG)_BUILD $(MAKE) -C '$(1)/examples/find_package_oce' endef -$(PKG)_BUILD_i686-pc-mingw32 := diff --git a/src/openssl.mk b/src/openssl.mk index de64d47..c2d63c8 100644 --- a/src/openssl.mk +++ b/src/openssl.mk @@ -32,6 +32,5 @@ define $(PKG)_BUILD CROSS_COMPILE='$(TARGET)-' endef -$(PKG)_BUILD_i686-pc-mingw32 = $(subst @openssl-target@,mingw,$($(PKG)_BUILD)) $(PKG)_BUILD_i686-w64-mingw32 = $(subst @openssl-target@,mingw,$($(PKG)_BUILD)) $(PKG)_BUILD_x86_64-w64-mingw32 = $(subst @openssl-target@,mingw64,$($(PKG)_BUILD)) diff --git a/src/portaudio.mk b/src/portaudio.mk index e0f4f48..b0f0c32 100644 --- a/src/portaudio.mk +++ b/src/portaudio.mk @@ -25,7 +25,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ $(MXE_CONFIGURE_OPTS) \ --with-host_os=mingw \ - --with-winapi=@portaudio-winapi@ \ + --with-winapi=wmme,directx \ --with-dxdir=$(PREFIX)/$(TARGET) \ ac_cv_path_AR=$(TARGET)-ar \ $(if $(BUILD_SHARED),\ @@ -39,10 +39,3 @@ define $(PKG)_BUILD '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-portaudio.exe' \ `'$(TARGET)-pkg-config' portaudio-2.0 --cflags --libs` endef - -$(PKG)_WINAPI_MINGW_ORG = wmme,directx,wasapi,wdmks -$(PKG)_WINAPI_MINGW_W64 = wmme,directx - -$(PKG)_BUILD_i686-pc-mingw32 = $(subst @portaudio-winapi@,$($(PKG)_WINAPI_MINGW_ORG),$($(PKG)_BUILD)) -$(PKG)_BUILD_i686-w64-mingw32 = $(subst @portaudio-winapi@,$($(PKG)_WINAPI_MINGW_W64),$($(PKG)_BUILD)) -$(PKG)_BUILD_x86_64-w64-mingw32 = $(subst @portaudio-winapi@,$($(PKG)_WINAPI_MINGW_W64),$($(PKG)_BUILD)) diff --git a/src/qscintilla2.mk b/src/qscintilla2.mk index 8e12d0a..37872b5 100644 --- a/src/qscintilla2.mk +++ b/src/qscintilla2.mk @@ -30,4 +30,3 @@ define $(PKG)_BUILD `'$(TARGET)-pkg-config' Qt5Widgets --libs` endef -$(PKG)_BUILD_i686-pc-mingw32 = diff --git a/src/qt3d.mk b/src/qt3d.mk index a41eac7..ab6c767 100644 --- a/src/qt3d.mk +++ b/src/qt3d.mk @@ -17,4 +17,3 @@ define $(PKG)_BUILD $(MAKE) -C '$(1)' -j 1 install endef -$(PKG)_BUILD_i686-pc-mingw32 := diff --git a/src/qtactiveqt.mk b/src/qtactiveqt.mk index 35e610a..2d0f9c4 100644 --- a/src/qtactiveqt.mk +++ b/src/qtactiveqt.mk @@ -20,4 +20,3 @@ define $(PKG)_BUILD $(MAKE) -C '$(1)' -j 1 install endef -$(PKG)_BUILD_i686-pc-mingw32 = diff --git a/src/qtbase.mk b/src/qtbase.mk index 4d57d81..e51734c 100644 --- a/src/qtbase.mk +++ b/src/qtbase.mk @@ -84,7 +84,6 @@ define $(PKG)_BUILD > '$(PREFIX)/$(TARGET)/bin/test-qt5.bat' endef -$(PKG)_BUILD_i686-pc-mingw32 = $(PKG)_BUILD_SHARED = $(subst -static ,-shared ,\ $(subst -qt-sql-,-plugin-sql-,\ diff --git a/src/qtconnectivity.mk b/src/qtconnectivity.mk index d070229..b1c0f37 100644 --- a/src/qtconnectivity.mk +++ b/src/qtconnectivity.mk @@ -20,4 +20,3 @@ define $(PKG)_BUILD $(MAKE) -C '$(1)' -j 1 install endef -$(PKG)_BUILD_i686-pc-mingw32 := diff --git a/src/qtdeclarative.mk b/src/qtdeclarative.mk index 84bd7fd..567f308 100644 --- a/src/qtdeclarative.mk +++ b/src/qtdeclarative.mk @@ -20,4 +20,3 @@ define $(PKG)_BUILD $(MAKE) -C '$(1)' -j 1 install endef -$(PKG)_BUILD_i686-pc-mingw32 := diff --git a/src/qtenginio.mk b/src/qtenginio.mk index 8952e58..5bbe235 100644 --- a/src/qtenginio.mk +++ b/src/qtenginio.mk @@ -20,4 +20,3 @@ define $(PKG)_BUILD $(MAKE) -C '$(1)' -j 1 install endef -$(PKG)_BUILD_i686-pc-mingw32 = diff --git a/src/qtgraphicaleffects.mk b/src/qtgraphicaleffects.mk index 1c802f0..e293233 100644 --- a/src/qtgraphicaleffects.mk +++ b/src/qtgraphicaleffects.mk @@ -20,4 +20,3 @@ define $(PKG)_BUILD $(MAKE) -C '$(1)' -j 1 install endef -$(PKG)_BUILD_i686-pc-mingw32 := diff --git a/src/qtimageformats.mk b/src/qtimageformats.mk index 949cf0f..e9e9498 100644 --- a/src/qtimageformats.mk +++ b/src/qtimageformats.mk @@ -20,4 +20,3 @@ define $(PKG)_BUILD $(MAKE) -C '$(1)' -j 1 install endef -$(PKG)_BUILD_i686-pc-mingw32 := diff --git a/src/qtlocation.mk b/src/qtlocation.mk index 22ae68c..1bbe3d2 100644 --- a/src/qtlocation.mk +++ b/src/qtlocation.mk @@ -20,4 +20,3 @@ define $(PKG)_BUILD $(MAKE) -C '$(1)' -j 1 install endef -$(PKG)_BUILD_i686-pc-mingw32 := diff --git a/src/qtmultimedia.mk b/src/qtmultimedia.mk index b8e67a3..bc07de6 100644 --- a/src/qtmultimedia.mk +++ b/src/qtmultimedia.mk @@ -20,4 +20,3 @@ define $(PKG)_BUILD $(MAKE) -C '$(1)' -j 1 install endef -$(PKG)_BUILD_i686-pc-mingw32 = diff --git a/src/qtquick1.mk b/src/qtquick1.mk index 6df9fe6..c347184 100644 --- a/src/qtquick1.mk +++ b/src/qtquick1.mk @@ -20,4 +20,3 @@ define $(PKG)_BUILD $(MAKE) -C '$(1)' -j 1 install endef -$(PKG)_BUILD_i686-pc-mingw32 := diff --git a/src/qtquickcontrols.mk b/src/qtquickcontrols.mk index c61c122..78b85e4 100644 --- a/src/qtquickcontrols.mk +++ b/src/qtquickcontrols.mk @@ -20,4 +20,3 @@ define $(PKG)_BUILD $(MAKE) -C '$(1)' -j 1 install endef -$(PKG)_BUILD_i686-pc-mingw32 := diff --git a/src/qtscript.mk b/src/qtscript.mk index b236c33..a1db869 100644 --- a/src/qtscript.mk +++ b/src/qtscript.mk @@ -20,4 +20,3 @@ define $(PKG)_BUILD $(MAKE) -C '$(1)' -j 1 install endef -$(PKG)_BUILD_i686-pc-mingw32 = diff --git a/src/qtsensors.mk b/src/qtsensors.mk index 6c4c6ac..e88abbf 100644 --- a/src/qtsensors.mk +++ b/src/qtsensors.mk @@ -20,4 +20,3 @@ define $(PKG)_BUILD $(MAKE) -C '$(1)' -j 1 install endef -$(PKG)_BUILD_i686-pc-mingw32 = diff --git a/src/qtserialport.mk b/src/qtserialport.mk index 61d2d02..cf743e4 100644 --- a/src/qtserialport.mk +++ b/src/qtserialport.mk @@ -20,4 +20,3 @@ define $(PKG)_BUILD $(MAKE) -C '$(1)' -j 1 install endef -$(PKG)_BUILD_i686-pc-mingw32 = diff --git a/src/qtservice.mk b/src/qtservice.mk index 9413fed..a7486d6 100644 --- a/src/qtservice.mk +++ b/src/qtservice.mk @@ -20,4 +20,3 @@ define $(PKG)_BUILD $(MAKE) -C '$(1)/qtservice/buildlib' -j 1 install endef -$(PKG)_BUILD_i686-pc-mingw32 = diff --git a/src/qtsvg.mk b/src/qtsvg.mk index 75f9fd9..d82c7c4 100644 --- a/src/qtsvg.mk +++ b/src/qtsvg.mk @@ -20,4 +20,3 @@ define $(PKG)_BUILD $(MAKE) -C '$(1)' -j 1 install endef -$(PKG)_BUILD_i686-pc-mingw32 = diff --git a/src/qtsystems.mk b/src/qtsystems.mk index 163ac16..8ace17c 100644 --- a/src/qtsystems.mk +++ b/src/qtsystems.mk @@ -21,4 +21,3 @@ define $(PKG)_BUILD $(MAKE) -C '$(1)' -j 1 install endef -$(PKG)_BUILD_i686-pc-mingw32 := diff --git a/src/qttools.mk b/src/qttools.mk index 97e848e..00dcd97 100644 --- a/src/qttools.mk +++ b/src/qttools.mk @@ -20,4 +20,3 @@ define $(PKG)_BUILD $(MAKE) -C '$(1)' -j 1 install endef -$(PKG)_BUILD_i686-pc-mingw32 := diff --git a/src/qttranslations.mk b/src/qttranslations.mk index ac03722..b8f7a07 100644 --- a/src/qttranslations.mk +++ b/src/qttranslations.mk @@ -20,4 +20,3 @@ define $(PKG)_BUILD $(MAKE) -C '$(1)' -j 1 install endef -$(PKG)_BUILD_i686-pc-mingw32 := diff --git a/src/qtwebkit.mk b/src/qtwebkit.mk index 2c92bed..c12b0f2 100644 --- a/src/qtwebkit.mk +++ b/src/qtwebkit.mk @@ -22,4 +22,3 @@ define $(PKG)_BUILD_SHARED $(MAKE) -C '$(1)' -j 1 install endef -$(PKG)_BUILD_i686-pc-mingw32 = diff --git a/src/qtwebsockets.mk b/src/qtwebsockets.mk index a2723dd..1b88471 100644 --- a/src/qtwebsockets.mk +++ b/src/qtwebsockets.mk @@ -20,4 +20,3 @@ define $(PKG)_BUILD $(MAKE) -C '$(1)' -j 1 install endef -$(PKG)_BUILD_i686-pc-mingw32 = diff --git a/src/qtwinextras.mk b/src/qtwinextras.mk index 0137cb4..d9612e9 100644 --- a/src/qtwinextras.mk +++ b/src/qtwinextras.mk @@ -20,4 +20,3 @@ define $(PKG)_BUILD $(MAKE) -C '$(1)' -j 1 install endef -$(PKG)_BUILD_i686-pc-mingw32 = diff --git a/src/qtxmlpatterns.mk b/src/qtxmlpatterns.mk index 37e7086..ba37b1d 100644 --- a/src/qtxmlpatterns.mk +++ b/src/qtxmlpatterns.mk @@ -20,4 +20,3 @@ define $(PKG)_BUILD $(MAKE) -C '$(1)' -j 1 install endef -$(PKG)_BUILD_i686-pc-mingw32 = diff --git a/src/qwt.mk b/src/qwt.mk index 32f7271..daba291 100644 --- a/src/qwt.mk +++ b/src/qwt.mk @@ -32,4 +32,3 @@ define $(PKG)_BUILD $(INSTALL) -m755 '$(1)/examples/bin/sinusplot.exe' '$(PREFIX)/$(TARGET)/bin/test-qwt.exe' endef -$(PKG)_BUILD_i686-pc-mingw32 := diff --git a/src/sdl2.mk b/src/sdl2.mk index b7f8dbe..ca4e2dc 100644 --- a/src/sdl2.mk +++ b/src/sdl2.mk @@ -28,6 +28,3 @@ define $(PKG)_BUILD $(MAKE) -C '$(1)' -j 1 install ln -sf '$(PREFIX)/$(TARGET)/bin/sdl2-config' '$(PREFIX)/bin/$(TARGET)-sdl2-config' endef - -# MinGW32 does not have dxgi.h... -$(PKG)_BUILD_i686-pc-mingw32 = diff --git a/src/sdl2_gfx.mk b/src/sdl2_gfx.mk index 876063b..b11a317 100644 --- a/src/sdl2_gfx.mk +++ b/src/sdl2_gfx.mk @@ -30,6 +30,3 @@ define $(PKG)_BUILD '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-sdl2_gfx.exe' \ `'$(TARGET)-pkg-config' SDL2_gfx --cflags --libs` endef - -# sdl2 is disabled on i686-pc-mingw32. -$(PKG)_BUILD_i686-pc-mingw32 = diff --git a/src/sdl2_image.mk b/src/sdl2_image.mk index 3505853..c65dec6 100644 --- a/src/sdl2_image.mk +++ b/src/sdl2_image.mk @@ -28,6 +28,3 @@ define $(PKG)_BUILD --disable-tif-shared $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef - -# Disable until sdl2 can be built on MinGW32 -$(PKG)_BUILD_i686-pc-mingw32 = diff --git a/src/sdl2_mixer.mk b/src/sdl2_mixer.mk index 0f0dc8d..0d04321 100644 --- a/src/sdl2_mixer.mk +++ b/src/sdl2_mixer.mk @@ -47,5 +47,4 @@ define $(PKG)_BUILD `'$(TARGET)-pkg-config' SDL2_mixer --cflags --libs` endef -$(PKG)_BUILD_i686-pc-mingw32 = diff --git a/src/sdl2_net.mk b/src/sdl2_net.mk index dce9518..cae1644 100644 --- a/src/sdl2_net.mk +++ b/src/sdl2_net.mk @@ -31,4 +31,3 @@ define $(PKG)_BUILD -lws2_32 -liphlpapi endef -$(PKG)_BUILD_i686-pc-mingw32 = diff --git a/src/sdl2_ttf.mk b/src/sdl2_ttf.mk index f646ef8..3f2f4ad 100644 --- a/src/sdl2_ttf.mk +++ b/src/sdl2_ttf.mk @@ -28,4 +28,3 @@ define $(PKG)_BUILD $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef -$(PKG)_BUILD_i686-pc-mingw32 = diff --git a/src/smpeg2.mk b/src/smpeg2.mk index b235120..c600cb8 100644 --- a/src/smpeg2.mk +++ b/src/smpeg2.mk @@ -36,4 +36,3 @@ define $(PKG)_BUILD `'$(PREFIX)/$(TARGET)/bin/smpeg2-config' --cflags --libs` endef -$(PKG)_BUILD_i686-pc-mingw32 = -- cgit v0.12