From f10b10839148312478ddaace130cf9ad1ea09ea9 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 13 Mar 2011 21:28:46 +0100 Subject: remove libnsl, it is not available and/or required --- package/eglibc/Makefile | 2 +- package/glibc/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile index 6f947f515..422171c0c 100644 --- a/package/eglibc/Makefile +++ b/package/eglibc/Makefile @@ -70,7 +70,7 @@ ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y) $(CP) $(STAGING_TARGET_DIR)/lib/libssp.so* $(IDIR_EGLIBC)/lib/ endif $(CP) $(STAGING_TARGET_DIR)/lib/ld* $(IDIR_EGLIBC)/lib/ - -for file in libc libcrypt libdl libm libresolv librt libnsl libutil libnss_dns libnss_files; do \ + -for file in libc libcrypt libdl libm libresolv librt libutil libnss_dns libnss_files; do \ $(CP) $(STAGING_TARGET_DIR)/lib/$$file.so* $(IDIR_EGLIBC)/lib/; \ $(CP) $(STAGING_TARGET_DIR)/lib/$$file-$(PKG_VERSION).so $(IDIR_EGLIBC)/lib/; \ done diff --git a/package/glibc/Makefile b/package/glibc/Makefile index 54a0567ac..f992abdf1 100644 --- a/package/glibc/Makefile +++ b/package/glibc/Makefile @@ -46,7 +46,7 @@ ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y) $(CP) $(STAGING_TARGET_DIR)/lib/libssp.so* $(IDIR_GLIBC)/lib/ endif $(CP) $(STAGING_TARGET_DIR)/lib/ld*.so* $(IDIR_GLIBC)/lib/ - -for file in libc libcrypt libdl libm libresolv librt libnsl libutil libnss_compat libnss_dns libnss_files; do \ + -for file in libc libcrypt libdl libm libresolv librt libutil libnss_compat libnss_dns libnss_files; do \ $(CP) $(STAGING_TARGET_DIR)/lib/$$file.so* $(IDIR_GLIBC)/lib/; \ $(CP) $(STAGING_TARGET_DIR)/lib/$$file-$(PKG_VERSION).so $(IDIR_GLIBC)/lib/; \ done -- cgit v1.2.3 From bca2138092d5e81e33d816d51955f4217daefe97 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 13 Mar 2011 21:56:30 +0100 Subject: CFLINE is only usable for the main package (atm) and should not apply to sub package Config.in files --- tools/adk/pkgmaker.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/adk/pkgmaker.c b/tools/adk/pkgmaker.c index 7b5ab8279..7c04b6b74 100644 --- a/tools/adk/pkgmaker.c +++ b/tools/adk/pkgmaker.c @@ -579,6 +579,8 @@ int main() { fprintf(cfg, "\t%s\n", cftoken); cftoken = strtok_r(NULL, "@", &saveptr); } + free(pkg_cfline); + pkg_cfline = NULL; } /* add sub package dependencies */ -- cgit v1.2.3