From ff99570612d9d23292d3c7d91b31de6fba35a580 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 24 Oct 2013 10:58:47 +0200 Subject: fix m68k allmodconfig build --- package/ImageMagick/Makefile | 2 ++ package/SDL_gfx/Makefile | 2 -- package/SDL_ttf/Makefile | 2 -- package/alsa-lib/Makefile | 2 -- package/alsa-utils/Makefile | 2 -- package/cairo/Makefile | 2 -- package/cxxtools/Makefile | 2 +- package/exmap/Makefile | 1 + package/ffmpeg/Makefile | 2 +- package/kexec-tools/Makefile | 2 +- package/libglew/Makefile | 2 ++ package/libpng/Makefile | 2 -- package/libthread_db/Makefile | 2 ++ package/libvpx/Makefile | 2 +- package/madplay/Makefile | 2 -- package/microperl/Makefile | 2 +- package/mpg123/Makefile | 2 -- package/pango/Makefile | 4 ---- package/pixman/Makefile | 2 -- package/sdl-image/Makefile | 2 -- package/sdl/Makefile | 2 -- package/sox/Makefile | 2 -- package/tntnet/Makefile | 2 +- package/vlc/Makefile | 2 +- 24 files changed, 14 insertions(+), 35 deletions(-) diff --git a/package/ImageMagick/Makefile b/package/ImageMagick/Makefile index e2b24a587..20c7ba1f5 100644 --- a/package/ImageMagick/Makefile +++ b/package/ImageMagick/Makefile @@ -18,6 +18,8 @@ PKG_NEED_CXX:= 1 PKG_LIBNAME:= libimagemagic PKG_OPTS:= dev +PKG_ARCH_DEPENDS:= !m68k + PKG_SUBPKGS:= CONVERT DISPLAY LIBIMAGEMAGICK PKGSD_LIBIMAGEMAGICK:= imagemagick library PKGSC_LIBIMAGEMAGICK:= libs diff --git a/package/SDL_gfx/Makefile b/package/SDL_gfx/Makefile index b0e114ef0..bc4994ce6 100644 --- a/package/SDL_gfx/Makefile +++ b/package/SDL_gfx/Makefile @@ -16,8 +16,6 @@ PKG_SITES:= http://www.ferzkopp.net/Software/SDL_gfx-2.0/ PKG_LIBNAME:= libsdl-gfx PKG_OPTS:= dev -PKG_ARCH_DEPENDS:= !m68k - include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBSDL_GFX,libsdl-gfx,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) diff --git a/package/SDL_ttf/Makefile b/package/SDL_ttf/Makefile index d8d954521..53e49e1e2 100644 --- a/package/SDL_ttf/Makefile +++ b/package/SDL_ttf/Makefile @@ -16,8 +16,6 @@ PKG_SITES:= http://www.libsdl.org/projects/SDL_ttf/release/ PKG_LIBNAME:= libsdl-ttf PKG_OPTS:= dev -PKG_ARCH_DEPENDS:= !m68k - include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBSDL_TTF,libsdl-ttf,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) diff --git a/package/alsa-lib/Makefile b/package/alsa-lib/Makefile index d4505755e..10726ac09 100644 --- a/package/alsa-lib/Makefile +++ b/package/alsa-lib/Makefile @@ -13,8 +13,6 @@ PKG_URL:= http://www.alsa-project.org/ PKG_SITES:= ftp://ftp.alsa-project.org/pub/lib/ PKG_OPTS:= dev -PKG_ARCH_DEPENDS:= !m68k - DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk diff --git a/package/alsa-utils/Makefile b/package/alsa-utils/Makefile index d1f2a7144..721c5757d 100644 --- a/package/alsa-utils/Makefile +++ b/package/alsa-utils/Makefile @@ -14,8 +14,6 @@ PKG_BUILDDEP:= alsa-lib PKG_URL:= http://www.alsa-project.org/ PKG_SITES:= ftp://ftp.alsa-project.org/pub/utils/ -PKG_ARCH_DEPENDS:= !m68k - PKG_FLAVOURS_ALSA_UTILS:=WITH_ALSAMIXER PKGFS_WITH_ALSAMIXER:= libncurses PKGFD_WITH_ALSAMIXER:= include alsamixer ncurses applet diff --git a/package/cairo/Makefile b/package/cairo/Makefile index 62c2c3b32..a1015c603 100644 --- a/package/cairo/Makefile +++ b/package/cairo/Makefile @@ -17,8 +17,6 @@ PKG_URL:= http://cairographics.org/ PKG_SITES:= http://cairographics.org/releases/ PKG_OPTS:= dev -PKG_ARCH_DEPENDS:= !m68k - #DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz ifeq ($(ADK_STATIC),y) diff --git a/package/cxxtools/Makefile b/package/cxxtools/Makefile index e72624b2e..26a18a99b 100644 --- a/package/cxxtools/Makefile +++ b/package/cxxtools/Makefile @@ -17,7 +17,7 @@ PKG_NEED_CXX:= 1 PKG_CXX:= CXXTOOLS PKG_OPTS:= dev -PKG_ARCH_DEPENDS:= !arm !avr32 +PKG_ARCH_DEPENDS:= !arm !avr32 !m68k include ${TOPDIR}/mk/package.mk diff --git a/package/exmap/Makefile b/package/exmap/Makefile index 7ae1f5074..008ce253f 100644 --- a/package/exmap/Makefile +++ b/package/exmap/Makefile @@ -13,6 +13,7 @@ PKG_DEPENDS:= exmap-kmod libreadline glib PKG_BUILDDEP:= glib readline PKG_SITES:= http://labs.o-hand.com/sources/exmap-console/ +PKG_ARCH_DEPENDS:= !m68k PKG_CFLINE_EXMAP:= depends on !ADK_TOOLCHAIN_ONLY PKG_SUBPKGS:= EXMAP EXMAPD EXMAPSERVER EXMAP_KMOD diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile index 03f81b698..d2408eda5 100644 --- a/package/ffmpeg/Makefile +++ b/package/ffmpeg/Makefile @@ -15,7 +15,7 @@ PKG_SITES:= http://www.ffmpeg.org/releases/ PKH_LIBNAME:= libffmpeg PKG_OPTS:= dev -PKG_ARCH_DEPENDS:= !avr32 !cris +PKG_ARCH_DEPENDS:= !avr32 !cris !m68k PKG_SUBPKGS:= LIBFFMPEG FFSERVER FFPROBE FFMPEG #PKGSD_FFPLAY:= ffmpeg based video player diff --git a/package/kexec-tools/Makefile b/package/kexec-tools/Makefile index 0edd45ea9..7f6332a3f 100644 --- a/package/kexec-tools/Makefile +++ b/package/kexec-tools/Makefile @@ -14,7 +14,7 @@ PKG_BUILDEP:= zlib PKG_URL:= http://kernel.org/pub/linux/utils/kernel/kexec/ PKG_SITES:= http://kernel.org/pub/linux/utils/kernel/kexec/ -PKG_ARCH_DEPENDS:= !cris !avr32 !mips +PKG_ARCH_DEPENDS:= !cris !avr32 !mips !m68k PKG_CFLINE_KEXEC_TOOLS:= select ADK_KERNEL_KEXEC include $(TOPDIR)/mk/package.mk diff --git a/package/libglew/Makefile b/package/libglew/Makefile index 5e9d623ca..d6aed4f12 100644 --- a/package/libglew/Makefile +++ b/package/libglew/Makefile @@ -15,6 +15,8 @@ PKG_URL:= http://glew.sourceforge.net/index.html PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=glew/} PKG_OPTS:= dev +PKG_ARCH_DEPENDS:= !m68k + DISTFILES:= glew-$(PKG_VERSION).tgz WRKDIST= ${WRKDIR}/glew-$(PKG_VERSION) diff --git a/package/libpng/Makefile b/package/libpng/Makefile index af067f4d2..1d43a4998 100644 --- a/package/libpng/Makefile +++ b/package/libpng/Makefile @@ -15,8 +15,6 @@ PKG_URL:= http://www.libpng.org/pub/png/libpng.html PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=libpng/} PKG_OPTS:= dev -PKG_ARCH_DEPENDS:= !m68k - ifeq ($(ADK_STATIC),y) PKG_OPTS+= libonly endif diff --git a/package/libthread_db/Makefile b/package/libthread_db/Makefile index 7c3b3eb13..6827a4fdd 100644 --- a/package/libthread_db/Makefile +++ b/package/libthread_db/Makefile @@ -20,6 +20,8 @@ PKG_NAME:= libthread-db PKG_DESCR:= POSIX threads library for gdb/gdbserver PKG_SECTION:= libs +PKG_ARCH_DEPENDS:= !m68k + NO_DISTFILES:= 1 include ${TOPDIR}/mk/package.mk diff --git a/package/libvpx/Makefile b/package/libvpx/Makefile index 6205ac4b1..13796e7d5 100644 --- a/package/libvpx/Makefile +++ b/package/libvpx/Makefile @@ -13,7 +13,7 @@ PKG_URL:= http://www.webmproject.org/about/ PKG_SITES:= http://webm.googlecode.com/files/ PKG_OPTS:= dev -PKG_ARCH_DEPENDS:= !avr32 +PKG_ARCH_DEPENDS:= !avr32 !m68k DISTFILES:= ${PKG_NAME}-v${PKG_VERSION}.tar.bz2 WRKDIST= $(WRKDIR)/${PKG_NAME}-v${PKG_VERSION} diff --git a/package/madplay/Makefile b/package/madplay/Makefile index e146ce9c0..cb154ae8c 100644 --- a/package/madplay/Makefile +++ b/package/madplay/Makefile @@ -15,8 +15,6 @@ PKG_URL:= http://www.underbit.com/products/mad PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=mad/} \ ftp://ftp.mars.org/pub/mpeg/ -PKG_ARCH_DEPENDS:= !m68k - include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,MADPLAY,madplay,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/microperl/Makefile b/package/microperl/Makefile index e8253abde..53c380d10 100644 --- a/package/microperl/Makefile +++ b/package/microperl/Makefile @@ -12,7 +12,7 @@ PKG_SECTION:= lang PKG_URL:= http://www.perl.org/ PKG_SITES:= ftp://ftp.cpan.org/pub/CPAN/src/5.0/ -PKG_ARCH_DEPENDS:= !avr32 +PKG_ARCH_DEPENDS:= !avr32 !m68k DISTFILES:= perl-${PKG_VERSION}.tar.gz WRKDIST= ${WRKDIR}/perl-${PKG_VERSION} diff --git a/package/mpg123/Makefile b/package/mpg123/Makefile index f7b69e786..49d23b617 100644 --- a/package/mpg123/Makefile +++ b/package/mpg123/Makefile @@ -14,8 +14,6 @@ PKG_BUILDDEP:= alsa-lib PKG_URL:= http://www.mpg123.de/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=mpg123/} -PKG_ARCH_DEPENDS:= !m68k - DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include $(TOPDIR)/mk/package.mk diff --git a/package/pango/Makefile b/package/pango/Makefile index b89fc7f18..b3979b9e2 100644 --- a/package/pango/Makefile +++ b/package/pango/Makefile @@ -15,10 +15,6 @@ PKG_SITES:= ${MASTER_SITE_GNOME:=pango/1.28/} PKG_NEED_CXX:= 1 PKG_OPTS:= dev -PKG_ARCH_DEPENDS:= !m68k - -#DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz - ifeq ($(ADK_STATIC),y) PKG_OPTS+= libonly endif diff --git a/package/pixman/Makefile b/package/pixman/Makefile index 9ed31b20a..5cb1821d9 100644 --- a/package/pixman/Makefile +++ b/package/pixman/Makefile @@ -13,8 +13,6 @@ PKG_BUILDDEP:= libpng PKG_SITES:= http://www.cairographics.org/releases/ PKG_OPTS:= dev -PKG_ARCH_DEPENDS:= !m68k - ifeq ($(ADK_STATIC),y) PKG_OPTS+= libonly endif diff --git a/package/sdl-image/Makefile b/package/sdl-image/Makefile index b8968bd15..7aa1d1930 100644 --- a/package/sdl-image/Makefile +++ b/package/sdl-image/Makefile @@ -17,8 +17,6 @@ PKG_NEED_CXX:= 1 PKG_LIBNAME:= libsdl-image PKG_OPTS:= dev -PKG_ARCH_DEPENDS:= !m68k - DISTFILES:= SDL_image-${PKG_VERSION}.tar.gz WRKDIST= ${WRKDIR}/SDL_image-${PKG_VERSION} diff --git a/package/sdl/Makefile b/package/sdl/Makefile index 08e47eaf5..bb20aad1d 100644 --- a/package/sdl/Makefile +++ b/package/sdl/Makefile @@ -16,8 +16,6 @@ PKG_SITES:= http://www.libsdl.org/release/ PKG_LIBNAME:= libsdl PKG_OPTS:= dev -PKG_ARCH_DEPENDS:= !m68k - PKG_FLAVOURS_LIBSDL:= WITH_TSLIB PKGFD_WITH_TSLIB:= enable touchscreen support PKGFS_WITH_TSLIB:= tslib diff --git a/package/sox/Makefile b/package/sox/Makefile index d5aca61e7..2f5436146 100644 --- a/package/sox/Makefile +++ b/package/sox/Makefile @@ -14,8 +14,6 @@ PKG_DEPENDS:= zlib libmad liblame alsa-lib libid3tag PKG_URL:= http://sox.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=sox/} -PKG_ARCH_DEPENDS:= !m68k - include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,SOX,sox,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/tntnet/Makefile b/package/tntnet/Makefile index dc6e8596f..a7237bbc1 100644 --- a/package/tntnet/Makefile +++ b/package/tntnet/Makefile @@ -15,7 +15,7 @@ PKG_URL:= http://www.tntnet.org/ PKG_SITES:= http://www.tntnet.org/download/ PKG_NEED_CXX:= 1 -PKG_ARCH_DEPENDS:= !arm !avr32 +PKG_ARCH_DEPENDS:= !arm !avr32 !m68k PKG_CHOICES_TNTNET:= WITHOUT_SSL WITH_OPENSSL WITH_GNUTLS PKGCD_WITHOUT_SSL:= use no SSL diff --git a/package/vlc/Makefile b/package/vlc/Makefile index d9fbbefa5..27d98e0fa 100644 --- a/package/vlc/Makefile +++ b/package/vlc/Makefile @@ -14,7 +14,7 @@ PKG_DEPENDS:= libffmpeg xcb-util libtheora libgcrypt PKG_URL:= http://www.videolan.org/vlc/ PKG_SITES:= http://download.videolan.org/pub/videolan/vlc/$(PKG_VERSION)/ -PKG_ARCH_DEPENDS:= !cris !avr32 +PKG_ARCH_DEPENDS:= !cris !avr32 !m68k DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz -- cgit v1.2.3