summaryrefslogtreecommitdiff
path: root/package/uclibc
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-02-15 22:30:13 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2010-02-15 22:30:13 +0100
commitc57d0300bd42fabd8eeda2a95b6c3960d6e7ce07 (patch)
treeb53bc538246b5a900300b5c6b5ea740f978196f4 /package/uclibc
parentcf4b3959527339206254b8c8fc44deb391beeb10 (diff)
parent023560ac69a2ecf5659c668c26c0af6b5612a46b (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts: package/nspr/Makefile
Diffstat (limited to 'package/uclibc')
-rw-r--r--package/uclibc/Config.in.manual6
-rw-r--r--package/uclibc/Makefile6
2 files changed, 9 insertions, 3 deletions
diff --git a/package/uclibc/Config.in.manual b/package/uclibc/Config.in.manual
index 4100fd313..bfc1b08c5 100644
--- a/package/uclibc/Config.in.manual
+++ b/package/uclibc/Config.in.manual
@@ -1,5 +1,5 @@
config ADK_PACKAGE_UCLIBC
- prompt "uClibc............................... embedded C library"
+ prompt "uClibc............................ embedded C library"
bool
default y if ADK_TARGET_LIB_UCLIBC && !ADK_TOOLCHAIN_ONLY
default n
@@ -8,10 +8,10 @@ config ADK_PACKAGE_UCLIBC
Embedded C library.
config ADK_PACKAGE_UCLIBC_DEV
- prompt "uClibc-dev........................... development files"
+ prompt "uClibc-dev........................ development files"
tristate
default n
- depends on ADK_TARGET_LIB_UCLIBC
+ depends on ADK_TARGET_LIB_UCLIBC && ADK_PACKAGE_UCLIBC
help
C library header files.
diff --git a/package/uclibc/Makefile b/package/uclibc/Makefile
index e6d080a37..aeffb3563 100644
--- a/package/uclibc/Makefile
+++ b/package/uclibc/Makefile
@@ -14,6 +14,10 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,UCLIBC,uclibc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
$(eval $(call PKG_template,UCLIBC_DEV,uclibc-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+CONFIG_STYLE:= manual
+BUILD_STYLE:= manual
+INSTALL_STYLE:= manual
+
SUB_INSTALLS-y:=
SUB_INSTALLS-m:=
SUB_INSTALLS-${ADK_PACKAGE_UCLIBC_DEV}+= uclibc-dev-install
@@ -34,6 +38,8 @@ do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
done
uclibc-dev-install:
+ ${INSTALL_DIR} ${IDIR_UCLIBC_DEV}/usr/lib
+ ${CP} ${STAGING_DIR}/lib/crt* ${IDIR_UCLIBC_DEV}/usr/lib
# header package
$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) ARCH=$(ARCH) V=1 \
INSTALL_HDR_PATH=$(IDIR_UCLIBC_DEV)/usr \