diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-13 17:18:15 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-13 17:18:15 +0200 |
| commit | 64d6047788b6201a9b026a6841dd25f8d0a0d00b (patch) | |
| tree | 95aafc346b70447f7dd2829f83f59d8df15d4d58 /package/libpthread | |
| parent | d5aed1c97f81f422af91c1bd4d7994dc54beabe1 (diff) | |
| parent | 7297ef1c47935fb17e49cac8379908e631763566 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/libpthread')
| -rw-r--r-- | package/libpthread/Makefile | 3 | ||||
| -rw-r--r-- | package/libpthread/files/libpthread.postinst | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/package/libpthread/Makefile b/package/libpthread/Makefile index cdb84d5fe..50d8172d1 100644 --- a/package/libpthread/Makefile +++ b/package/libpthread/Makefile @@ -10,7 +10,7 @@ ifeq ($(ADK_TARGET_LIB_MUSL),y) include ${TOPDIR}/toolchain/musl/Makefile.inc endif ifeq ($(ADK_TARGET_LIB_UCLIBC),y) -include ${TOPDIR}/toolchain/uClibc/Makefile.inc +include ${TOPDIR}/toolchain/uclibc/Makefile.inc endif PKG_NAME:= libpthread @@ -36,6 +36,7 @@ libpthread-install: ifeq ($(ADK_TARGET_LIB_MUSL),) ${INSTALL_DIR} ${IDIR_LIBPTHREAD}/$(ADK_TARGET_LIBC_PATH) ${CP} ${STAGING_TARGET_DIR}/lib/libpthread*.so* ${IDIR_LIBPTHREAD}/$(ADK_TARGET_LIBC_PATH) + (cd ${IDIR_LIBPTHREAD}/$(ADK_TARGET_LIBC_PATH); ln -sf libpthread.so.0 libpthread.so) endif include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libpthread/files/libpthread.postinst b/package/libpthread/files/libpthread.postinst deleted file mode 100644 index 76a6c81a4..000000000 --- a/package/libpthread/files/libpthread.postinst +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -if [ ! -z $IPKG_INSTROOT ];then - (cd $IPKG_INSTROOT/lib && ln -sf libpthread.so.0 libpthread.so) -fi |
