summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2013-10-18 11:37:02 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2013-10-18 11:37:02 +0200
commitd579cd4a819aa5e0e6fa9dccd4e2ea6104a57815 (patch)
tree8175a926dd7ae0f862768566f9c662273222d613
parent100d6808e8d4b82a7a7e970827431580046445b8 (diff)
disable for m68k, remove flavour static, not used
-rw-r--r--package/boost/Makefile18
-rw-r--r--package/xbmc/Makefile2
2 files changed, 3 insertions, 17 deletions
diff --git a/package/boost/Makefile b/package/boost/Makefile
index 93f5fba55..e2f2ed3cb 100644
--- a/package/boost/Makefile
+++ b/package/boost/Makefile
@@ -12,7 +12,7 @@ PKG_SECTION:= libs
PKG_URL:= http://www.boost.org/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=boost/}
-PKG_ARCH_DEPENDS:= !avr32
+PKG_ARCH_DEPENDS:= !avr32 !m68k
DISTFILES:= boost_1_54_0.tar.gz
WRKDIST= ${WRKDIR}/${PKG_NAME}_1_54_0
@@ -21,11 +21,6 @@ PKG_SUBPKGS:= BOOST BOOST_DEV
PKGSD_BOOST_DEV:= boost header files
PKGSC_BOOST_DEV:= devel
-PKG_CHOICES_BOOST:= SHARED STATIC BOTH
-PKGCD_STATIC:= install static libs
-PKGCD_SHARED:= install shared libs
-PKGCD_BOTH:= install static and shared libs
-
PKG_FLAVOURS_BOOST:= date_time graph graph_parallel iostreams math program_options python regex serialization signals system test thread wave
PKGFD_date_time:= with date-time
@@ -76,7 +71,7 @@ endif
ifeq (${ADK_PACKAGE_BOOST_GRAPH},)
CONFIGURE_ARGS+=--without-graph
endif
-ifeq (${ADK_PACKAGE_BOOST_math},)
+ifeq (${ADK_PACKAGE_BOOST_MATH},)
CONFIGURE_ARGS+=--without-math
endif
ifeq (${ADK_PACKAGE_BOOST_PROGRAM_OPTIONS},)
@@ -146,16 +141,7 @@ endif
boost-install:
${INSTALL_DIR} ${IDIR_BOOST}/usr/lib
-ifneq (${ADK_PACKAGE_BOOST_SHARED},)
${CP} ${WRKINST}/usr/lib/*.so* ${IDIR_BOOST}/usr/lib
-endif
-ifneq (${ADK_PACKAGE_BOOST_STATIC},)
- ${CP} ${WRKINST}/usr/lib/*.a ${IDIR_BOOST}/usr/lib
-endif
-ifneq (${ADK_PACKAGE_BOOST_BOTH},)
- ${CP} ${WRKINST}/usr/lib/*.a ${IDIR_BOOST}/usr/lib
- ${CP} ${WRKINST}/usr/lib/*.so* ${IDIR_BOOST}/usr/lib
-endif
boost-dev-install:
${INSTALL_DIR} ${IDIR_BOOST_DEV}/usr/include
diff --git a/package/xbmc/Makefile b/package/xbmc/Makefile
index 98e245bae..47264e74e 100644
--- a/package/xbmc/Makefile
+++ b/package/xbmc/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 2
PKG_MD5SUM:= 489f3877decae4e265ece54f9eaef0ba
PKG_DESCR:= software media player
PKG_SECTION:= multimedia
-PKG_DEPENDS:= boost boost-shared libffmpeg python2 libstdcxx
+PKG_DEPENDS:= boost libffmpeg python2 libstdcxx
PKG_DEPENDS+= libglew mesalib libass libmpeg2 libmad dbus
PKG_DEPENDS+= libjpeg libogg libvorbis libmodplug libcurl
PKG_DEPENDS+= libflac libopenssl libbz2 libtiff liblzo