diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-03-13 22:07:36 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-03-13 22:07:36 +0100 |
| commit | 5b1ef5ec98175c6b50fe43bc651702821fc8e8df (patch) | |
| tree | 71204e645bbd4c223331f0bd56da421a250f92c2 | |
| parent | 56e554d65183edf7bcbab7ff04f0d13fa5a4a403 (diff) | |
| parent | bca2138092d5e81e33d816d51955f4217daefe97 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | package/eglibc/Makefile | 2 | ||||
| -rw-r--r-- | package/glibc/Makefile | 2 | ||||
| -rw-r--r-- | tools/adk/pkgmaker.c | 2 |
3 files changed, 4 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 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 */ |