summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/alsa-lib/Makefile2
-rw-r--r--package/alsa-utils/Makefile2
-rw-r--r--package/madplay/Makefile2
-rw-r--r--package/mpd/Makefile2
-rw-r--r--package/mpg123/Makefile2
-rw-r--r--package/sdl/Makefile2
-rw-r--r--package/sox/Makefile2
-rw-r--r--target/m68k/uclibc.config9
8 files changed, 17 insertions, 6 deletions
diff --git a/package/alsa-lib/Makefile b/package/alsa-lib/Makefile
index 3be639ffa..9e1c0bedd 100644
--- a/package/alsa-lib/Makefile
+++ b/package/alsa-lib/Makefile
@@ -12,6 +12,8 @@ PKG_SECTION:= libs
PKG_URL:= http://www.alsa-project.org/
PKG_SITES:= ftp://ftp.alsa-project.org/pub/lib/
+PKG_ARCH_DEPENDS:= !m68k
+
PKG_SUBPKGS:= ALSA_LIB ALSA_LIB_DEV
PKGSD_ALSA_LIB_DEV:= development files for ALSA
PKGSC_ALSA_LIB_DEV:= devel
diff --git a/package/alsa-utils/Makefile b/package/alsa-utils/Makefile
index 8c0f5922e..16520ec54 100644
--- a/package/alsa-utils/Makefile
+++ b/package/alsa-utils/Makefile
@@ -14,6 +14,8 @@ PKG_BUILDDEP:= alsa-lib
PKG_URL:= http://www.alsa-project.org/
PKG_SITES:= ftp://ftp.alsa-project.org/pub/utils/
+PKG_ARCH_DEPENDS:= !m68k
+
PKG_FLAVOURS_ALSA_UTILS:=WITH_ALSAMIXER
PKGFS_WITH_ALSAMIXER:= libncurses
PKGFD_WITH_ALSAMIXER:= include alsamixer ncurses applet
diff --git a/package/madplay/Makefile b/package/madplay/Makefile
index d089b8358..614264b2e 100644
--- a/package/madplay/Makefile
+++ b/package/madplay/Makefile
@@ -15,6 +15,8 @@ PKG_URL:= http://www.underbit.com/products/mad
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=mad/} \
ftp://ftp.mars.org/pub/mpeg/
+PKG_ARCH_DEPENDS:= !m68k
+
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,MADPLAY,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/mpd/Makefile b/package/mpd/Makefile
index c9c06e4bf..c14529ab5 100644
--- a/package/mpd/Makefile
+++ b/package/mpd/Makefile
@@ -15,7 +15,7 @@ PKG_BUILDDEP:= glib
PKG_URL:= http://www.musicpd.org/
PKG_SITES:= http://www.musicpd.org/download/mpd/0.17/
-PKG_ARCH_DEPENDS:= !avr32
+PKG_ARCH_DEPENDS:= !avr32 !m68k
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz
diff --git a/package/mpg123/Makefile b/package/mpg123/Makefile
index ca6ec0539..f66d17715 100644
--- a/package/mpg123/Makefile
+++ b/package/mpg123/Makefile
@@ -14,6 +14,8 @@ PKG_BUILDDEP:= alsa-lib
PKG_URL:= http://www.mpg123.de/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=mpg123/}
+PKG_ARCH_DEPENDS:= !m68k
+
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include $(TOPDIR)/mk/package.mk
diff --git a/package/sdl/Makefile b/package/sdl/Makefile
index f911ee0f7..d08555c60 100644
--- a/package/sdl/Makefile
+++ b/package/sdl/Makefile
@@ -14,6 +14,8 @@ PKG_BUILDDEP:= libusb alsa-lib libX11 libXext
PKG_URL:= http://www.libsdl.org/
PKG_SITES:= http://www.libsdl.org/release/
+PKG_ARCH_DEPENDS:= !m68k
+
PKG_FLAVOURS_LIBSDL:= WITH_TSLIB
PKGFD_WITH_TSLIB:= enable touchscreen support
PKGFS_WITH_TSLIB:= tslib
diff --git a/package/sox/Makefile b/package/sox/Makefile
index 2f5436146..d5aca61e7 100644
--- a/package/sox/Makefile
+++ b/package/sox/Makefile
@@ -14,6 +14,8 @@ PKG_DEPENDS:= zlib libmad liblame alsa-lib libid3tag
PKG_URL:= http://sox.sourceforge.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=sox/}
+PKG_ARCH_DEPENDS:= !m68k
+
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,SOX,sox,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/target/m68k/uclibc.config b/target/m68k/uclibc.config
index 12e42b194..da353c97b 100644
--- a/target/m68k/uclibc.config
+++ b/target/m68k/uclibc.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Version: 0.9.33.2
-# Thu Oct 17 09:03:34 2013
+# Thu Oct 17 12:35:12 2013
#
# TARGET_alpha is not set
# TARGET_arm is not set
@@ -77,11 +77,10 @@ LDSO_LD_LIBRARY_PATH=y
UCLIBC_CTOR_DTOR=y
# LDSO_GNU_HASH_SUPPORT is not set
# HAS_NO_THREADS is not set
-# LINUXTHREADS_OLD is not set
+LINUXTHREADS_OLD=y
# LINUXTHREADS_NEW is not set
-UCLIBC_HAS_THREADS_NATIVE=y
+# UCLIBC_HAS_THREADS_NATIVE is not set
UCLIBC_HAS_THREADS=y
-UCLIBC_HAS_TLS=y
# PTHREADS_DEBUG_SUPPORT is not set
UCLIBC_HAS_SYSLOG=y
UCLIBC_HAS_LFS=y
@@ -195,7 +194,6 @@ UCLIBC_HAS_ERRNO_MESSAGES=y
UCLIBC_HAS_SIGNUM_MESSAGES=y
# UCLIBC_HAS_SYS_SIGLIST is not set
UCLIBC_HAS_GNU_GETOPT=y
-UCLIBC_HAS_STDIO_FUTEXES=y
UCLIBC_HAS_GNU_GETSUBOPT=y
#
@@ -236,6 +234,7 @@ UCLIBC_BUILD_NOEXECSTACK=y
CROSS_COMPILER_PREFIX=""
UCLIBC_EXTRA_CFLAGS=""
# DODEBUG is not set
+# DODEBUG_PT is not set
DOSTRIP=y
# DOASSERTS is not set
# SUPPORT_LD_DEBUG is not set