summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/eglibc/Config.in2
-rw-r--r--package/eglibc/Makefile20
-rw-r--r--package/glibc/Config.in2
-rw-r--r--package/glibc/Makefile19
-rw-r--r--package/uclibc/Config.in2
-rw-r--r--package/uclibc/Makefile8
6 files changed, 32 insertions, 21 deletions
diff --git a/package/eglibc/Config.in b/package/eglibc/Config.in
index 6265c5b58..6e1daf463 100644
--- a/package/eglibc/Config.in
+++ b/package/eglibc/Config.in
@@ -9,7 +9,7 @@ config ADK_PACKAGE_EGLIBC
config ADK_PACKAGE_EGLIBC_DEV
prompt "eglibc-dev........................... development files"
- bool
+ tristate
default n
depends on ADK_TARGET_LIB_EGLIBC
help
diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile
index a7cf97fbe..de7c80e45 100644
--- a/package/eglibc/Makefile
+++ b/package/eglibc/Makefile
@@ -14,6 +14,10 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,EGLIBC,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
$(eval $(call PKG_template,EGLIBC_DEV,$(PKG_NAME)-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+SUB_INSTALLS-y:=
+SUB_INSTALLS-m:=
+SUB_INSTALLS-${ADK_PACKAGE_EGLIBC_DEV}+= eglibc-dev-install
+
EGLIBC_CONFOPTS:= \
--build=$(GNU_HOST_NAME) \
--host=$(REAL_GNU_TARGET_NAME) \
@@ -40,16 +44,11 @@ EGLIBC_ENV:= PATH='${TARGET_PATH}' \
libc_cv_gnu99_inline=yes \
libc_cv_slibdir="/lib"
-do-extract:
-
-# do nothing, eglibc is already build in toolchain directory
-do-install:
+# compile nothing, eglibc is already build in toolchain directory
+do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
${INSTALL_DIR} $(IDIR_EGLIBC)/lib $(IDIR_EGLIBC)/etc $(IDIR_EGLIBC)/usr/lib
# install /etc/localtime from host system (FIXME)
${CP} /etc/localtime $(IDIR_EGLIBC)/etc
-ifeq ($(ADK_SSP),y)
- $(CP) $(STAGING_DIR)/lib/libssp.so* $(IDIR_EGLIBC)/lib/
-endif
$(CP) $(STAGING_DIR)/lib/ld-* $(IDIR_EGLIBC)/lib/
$(CP) $(STAGING_DIR)/lib/libgcc_s.so* $(IDIR_EGLIBC)/lib/
-for file in libc libcrypt libdl libm libnsl libresolv librt libutil libnss_compat libnss_dns libnss_files; do \
@@ -63,8 +62,11 @@ endif
cd $(IDIR_EGLIBC)/lib && ln -sf librt.so.1 librt.so
cd $(IDIR_EGLIBC)/lib && ln -sf libcrypt.so.1 libcrypt.so
cd $(IDIR_EGLIBC)/lib && ln -sf libdl.so.2 libdl.so
+
+eglibc-dev-install:
# header package
- $(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) ARCH=$(ARCH) V=1 \
+ $(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) \
+ HOSTCC=$(HOSTCC) ARCH=$(ARCH) V=1 \
INSTALL_HDR_PATH=$(IDIR_EGLIBC_DEV)/usr \
headers_install
(cd $(WRKBUILD); \
@@ -77,6 +79,6 @@ endif
PATH='${TARGET_PATH}' \
$(MAKE) -C $(WRKBUILD) \
install-headers install-bootstrap-headers=yes
- @find $(IDIR_EGLIBC_DEV) -name .install -delete
+ @find $(IDIR_EGLIBC_DEV) -name .install -exec rm {} \;
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/glibc/Config.in b/package/glibc/Config.in
index b6879a384..6e7db32c9 100644
--- a/package/glibc/Config.in
+++ b/package/glibc/Config.in
@@ -9,7 +9,7 @@ config ADK_PACKAGE_GLIBC
config ADK_PACKAGE_GLIBC_DEV
prompt "glibc-dev........................... development files"
- bool
+ tristate
default n
depends on ADK_TARGET_LIB_GLIBC
help
diff --git a/package/glibc/Makefile b/package/glibc/Makefile
index 3cd49f64b..45145d230 100644
--- a/package/glibc/Makefile
+++ b/package/glibc/Makefile
@@ -28,17 +28,17 @@ GLIBC_CONFOPTS:= \
--enable-add-ons
$(eval $(call PKG_template,GLIBC,glibc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,GLIBC_DEV,glibc-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-do-extract:
+SUB_INSTALLS-y:=
+SUB_INSTALLS-m:=
+SUB_INSTALLS-${ADK_PACKAGE_GLIBC_DEV}+= glibc-dev-install
-# do nothing, glibc is already build in toolchain directory
-do-install:
+# compile nothing, glibc is already build in toolchain directory
+do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
${INSTALL_DIR} $(IDIR_GLIBC)/lib $(IDIR_GLIBC)/etc
# install /etc/localtime from host system (FIXME)
${CP} /etc/localtime $(IDIR_GLIBC)/etc
-ifeq ($(ADK_SSP),y)
- $(CP) $(STAGING_DIR)/lib/libssp.so* $(IDIR_GLIBC)/lib/
-endif
$(CP) $(STAGING_DIR)/lib/libgcc_s.so* $(IDIR_GLIBC)/lib/
$(CP) $(STAGING_DIR)/lib/ld-*.so* $(IDIR_GLIBC)/lib/
-for file in libc libcrypt libdl libm libnsl libresolv librt libutil libnss_compat libnss_dns libnss_files; do \
@@ -47,8 +47,11 @@ endif
done
# create ld.so link for mips gcc linker option
cd $(IDIR_GLIBC)/lib && ln -sf ld-linux.so.2 ld.so.1
+
+glibc-dev-install:
# header package
- $(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) ARCH=$(ARCH) V=1 \
+ $(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) \
+ HOSTCC=$(HOSTCC) ARCH=$(ARCH) V=1 \
INSTALL_HDR_PATH=$(IDIR_GLIBC_DEV)/usr \
headers_install
(cd $(WRKBUILD); \
@@ -63,6 +66,6 @@ endif
install-headers
touch $(IDIR_GLIBC_DEV)/usr/include/gnu/stubs.h
touch $(IDIR_GLIBC_DEV)/usr/include/bits/stdio_lim.h
- @find $(IDIR_GLIBC_DEV) -name .install -delete
+ @find $(IDIR_GLIBC_DEV) -name .install -exec rm {} \;
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in
index 8cc828864..4100fd313 100644
--- a/package/uclibc/Config.in
+++ b/package/uclibc/Config.in
@@ -9,7 +9,7 @@ config ADK_PACKAGE_UCLIBC
config ADK_PACKAGE_UCLIBC_DEV
prompt "uClibc-dev........................... development files"
- bool
+ tristate
default n
depends on ADK_TARGET_LIB_UCLIBC
help
diff --git a/package/uclibc/Makefile b/package/uclibc/Makefile
index 4d96eceae..e6d080a37 100644
--- a/package/uclibc/Makefile
+++ b/package/uclibc/Makefile
@@ -14,8 +14,12 @@ 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}))
+SUB_INSTALLS-y:=
+SUB_INSTALLS-m:=
+SUB_INSTALLS-${ADK_PACKAGE_UCLIBC_DEV}+= uclibc-dev-install
+
# do nothing, uClibc is already build in toolchain directory
-do-install:
+do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
${INSTALL_DIR} $(IDIR_UCLIBC)/lib $(IDIR_UCLIBC)/etc
# create timezone file
echo 'CET-1CEST-2,M3.5.0/02:00:00,M10.5.0/03:00:00' > $(IDIR_UCLIBC)/etc/TZ
@@ -28,6 +32,8 @@ do-install:
$(CP) $(STAGING_DIR)/lib/$$file.so* $(IDIR_UCLIBC)/lib/; \
$(CP) $(STAGING_DIR)/lib/$$file-$(PKG_VERSION).so $(IDIR_UCLIBC)/lib/; \
done
+
+uclibc-dev-install:
# header package
$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) ARCH=$(ARCH) V=1 \
INSTALL_HDR_PATH=$(IDIR_UCLIBC_DEV)/usr \
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 11:31:48 +0000