Forráskód Böngészése

fix make bulkallmod

Waldemar Brodkorb 12 éve
szülő
commit
e3d296fa18
3 módosított fájl, 8 hozzáadás és 8 törlés
  1. 6 6
      package/boost/Makefile
  2. 2 0
      package/jack/Makefile
  3. 0 2
      target/arm/Makefile

+ 6 - 6
package/boost/Makefile

@@ -11,9 +11,12 @@ PKG_DESCR:=		boost C++ library
 PKG_SECTION:=		libs
 PKG_URL:=		http://www.boost.org/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=boost/}
+
 DISTFILES:=		boost_1_47_0.tar.gz
 WRKDIST=		${WRKDIR}/${PKG_NAME}_${PKG_VERSION}
 
+PKG_ARCH_DEPENDS:=	!mips
+
 PKG_SUBPKGS:=		BOOST BOOST_DEV
 PKGSD_BOOST_DEV:=	boost header files
 PKGSC_BOOST_DEV:=	devel
@@ -27,8 +30,8 @@ PKG_FLAVOURS_BOOST:=	date_time graph graph_parallel iostreams math program_optio
 
 PKGFD_date_time:=	with date-time
 PKGFD_python:=	with Python
-PKGFB_python:=	python
-PKGFS_python:=	python
+PKGFB_python:=	python2
+PKGFS_python:=	python2
 PKGFD_iostreams:=	with iostreams
 PKGFD_graph:=	with graph
 PKGFD_graph_parallel:=	with graph_parallel
@@ -104,7 +107,7 @@ GPP_PATH:=	${STAGING_HOST_DIR}/bin/${GNU_TARGET_NAME}-g++
 GPP_VERSION:=	"`${GPP_PATH} -v 2>&1 | tail -1 | awk '{print $$3}'`"
 BJAM_PATH:=	"`find ${WRKBUILD} -type f -name "bjam"`"
 PYTHON_PATH:=	${STAGING_TARGET_DIR}/usr/bin/python
-PYTHON_INCLUDE:=	"`find ${STAGING_TARGET_DIR}/usr/include/ -maxdepth 1 -type d -name "python*" | head -1`"
+PYTHON_INCLUDE:="`find ${STAGING_TARGET_DIR}/usr/include/ -maxdepth 1 -type d -name "python*" | head -1`"
 PYTHON_LIB:=	"`find ${STAGING_TARGET_DIR}/usr/lib/ -maxdepth 1 -type d -name "python*" | head -1`"
 USER_JAM:=	${WRKBUILD}/tools/build/v2/user-config.jam
 
@@ -139,7 +142,6 @@ endif
 			install \
 	)
 
-
 boost-install:
 	${INSTALL_DIR} ${IDIR_BOOST}/usr/lib
 ifneq (${ADK_PACKAGE_BOOST_SHARED},)
@@ -153,10 +155,8 @@ ifneq (${ADK_PACKAGE_BOOST_BOTH},)
 	${CP} ${WRKINST}/usr/lib/*.so* ${IDIR_BOOST}/usr/lib
 endif
 
-
 boost-dev-install:
 	${INSTALL_DIR} ${IDIR_BOOST_DEV}/usr/include
 	${CP} ${WRKINST}/usr/include/* ${IDIR_BOOST_DEV}/usr/include
 
-
 include ${TOPDIR}/mk/pkg-bottom.mk

+ 2 - 0
package/jack/Makefile

@@ -15,6 +15,8 @@ PKG_BUILDDEP:=		python2 alsa-lib
 PKG_URL:=		http://jackaudio.org
 PKG_SITES:=		http://www.grame.fr/~letz/
 
+PKG_ARCH_DEPENDS:=	!cris
+
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 include $(TOPDIR)/mk/package.mk

+ 0 - 2
target/arm/Makefile

@@ -61,7 +61,6 @@ ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM),y)
 	@echo 'qemu-system-arm -M $(MACH) -nographic $(NET) -kernel $(BIN_DIR)/$(TARGET_KERNEL) -hda qemu-${CPU_ARCH}.img'
 endif
 endif
-endif
 ifeq ($(ADK_TARGET_FS),initramfs)
 imageinstall: $(BIN_DIR)/$(INITRAMFS)
 ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM),y)
@@ -89,4 +88,3 @@ ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM),y)
 	@echo 'qemu-system-arm -M $(MACH) -nographic $(NET) -kernel $(BIN_DIR)/$(TARGET_KERNEL)'
 endif
 endif
-endif