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/libc | |
| 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/libc')
| -rw-r--r-- | package/libc/Config.in | 9 | ||||
| -rw-r--r-- | package/libc/Config.in.manual | 6 | ||||
| -rw-r--r-- | package/libc/Makefile | 6 |
3 files changed, 11 insertions, 10 deletions
diff --git a/package/libc/Config.in b/package/libc/Config.in deleted file mode 100644 index d8956f1d7..000000000 --- a/package/libc/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config ADK_PACKAGE_LIBC - prompt "libc............................... native C library" - tristate - default y if ADK_NATIVE - default n - depends on ADK_NATIVE - help - C library. - diff --git a/package/libc/Config.in.manual b/package/libc/Config.in.manual new file mode 100644 index 000000000..225fc5716 --- /dev/null +++ b/package/libc/Config.in.manual @@ -0,0 +1,6 @@ +config ADK_COMPILE_LIBC + boolean + depends on ADK_NATIVE + default y if ADK_NATIVE + help + Native C library from host system. diff --git a/package/libc/Makefile b/package/libc/Makefile index a06d3e321..29b30d546 100644 --- a/package/libc/Makefile +++ b/package/libc/Makefile @@ -14,6 +14,10 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBC,libc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +CONFIG_STYLE:= manual +BUILD_STYLE:= manual +INSTALL_STYLE:= manual + # do nothing, use native c library do-install: ${INSTALL_DIR} $(IDIR_LIBC)/lib @@ -21,7 +25,7 @@ do-install: $(CP) /lib/ld*-*.so* $(IDIR_LIBC)/lib/ if test -f /lib/libuClibc-*.so; then $(CP) /lib/libuClibc-*.so \ $(IDIR_LIBC)/lib/;fi - -for file in libc libcrypt libdl libm libnsl libresolv librt libutil libnss_compat libnss_dns libnss_files; do \ + -for file in libc libpthread libcrypt libdl libm libnsl libresolv librt libutil libnss_compat libnss_dns libnss_files; do \ $(CP) /lib/$$file.so.* $(IDIR_LIBC)/lib/; \ $(CP) /lib/$$file-*.so $(IDIR_LIBC)/lib/; \ done |