diff options
| -rw-r--r-- | package/libmad/Makefile | 3 | ||||
| -rw-r--r-- | package/libpthread/Makefile | 11 | ||||
| -rw-r--r-- | package/mplayer/Makefile | 2 | ||||
| -rw-r--r-- | package/qemu/Makefile | 1 | ||||
| -rw-r--r-- | target/config/Config.in | 4 | ||||
| -rw-r--r-- | target/x86_64/sys-available/qemu-x86_64 | 2 | ||||
| -rw-r--r-- | target/x86_64/uclibc.config | 2 |
7 files changed, 13 insertions, 12 deletions
diff --git a/package/libmad/Makefile b/package/libmad/Makefile index 0b708732d..58faf3463 100644 --- a/package/libmad/Makefile +++ b/package/libmad/Makefile @@ -21,6 +21,9 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBMAD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBMAD_DEV,libmad-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBMAD_DEV},${PKGSC_LIBMAD_DEV})) +#FIXME +XAKE_FLAGS+= GCC_HONOUR_COPTS=s + FPM:=default ifeq (${ARCH},i386) FPM:=intel diff --git a/package/libpthread/Makefile b/package/libpthread/Makefile index de0d75403..c14dc6c43 100644 --- a/package/libpthread/Makefile +++ b/package/libpthread/Makefile @@ -24,8 +24,7 @@ PKG_OPTS:= noremove NO_DISTFILES:= 1 -PKG_SUBPKGS:= LIBPTHREAD LIBPTHREAD_DEV -PKGSC_LIBPTHREAD_DEV:= devel +PKG_SUBPKGS:= LIBPTHREAD ifeq ($(ADK_STATIC),y) PKG_OPTS+= libonly @@ -34,7 +33,6 @@ endif include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBPTHREAD,libpthread,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -$(eval $(call PKG_template,LIBPTHREAD_DEV,libpthread-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_LIBPTHREAD_DEV},${PKG_OPTS})) CONFIG_STYLE:= manual BUILD_STYLE:= manual @@ -46,11 +44,4 @@ ifeq ($(ADK_NATIVE),) ${CP} ${STAGING_TARGET_DIR}/lib/libpthread*.so* ${IDIR_LIBPTHREAD}/lib endif -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 -endif - include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile index 2529c1eec..149330bef 100644 --- a/package/mplayer/Makefile +++ b/package/mplayer/Makefile @@ -17,7 +17,7 @@ PKG_BUILDDEP+= libX11 libXv libpng libXext jpeg PKG_URL:= http://www.mplayerhq.hu/ PKG_SITES:= http://openadk.org/distfiles/ -PKG_ARCH_DEPENDS:= x86 x86_64 mips +PKG_ARCH_DEPENDS:= x86 mips PKG_FLAVOURS_MPLAYER:= WITH_DIRECTFB PKGFD_WITH_DIRECTFB:= enable DirectFB video output support diff --git a/package/qemu/Makefile b/package/qemu/Makefile index 69bc964c9..7074bf80c 100644 --- a/package/qemu/Makefile +++ b/package/qemu/Makefile @@ -15,6 +15,7 @@ PKG_URL:= http://wwww.qemu.org/ PKG_SITES:= http://download.savannah.gnu.org/releases/qemu/ PKG_ARCH_DEPENDS:= native x86 x86_64 +PKG_SYSTEM_DEPENDS:= ibm-x40 include $(TOPDIR)/mk/package.mk diff --git a/target/config/Config.in b/target/config/Config.in index d5cdcdb70..5c38228b6 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -227,6 +227,9 @@ config ADK_CPU_I586 config ADK_CPU_I686 boolean +config ADK_CPU_X86_64 + boolean + config ADK_CPU_GEODE boolean @@ -248,6 +251,7 @@ config ADK_CPU_ARMV5 config ADK_TARGET_CPU_ARCH string + default "x86_64" if ADK_CPU_X86_64 default "i486" if ADK_CPU_I486 default "i586" if ADK_CPU_I586 default "i686" if ADK_CPU_I686 diff --git a/target/x86_64/sys-available/qemu-x86_64 b/target/x86_64/sys-available/qemu-x86_64 index e7dd37fa8..d0427ea29 100644 --- a/target/x86_64/sys-available/qemu-x86_64 +++ b/target/x86_64/sys-available/qemu-x86_64 @@ -2,6 +2,8 @@ config ADK_TARGET_SYSTEM_QEMU_X86_64 bool "Qemu Emulator" select ADK_x86_64 select ADK_qemu_x86_64 + select ADK_CPU_X86_64 + select ADK_LINUX_64 select ADK_HARDWARE_QEMU select ADK_TARGET_WITH_VGA select ADK_TARGET_WITH_INPUT diff --git a/target/x86_64/uclibc.config b/target/x86_64/uclibc.config index 301220414..7492fdcfc 100644 --- a/target/x86_64/uclibc.config +++ b/target/x86_64/uclibc.config @@ -81,7 +81,7 @@ UCLIBC_CTOR_DTOR=y UCLIBC_HAS_THREADS_NATIVE=y UCLIBC_HAS_THREADS=y UCLIBC_HAS_TLS=y -# PTHREADS_DEBUG_SUPPORT is not set +PTHREADS_DEBUG_SUPPORT=y UCLIBC_HAS_SYSLOG=y UCLIBC_HAS_LFS=y # MALLOC is not set |