diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2015-03-20 16:07:00 -0500 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-03-20 16:07:00 -0500 |
| commit | 7c0e488c5cf6992ad67c59137d4f5463cf523a81 (patch) | |
| tree | 7413ad7057a74f1582f2d1958d6c86ea68e6126c | |
| parent | 1a606de1ca0e55fd1b266836c5cfe946fd5fc624 (diff) | |
fix for uClibc-ng git version handling
| -rw-r--r-- | package/uclibc-ng/Makefile | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/package/uclibc-ng/Makefile b/package/uclibc-ng/Makefile index 9efac27d1..1306a23b1 100644 --- a/package/uclibc-ng/Makefile +++ b/package/uclibc-ng/Makefile @@ -11,6 +11,12 @@ PKG_DESCR:= embedded c library PKG_SECTION:= base/libs PKG_OPTS:= noremove nostaging noscripts +ifeq ($(ADK_LIBC_VERSION),git) +PKG_VER:= 1.0.0-git +else +PKG_VER:= $(PKG_VERSION) +endif + PKG_SUBPKGS:= UCLIBC_NG UCLIBC_NG_DEV UCLIBC_NG_TEST PKGSD_UCLIBC_NG_DEV:= development files for uclibc-ng PKGSC_UCLIBC_NG_DEV:= devel @@ -36,9 +42,9 @@ do-install: cut -f 2 > $(IDIR_UCLIBC_NG)/etc/TZ ifneq ($(ADK_TARGET_USE_STATIC_LIBS)$(ADK_TARGET_BINFMT_FLAT),y) $(CP) $(STAGING_TARGET_DIR)/lib/libc.so.* $(IDIR_UCLIBC_NG)/$(ADK_TARGET_LIBC_PATH) - $(CP) $(STAGING_TARGET_DIR)/lib/libuClibc-$(PKG_VERSION).so \ + $(CP) $(STAGING_TARGET_DIR)/lib/libuClibc-$(PKG_VER).so \ $(IDIR_UCLIBC_NG)/$(ADK_TARGET_LIBC_PATH) - $(CP) $(STAGING_TARGET_DIR)/lib/ld*-uClibc-$(PKG_VERSION).so \ + $(CP) $(STAGING_TARGET_DIR)/lib/ld*-uClibc-$(PKG_VER).so \ $(IDIR_UCLIBC_NG)/$(ADK_TARGET_LIBC_PATH) $(CP) $(STAGING_TARGET_DIR)/lib/ld*-uClibc.so.* $(IDIR_UCLIBC_NG)/$(ADK_TARGET_LIBC_PATH) # backward compatible symlink @@ -48,7 +54,7 @@ ifneq ($(ADK_TARGET_USE_STATIC_LIBS)$(ADK_TARGET_BINFMT_FLAT),y) cd $(IDIR_UCLIBC_NG)/$(ADK_TARGET_LIBC_PATH) && ln -sf ld64-uClibc.so.1 ld64-uClibc.so.0 -for file in libcrypt libdl libm libresolv libutil; do \ $(CP) $(STAGING_TARGET_DIR)/lib/$$file.so* $(IDIR_UCLIBC_NG)/$(ADK_TARGET_LIBC_PATH); \ - $(CP) $(STAGING_TARGET_DIR)/lib/$$file-$(PKG_VERSION).so \ + $(CP) $(STAGING_TARGET_DIR)/lib/$$file-$(PKG_VER).so \ $(IDIR_UCLIBC_NG)/$(ADK_TARGET_LIBC_PATH); \ done endif @@ -59,7 +65,7 @@ uclibc-ng-dev-install: ${CP} ${STAGING_TARGET_DIR}/usr/lib/uclibc_nonshared.a ${IDIR_UCLIBC_NG_DEV}/usr/lib ${CP} ${STAGING_TARGET_DIR}/usr/lib/crt*.o ${IDIR_UCLIBC_NG_DEV}/usr/lib for file in libcrypt libdl libm libresolv libutil; do \ - cd $(IDIR_UCLIBC_NG_DEV)/$(ADK_TARGET_LIBC_PATH); ln -sf $$file-$(PKG_VERSION).so $$file.so; \ + cd $(IDIR_UCLIBC_NG_DEV)/$(ADK_TARGET_LIBC_PATH); ln -sf $$file-$(PKG_VER).so $$file.so; \ done ${KERNEL_MAKE_ENV} \ $(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-linux-$(KERNEL_VERSION)-$(KERNEL_RELEASE)/linux-$(KERNEL_VERSION) \ |