diff options
Diffstat (limited to 'package')
28 files changed, 13 insertions, 56 deletions
diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile index 413744638..f436d9ef7 100644 --- a/package/asterisk/Makefile +++ b/package/asterisk/Makefile @@ -17,7 +17,6 @@ PKG_MULTI:= 1 PKG_NOPARALLEL:= 1 PKG_NEED_CXX:= 1 -PKG_ARCH_DEPENDS:= !cris PKG_LIBC_DEPENDS:= uclibc eglibc glibc PKG_SUBPKGS:= ASTERISK ASTERISK_PGSQL ASTERISK_VOICEMAIL ASTERISK_SOUNDS diff --git a/package/cairo/Makefile b/package/cairo/Makefile index 30894cab5..8b26cbfdb 100644 --- a/package/cairo/Makefile +++ b/package/cairo/Makefile @@ -30,9 +30,6 @@ $(eval $(call PKG_template,CAIRO,cairo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEN ifeq (,$(filter arm,$(TARGET_ARCH))) TARGET_CFLAGS:= $(filter-out -Os,$(TARGET_CFLAGS)) endif -ifeq (,$(filter cris,$(TARGET_ARCH))) -TARGET_CFLAGS:= $(filter-out -Os,$(TARGET_CFLAGS)) -endif CONFIGURE_ARGS+= --enable-ft=yes \ --enable-fc=yes \ --enable-tee=yes \ diff --git a/package/classpath/Makefile b/package/classpath/Makefile index e63c84e7a..2f133cdef 100644 --- a/package/classpath/Makefile +++ b/package/classpath/Makefile @@ -15,7 +15,7 @@ PKG_URL:= http://www.gnu.org/software/classpath/home.html PKG_SITES:= ${MASTER_SITE_GNU:=classpath/} PKG_HOST_DEPENDS:= linux -PKG_ARCH_DEPENDS:= !cris !arm +PKG_ARCH_DEPENDS:= !arm include $(TOPDIR)/mk/package.mk diff --git a/package/cryptsetup/Makefile b/package/cryptsetup/Makefile index bf71f5a43..1e0eaca25 100644 --- a/package/cryptsetup/Makefile +++ b/package/cryptsetup/Makefile @@ -17,8 +17,6 @@ PKG_URL:= http://cryptsetup.googlecode.com/ PKG_SITES:= http://cryptsetup.googlecode.com/files/ PKG_OPTS:= dev -PKG_ARCH_DEPENDS:= !cris - DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile index e73d65a5d..d82f9d643 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:= !cris !m68k +PKG_ARCH_DEPENDS:= !m68k PKG_SUBPKGS:= LIBFFMPEG FFSERVER FFPROBE FFMPEG #PKGSD_FFPLAY:= ffmpeg based video player diff --git a/package/gcc/patches/4.7.3/musl-cris.patch b/package/gcc/patches/4.7.3/musl-cris.patch deleted file mode 100644 index 4889263a1..000000000 --- a/package/gcc/patches/4.7.3/musl-cris.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nur gcc-4.7.3.orig/gcc/config/cris/linux.h gcc-4.7.3/gcc/config/cris/linux.h ---- gcc-4.7.3.orig/gcc/config/cris/linux.h 2011-04-11 20:46:05.000000000 +0200 -+++ gcc-4.7.3/gcc/config/cris/linux.h 2013-10-11 10:01:51.000000000 +0200 -@@ -104,6 +104,7 @@ - #define CRIS_DEFAULT_CPU_VERSION CRIS_CPU_NG - - #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" -+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-cris.1" - - #undef CRIS_LINK_SUBTARGET_SPEC - #define CRIS_LINK_SUBTARGET_SPEC \ diff --git a/package/gconf/Makefile b/package/gconf/Makefile index dfed4551a..38a14e6c0 100644 --- a/package/gconf/Makefile +++ b/package/gconf/Makefile @@ -17,7 +17,7 @@ PKG_SITES:= ftp://ftp.gnome.org//pub/GNOME/sources/GConf/${PKG_EXTRAVER}/ PKG_LIBNAME:= gconf PKG_OPTS:= dev -PKG_ARCH_DEPENDS:= !arm !cris +PKG_ARCH_DEPENDS:= !arm include $(TOPDIR)/mk/package.mk diff --git a/package/gdb/Makefile b/package/gdb/Makefile index 5b1b85e50..8128e8bd5 100644 --- a/package/gdb/Makefile +++ b/package/gdb/Makefile @@ -11,7 +11,7 @@ PKG_DEPENDS:= libthread-db libncurses libexpat libgcc zlib PKG_BUILDDEP:= ncurses readline libiconv-tiny expat zlib PKG_NOPARALLEL:= 1 -PKG_ARCH_DEPENDS:= !cris !m68k +PKG_ARCH_DEPENDS:= !m68k include ${TOPDIR}/mk/package.mk diff --git a/package/gdbserver/patches/patch-gdb_gdbserver_linux-cris-low_c b/package/gdbserver/patches/patch-gdb_gdbserver_linux-cris-low_c deleted file mode 100644 index e500d6642..000000000 --- a/package/gdbserver/patches/patch-gdb_gdbserver_linux-cris-low_c +++ /dev/null @@ -1,11 +0,0 @@ ---- gdb-7.1.orig/gdb/gdbserver/linux-cris-low.c -+++ gdb-7.1/gdb/gdbserver/linux-cris-low.c -@@ -62,7 +62,7 @@ - extern int debug_threads; - - static CORE_ADDR --cris_get_pc (struct regcache *regcache, void) -+cris_get_pc (struct regcache *regcache) - { - unsigned long pc; - collect_register_by_name (regcache, "pc", &pc); diff --git a/package/jamvm/Makefile b/package/jamvm/Makefile index 23efe2833..6d21b6311 100644 --- a/package/jamvm/Makefile +++ b/package/jamvm/Makefile @@ -14,7 +14,7 @@ PKG_BUILDDEP:= libffi zlib PKG_URL:= http://jamvm.sourceforge.net PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=jamvm/} -PKG_ARCH_DEPENDS:= !cris !m68k +PKG_ARCH_DEPENDS:= !m68k include ${TOPDIR}/mk/package.mk diff --git a/package/kexec-tools/Makefile b/package/kexec-tools/Makefile index 9ceb48b15..3ea6904d2 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 !mips !m68k +PKG_ARCH_DEPENDS:= !mips !m68k PKG_CFLINE_KEXEC_TOOLS:= select ADK_KERNEL_KEXEC include $(TOPDIR)/mk/package.mk diff --git a/package/log4cxx/Makefile b/package/log4cxx/Makefile index d34d8a2f0..fd2dedb70 100644 --- a/package/log4cxx/Makefile +++ b/package/log4cxx/Makefile @@ -18,8 +18,6 @@ PKG_OPTS:= dev DISTFILES:= apache-${PKG_NAME}-${PKG_VERSION}.tar.gz WRKDIST= ${WRKDIR}/apache-${PKG_NAME}-${PKG_VERSION} -PKG_ARCH_DEPENDS:= !cris - include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LOG4CXX,log4cxx,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) diff --git a/package/nspr/Makefile b/package/nspr/Makefile index 33063d67f..102b2c017 100644 --- a/package/nspr/Makefile +++ b/package/nspr/Makefile @@ -13,8 +13,6 @@ PKG_URL:= http://www.mozilla.org/projects/nspr/ PKG_SITES:= ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PKG_VERSION}/src/ PKG_OPTS:= dev -PKG_ARCH_DEPENDS:= !cris - WRKSRC= ${WRKDIST}/nspr include $(TOPDIR)/mk/package.mk diff --git a/package/nss/Makefile b/package/nss/Makefile index ffffc69e1..868dd5d4d 100644 --- a/package/nss/Makefile +++ b/package/nss/Makefile @@ -20,7 +20,6 @@ PKG_SITES:= ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${P PKG_NOPARALLEL:= 1 PKG_HOST_DEPENDS:= !cygwin -PKG_ARCH_DEPENDS:= !cris WRKSRC= ${WRKDIST}/nss diff --git a/package/oprofile/Makefile b/package/oprofile/Makefile index 5b416a67e..622c246d4 100644 --- a/package/oprofile/Makefile +++ b/package/oprofile/Makefile @@ -14,7 +14,7 @@ PKG_BUILDDEP:= popt binutils PKG_URL:= http://oprofile.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=oprofile/} -PKG_ARCH_DEPENDS:= !cris !m68k +PKG_ARCH_DEPENDS:= !m68k PKG_LIBC_DEPENDS:= uclibc eglibc glibc PKG_CFLINE_OPROFILE:= select BUSYBOX_EXPR diff --git a/package/orbit2/Makefile b/package/orbit2/Makefile index 15cc231ee..46da045d1 100644 --- a/package/orbit2/Makefile +++ b/package/orbit2/Makefile @@ -16,8 +16,6 @@ PKG_SITES:= ftp://ftp.gnome.org//pub/gnome/sources/ORBit2/${PKG_EXTRAVER}/ PKG_LIBNAME:= orbit2 PKG_OPTS:= dev -PKG_ARCH_DEPENDS:= !cris - include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,ORBIT2,orbit2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) diff --git a/package/pcc-libs/Makefile b/package/pcc-libs/Makefile index 13ca67854..9860b6805 100644 --- a/package/pcc-libs/Makefile +++ b/package/pcc-libs/Makefile @@ -12,7 +12,7 @@ PKG_SECTION:= lang PKG_URL:= http://pcc.ludd.ltu.se/ PKG_SITES:= http://pcc.ludd.ltu.se/ftp/pub/pcc-releases/ -PKG_ARCH_DEPENDS:= !arm !cris !m68k !mips !ppc +PKG_ARCH_DEPENDS:= !arm !m68k !mips !ppc DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz include $(TOPDIR)/mk/package.mk diff --git a/package/pcc/Makefile b/package/pcc/Makefile index ac02ecb99..c7f3878da 100644 --- a/package/pcc/Makefile +++ b/package/pcc/Makefile @@ -14,7 +14,7 @@ PKG_URL:= http://pcc.ludd.ltu.se/ PKG_SITES:= http://pcc.ludd.ltu.se/ftp/pub/pcc-releases/ PKG_NOPARALLEL:= 1 -PKG_ARCH_DEPENDS:= !arm !cris !m68k !mips !ppc +PKG_ARCH_DEPENDS:= !arm !m68k !mips !ppc DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz include $(TOPDIR)/mk/package.mk diff --git a/package/php/Makefile b/package/php/Makefile index 313940eb7..528f5bb11 100644 --- a/package/php/Makefile +++ b/package/php/Makefile @@ -67,7 +67,6 @@ PKGFD_MOD_ZLIB:= ZLIB support PKGFB_MOD_ZLIB:= zlib PKGFS_MOD_ZLIB:= zlib -PKG_ARCH_DEPENDS:= !cris PKG_HOST_DEPENDS:= !cygwin include $(TOPDIR)/mk/package.mk diff --git a/package/sane-backends/Makefile b/package/sane-backends/Makefile index ce8b7fe53..4bad787ef 100644 --- a/package/sane-backends/Makefile +++ b/package/sane-backends/Makefile @@ -15,8 +15,6 @@ PKG_URL:= http://www.sane-project.org/ PKG_SITES:= ftp://ftp2.sane-project.org/pub/sane/${PKG_NAME}-${PKG_VERSION}/ PKG_MULTI:= 1 -PKG_ARCH_DEPENDS:= !cris - PKG_SUBPKGS:= SANE_BACKENDS SANE_BACKEND_NET SANE_BACKEND_ABATON SANE_BACKEND_AGFAFOCUS PKG_SUBPKGS+= SANE_BACKEND_APPLE SANE_BACKEND_ARTEC_EPLUS48U SANE_BACKEND_ARTEC SANE_BACKEND_AS6E PKG_SUBPKGS+= SANE_BACKEND_AVISION SANE_BACKEND_BH SANE_BACKEND_CANON630U SANE_BACKEND_CANON diff --git a/package/strace/src/linux/crisv10/syscallent.h b/package/strace/src/linux/crisv10/syscallent.h deleted file mode 100644 index d8dd9f7ab..000000000 --- a/package/strace/src/linux/crisv10/syscallent.h +++ /dev/null @@ -1 +0,0 @@ -#include "i386/syscallent.h" diff --git a/package/strace/src/linux/crisv32/ioctlent.h.in b/package/strace/src/linux/crisv32/ioctlent.h.in deleted file mode 100644 index 52ac99ba0..000000000 --- a/package/strace/src/linux/crisv32/ioctlent.h.in +++ /dev/null @@ -1 +0,0 @@ -#include "../i386/ioctlent.h.in" diff --git a/package/strace/src/linux/crisv32/syscallent.h b/package/strace/src/linux/crisv32/syscallent.h deleted file mode 100644 index d8dd9f7ab..000000000 --- a/package/strace/src/linux/crisv32/syscallent.h +++ /dev/null @@ -1 +0,0 @@ -#include "i386/syscallent.h" diff --git a/package/twm/Makefile b/package/twm/Makefile index 4a51414c5..25688d14f 100644 --- a/package/twm/Makefile +++ b/package/twm/Makefile @@ -15,7 +15,7 @@ PKG_URL:= http://xorg.freedesktop.org/ PKG_SITES:= http://xorg.freedesktop.org/archive/individual/app/ PKG_NEED_CXX:= 1 -PKG_ARCH_DEPENDS:= !cris !m68k +PKG_ARCH_DEPENDS:= !m68k include $(TOPDIR)/mk/package.mk diff --git a/package/vlc/Makefile b/package/vlc/Makefile index 0b1eba4a3..cab09241a 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 !m68k +PKG_ARCH_DEPENDS:= !m68k PKG_LIBC_DEPENDS:= eglibc glibc musl DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz diff --git a/package/xinit/Makefile b/package/xinit/Makefile index bca33a1b7..bd8d2bf64 100644 --- a/package/xinit/Makefile +++ b/package/xinit/Makefile @@ -15,7 +15,7 @@ PKG_URL:= http://xorg.freedesktop.org/ PKG_SITES:= http://xorg.freedesktop.org/archive/individual/app/ PKG_NEED_CXX:= 1 -PKG_ARCH_DEPENDS:= !cris !m68k +PKG_ARCH_DEPENDS:= !m68k include $(TOPDIR)/mk/package.mk diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index 915dbb625..fef274746 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -23,7 +23,7 @@ PKG_NEED_CXX:= 1 PKG_OPTS:= dev PKG_CFLINE_XORG_SERVER:=depends on ADK_TARGET_WITH_VGA -PKG_ARCH_DEPENDS:= !cris !m68k +PKG_ARCH_DEPENDS:= !m68k PKG_FLAVOURS_XORG_SERVER:= WITH_DRI WITH_KDRIVE PKGFS_WITH_DRI:= mesalib diff --git a/package/xvinfo/Makefile b/package/xvinfo/Makefile index 0ffc44a1d..0e2ee6b2b 100644 --- a/package/xvinfo/Makefile +++ b/package/xvinfo/Makefile @@ -13,8 +13,6 @@ PKG_BUILDDEP:= libXv PKG_URL:= http://xorg.freedesktop.org/ PKG_SITES:= ${MASTER_SITE_XORG} -PKG_ARCH_DEPENDS:= !cris - include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,XVINFO,xvinfo,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) |