diff options
| -rw-r--r-- | mk/build.mk | 1 | ||||
| -rw-r--r-- | mk/vars.mk | 2 | ||||
| -rw-r--r-- | package/bash/patches/patch-Makefile_in | 13 | ||||
| -rw-r--r-- | package/libpthread/Makefile | 17 | ||||
| -rw-r--r-- | package/libpthread/files/libpthread.so.x86 | 5 | ||||
| -rw-r--r-- | package/libpthread/files/libpthread.so.x86_64 | 5 |
6 files changed, 40 insertions, 3 deletions
diff --git a/mk/build.mk b/mk/build.mk index 382f15353..ba0301159 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -15,6 +15,7 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_MAKE_PARALLEL=y \ ADK_MAKE_JOBS=4 \ ADK_USE_CCACHE=n \ + ADK_PACKAGE_ALSA_UTILS_WITH_ALSAMIXER=n \ ADK_PACKAGE_GRUB=n \ ADK_PACKAGE_BASE_FILES=y \ ADK_PACKAGE_PYTHON=n \ diff --git a/mk/vars.mk b/mk/vars.mk index 0e40ab3c6..cd8c25d62 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -14,7 +14,7 @@ BASE_DIR:= $(TOPDIR) DISTDIR?= ${BASE_DIR}/dl BUILD_DIR:= ${BASE_DIR}/build_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC} BUILD_DIR_PFX:= $(BASE_DIR)/build_* -STAGING_PKG_DIR:= ${BASE_DIR}/pkg_${ADK_TARGET_SYSTEM}_${ADK_TARGET_LIBC} +STAGING_PKG_DIR:= ${BASE_DIR}/pkg_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC} STAGING_PKG_DIR_PFX:= ${BASE_DIR}/pkg_* STAGING_HOST_DIR:= ${BASE_DIR}/host_${CPU_ARCH}_${ADK_TARGET_LIBC} STAGING_HOST_DIR_PFX:= ${BASE_DIR}/host_* diff --git a/package/bash/patches/patch-Makefile_in b/package/bash/patches/patch-Makefile_in new file mode 100644 index 000000000..8e6cfb1ac --- /dev/null +++ b/package/bash/patches/patch-Makefile_in @@ -0,0 +1,13 @@ +--- bash-4.2.orig/Makefile.in 2010-12-01 01:22:42.000000000 +0100 ++++ bash-4.2/Makefile.in 2011-03-09 20:03:07.163370779 +0100 +@@ -710,8 +710,8 @@ pathnames.h: Makefile $(srcdir)/pathnam + @${RM} pathnames.tmp + + # comment out for distribution +-$(srcdir)/configure: $(srcdir)/configure.in $(srcdir)/aclocal.m4 $(srcdir)/config.h.in +- cd $(srcdir) && autoconf ++#$(srcdir)/configure: $(srcdir)/configure.in $(srcdir)/aclocal.m4 $(srcdir)/config.h.in ++# cd $(srcdir) && autoconf + + # for chet + reconfig: force diff --git a/package/libpthread/Makefile b/package/libpthread/Makefile index feda89f6a..169db676a 100644 --- a/package/libpthread/Makefile +++ b/package/libpthread/Makefile @@ -12,6 +12,10 @@ endif ifeq ($(ADK_TARGET_LIB_UCLIBC),y) include ${TOPDIR}/toolchain/uClibc/Makefile.inc endif +ifeq ($(ADK_NATIVE),y) +PKG_VERSION:= 1.0 +PKG_RELEASE:= 1 +endif PKG_NAME:= libpthread PKG_DESCR:= POSIX threading library @@ -19,6 +23,8 @@ PKG_SECTION:= libs NO_DISTFILES:= 1 +PKG_SUBPKGS:= LIBPTHREAD LIBPTHREAD_DEV + ifeq ($(ADK_STATIC),y) PKG_OPTS:= libonly endif @@ -26,16 +32,23 @@ endif include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBPTHREAD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +$(eval $(call PKG_template,LIBPTHREAD_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual -do-install: +libpthread-install: ifeq ($(ADK_NATIVE),) ${INSTALL_DIR} ${IDIR_LIBPTHREAD}/lib ${CP} ${STAGING_TARGET_DIR}/lib/libpthread*.so* ${IDIR_LIBPTHREAD}/lib - cd $(IDIR_LIBPTHREAD)/lib && ln -sf libpthread.so.0 libpthread.so +endif + +libpthread-dev-install: +ifeq ($(ADK_NATIVE),) + ${INSTALL_DIR} ${IDIR_LIBPTHREAD}/usr/lib + ${CP} ./files/libpthread.so.$(ARCH) ${IDIR_LIBPTHREAD}/usr/lib/libpthread.so + ${CP} ${STAGING_TARGET_DIR}/usr/lib/libpthread_nonshared.a ${IDIR_LIBPTHREAD}/usr/lib endif include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libpthread/files/libpthread.so.x86 b/package/libpthread/files/libpthread.so.x86 new file mode 100644 index 000000000..e7555c820 --- /dev/null +++ b/package/libpthread/files/libpthread.so.x86 @@ -0,0 +1,5 @@ +/* GNU ld script + Use the shared library, but some functions are only in + the static library, so try that secondarily. */ +OUTPUT_FORMAT(elf32-i386) +GROUP ( /lib/libpthread.so.0 /usr/lib/libpthread_nonshared.a ) diff --git a/package/libpthread/files/libpthread.so.x86_64 b/package/libpthread/files/libpthread.so.x86_64 new file mode 100644 index 000000000..b0e31f904 --- /dev/null +++ b/package/libpthread/files/libpthread.so.x86_64 @@ -0,0 +1,5 @@ +/* GNU ld script + Use the shared library, but some functions are only in + the static library, so try that secondarily. */ +OUTPUT_FORMAT(elf64-x86-64) +GROUP ( /lib/libpthread.so.0 /usr/lib/libpthread_nonshared.a ) |