From 87832fb8da02431280c0a1f9c127dd121ddb7b25 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 24 Feb 2011 13:39:32 +0100 Subject: disable packages for cris, enable more packages by hardware features (vga, input) --- package/binutils/Makefile | 3 +++ package/gdb/Makefile | 3 +++ package/php/Makefile | 1 + package/sane-backends/Makefile | 2 ++ package/xf86-input-keyboard/Makefile | 2 ++ package/xf86-input-mouse/Makefile | 2 ++ package/xf86-video-cirrus/Makefile | 2 ++ package/xf86-video-intel/Makefile | 2 +- package/xf86-video-siliconmotion/Makefile | 2 ++ package/xorg-server/Makefile | 1 + 10 files changed, 19 insertions(+), 1 deletion(-) diff --git a/package/binutils/Makefile b/package/binutils/Makefile index c6f414065..7bbe48e0d 100644 --- a/package/binutils/Makefile +++ b/package/binutils/Makefile @@ -24,6 +24,9 @@ CONFIGURE_ARGS+= --disable-werror \ --host=$(REAL_GNU_TARGET_NAME) \ --target=$(REAL_GNU_TARGET_NAME) +pre-build: + @-rm $(STAGING_TARGET_DIR)/lib/libiberty.a $(STAGING_TARGET_DIR)/usr/lib/libiberty.a + libbfd-install: ${INSTALL_DIR} ${IDIR_LIBBFD}/usr/lib $(CP) ${WRKINST}/usr/lib/*.so ${IDIR_LIBBFD}/usr/lib diff --git a/package/gdb/Makefile b/package/gdb/Makefile index 5e9f706d1..d14a71761 100644 --- a/package/gdb/Makefile +++ b/package/gdb/Makefile @@ -26,6 +26,9 @@ XAKE_FLAGS+= LDFLAGS='${TARGET_LDFLAGS}' # disable honour cflags stuff XAKE_FLAGS+= GCC_HONOUR_COPTS:=s +pre-build: + @-rm $(STAGING_TARGET_DIR)/lib/libiberty.a $(STAGING_TARGET_DIR)/usr/lib/libiberty.a + post-install: ${INSTALL_DIR} ${IDIR_GDB}/usr/bin ${INSTALL_BIN} ${WRKINST}/usr/bin/gdb ${IDIR_GDB}/usr/bin/ diff --git a/package/php/Makefile b/package/php/Makefile index 900ab42d6..e407ae1ba 100644 --- a/package/php/Makefile +++ b/package/php/Makefile @@ -29,6 +29,7 @@ PKGSB_MOD_PCRE:= pcre PKGSB_MOD_SQLITE:= sqlite PKGSB_MOD_XML:= expat +PKG_ARCH_DEPENDS:= !cris PKG_HOST_DEPENDS:= !cygwin # FIX PKG_DEPENDS diff --git a/package/sane-backends/Makefile b/package/sane-backends/Makefile index 2f1a5bacf..e575f7ac0 100644 --- a/package/sane-backends/Makefile +++ b/package/sane-backends/Makefile @@ -15,6 +15,8 @@ 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/xf86-input-keyboard/Makefile b/package/xf86-input-keyboard/Makefile index a8cd0c262..5d3589206 100644 --- a/package/xf86-input-keyboard/Makefile +++ b/package/xf86-input-keyboard/Makefile @@ -13,6 +13,8 @@ PKG_DEPENDS:= xorg-server PKG_BUILDDEP:= xorg-server PKG_SITES:= ${MASTER_SITE_XORG} +PKG_CFLINE_XF86_INPUT_KEYBOARD:= depends on ADK_TARGET_WITH_INPUT + include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,XF86_INPUT_KEYBOARD,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/xf86-input-mouse/Makefile b/package/xf86-input-mouse/Makefile index fd9f37065..4d33399d7 100644 --- a/package/xf86-input-mouse/Makefile +++ b/package/xf86-input-mouse/Makefile @@ -13,6 +13,8 @@ PKG_DEPENDS:= xorg-server PKG_BUILDDEP:= xorg-server PKG_SITES:= ${MASTER_SITE_XORG} +PKG_CFLINE_XF86_INPUT_MOUSE:= depends on ADK_TARGET_WITH_INPUT + include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,XF86_INPUT_MOUSE,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/xf86-video-cirrus/Makefile b/package/xf86-video-cirrus/Makefile index 1d389f954..cd2ead404 100644 --- a/package/xf86-video-cirrus/Makefile +++ b/package/xf86-video-cirrus/Makefile @@ -13,6 +13,8 @@ PKG_DEPENDS:= xorg-server PKG_BUILDDEP:= xorg-server PKG_SITES:= ${MASTER_SITE_XORG} +PKG_CFLINE_XF86_VIDEO_CIRRUS:=depends on ADK_TARGET_WITH_VGA + include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,XF86_VIDEO_CIRRUS,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/xf86-video-intel/Makefile b/package/xf86-video-intel/Makefile index 96a8fb784..24add28ac 100644 --- a/package/xf86-video-intel/Makefile +++ b/package/xf86-video-intel/Makefile @@ -13,7 +13,7 @@ PKG_DEPENDS:= xorg-server libdrm PKG_BUILDDEP:= xorg-server libdrm PKG_SITES:= ${MASTER_SITE_XORG} -PKG_CFLINE:= y if (ADK_PKG_LAPTOP && ADK_TARGET_SYSTEM_IBM_X40) +PKG_CFLINE_XF86_VIDEO_INTEL:=depends on ADK_TARGET_WITH_VGA include $(TOPDIR)/mk/package.mk diff --git a/package/xf86-video-siliconmotion/Makefile b/package/xf86-video-siliconmotion/Makefile index 85768c2ac..88619fd67 100644 --- a/package/xf86-video-siliconmotion/Makefile +++ b/package/xf86-video-siliconmotion/Makefile @@ -13,6 +13,8 @@ PKG_DEPENDS:= xorg-server PKG_BUILDDEP:= xorg-server PKG_SITES:= ${MASTER_SITE_XORG} +PKG_CFLINE_XF86_VIDEO_SILICONMOTION:=depends on ADK_TARGET_WITH_VGA + include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,XF86_VIDEO_SILICONMOTION,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index 37fcb2df7..65fa49a44 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -21,6 +21,7 @@ PKG_URL:= http://www.x.org/ PKG_SITES:= ${MASTER_SITE_XORG} PKG_CFLINE_XORG_SERVER:=depends on ADK_TARGET_WITH_VGA +PKG_ARCH_DEPENDS:= !cris PKG_FLAVOURS_XORG_SERVER:= WITH_DRI PKGFS_WITH_DRI:= mesalib -- cgit v1.2.3