diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
| commit | 5042ac8e5927d0089d3902b1c37e5bcc1565d053 (patch) | |
| tree | cd2be3085808c5ac59dd70f9c610c6a40bfe3ffd /package/libpthread | |
| parent | 401dabf66529cfb5ab47b4c78d5e25fd493eef1f (diff) | |
| parent | 4d569ed1a3305c7b7abe8fa4273cea3b559cc85a (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
BUGS
package/autoconf/Makefile
Diffstat (limited to 'package/libpthread')
| -rw-r--r-- | package/libpthread/Config.in | 7 | ||||
| -rw-r--r-- | package/libpthread/Makefile | 16 |
2 files changed, 14 insertions, 9 deletions
diff --git a/package/libpthread/Config.in b/package/libpthread/Config.in deleted file mode 100644 index dab1b0e97..000000000 --- a/package/libpthread/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config ADK_PACKAGE_LIBPTHREAD - prompt "libpthread........................ POSIX threads library" - tristate - default n - help - POSIX threads library - diff --git a/package/libpthread/Makefile b/package/libpthread/Makefile index 74b0ea865..d1ea2621a 100644 --- a/package/libpthread/Makefile +++ b/package/libpthread/Makefile @@ -5,7 +5,11 @@ include ${TOPDIR}/rules.mk ifeq ($(ADK_TARGET_LIB_GLIBC),y) include ${TOPDIR}/toolchain/glibc/Makefile.inc -else +endif +ifeq ($(ADK_TARGET_LIB_EGLIBC),y) +include ${TOPDIR}/toolchain/eglibc/Makefile.inc +endif +ifeq ($(ADK_TARGET_LIB_UCLIBC),y) include ${TOPDIR}/toolchain/uClibc/Makefile.inc endif @@ -14,9 +18,17 @@ PKG_DESCR:= POSIX threading library PKG_SECTION:= libs NO_DISTFILES:= 1 +ifeq ($(ADK_STATIC),y) +PKG_OPTS:= libonly +endif + include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBPTHREAD,libpthread,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBPTHREAD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) + +CONFIG_STYLE:= manual +BUILD_STYLE:= manual +INSTALL_STYLE:= manual do-install: ${INSTALL_DIR} ${IDIR_LIBPTHREAD}/lib |