From 9492f70965e2d1c669df4c5fc56b4bac465f6b88 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 27 Apr 2011 19:06:58 +0200 Subject: fix cris allconfig build --- package/bluez/Makefile | 4 ++-- package/classpath/Makefile | 2 ++ package/ffmpeg/Makefile | 2 ++ package/libpthread/Makefile | 2 +- package/pcc-libs/Makefile | 2 +- package/pcc/Makefile | 2 +- 6 files changed, 9 insertions(+), 5 deletions(-) (limited to 'package') diff --git a/package/bluez/Makefile b/package/bluez/Makefile index 883725a29..e359b8f77 100644 --- a/package/bluez/Makefile +++ b/package/bluez/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= bluez -PKG_VERSION:= 4.89 +PKG_VERSION:= 4.92 PKG_RELEASE:= 1 -PKG_MD5SUM:= 67fd9ad2852ce01f01b16ddd2336d1ea +PKG_MD5SUM:= abe5b76df95939f4eb6fa493f4764a95 PKG_DESCR:= bluetooth libraries and applications PKG_SECTION:= bluetooth PKG_DEPENDS:= kmod-bt libusb glib dbus diff --git a/package/classpath/Makefile b/package/classpath/Makefile index 3292232c1..fd5efa109 100644 --- a/package/classpath/Makefile +++ b/package/classpath/Makefile @@ -14,6 +14,8 @@ PKG_DEPENDS:= libgtk gdk-pixbuf orbit2 gconf PKG_URL:= http://www.gnu.org/software/classpath/home.html PKG_SITES:= ${MASTER_SITE_GNU:=classpath/} +PKG_ARCH_DEPENDS:= !cris + include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,CLASSPATH,classpath,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile index be732ea31..266102769 100644 --- a/package/ffmpeg/Makefile +++ b/package/ffmpeg/Makefile @@ -14,6 +14,8 @@ PKG_BUILDDEP:= faad2 PKG_URL:= http://www.ffmpeg.org/ PKG_SITES:= http://www.ffmpeg.org/releases/ +PKG_ARCH_DEPENDS:= !cris + PKG_SUBPKGS:= FFMPEG FFPLAY PKGSD_FFPLAY:= ffmpeg based video player PKGSC_FFPLAY:= multimedia diff --git a/package/libpthread/Makefile b/package/libpthread/Makefile index ed0602c86..de0d75403 100644 --- a/package/libpthread/Makefile +++ b/package/libpthread/Makefile @@ -50,7 +50,7 @@ libpthread-dev-install: ifeq ($(ADK_NATIVE),) ${INSTALL_DIR} ${IDIR_LIBPTHREAD_DEV}/usr/lib -${CP} ./files/libpthread.so.$(ARCH) ${IDIR_LIBPTHREAD_DEV}/usr/lib/libpthread.so - ${CP} ${STAGING_TARGET_DIR}/usr/lib/libpthread_nonshared.a ${IDIR_LIBPTHREAD_DEV}/usr/lib + -${CP} ${STAGING_TARGET_DIR}/usr/lib/libpthread_nonshared.a ${IDIR_LIBPTHREAD_DEV}/usr/lib endif include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/pcc-libs/Makefile b/package/pcc-libs/Makefile index ec6477779..8d206d0a8 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 +PKG_ARCH_DEPENDS:= !arm !cris DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz include $(TOPDIR)/mk/package.mk diff --git a/package/pcc/Makefile b/package/pcc/Makefile index 1fd798a74..78dd52bd0 100644 --- a/package/pcc/Makefile +++ b/package/pcc/Makefile @@ -15,7 +15,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 +PKG_ARCH_DEPENDS:= !arm !cris DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz include $(TOPDIR)/mk/package.mk -- cgit v1.2.3