diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2018-01-08 11:30:00 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2018-01-08 11:30:00 +0100 |
| commit | 0ea54c2852f4551053f0637826220b039357c665 (patch) | |
| tree | 4185a1da7474aea853ec6ee3b098dbbb82566f95 | |
| parent | 662e918e93567199b6fb566cc4901df9a502c25c (diff) | |
uclibc-ng: prevent duplicate compilation
| -rw-r--r-- | package/uclibc-ng/Makefile | 10 | ||||
| -rw-r--r-- | toolchain/uclibc-ng/Makefile | 13 |
2 files changed, 7 insertions, 16 deletions
diff --git a/package/uclibc-ng/Makefile b/package/uclibc-ng/Makefile index 48f4fb70e..1b34e3372 100644 --- a/package/uclibc-ng/Makefile +++ b/package/uclibc-ng/Makefile @@ -28,14 +28,16 @@ INSTALL_STYLE:= manual uclibc-ng-install: $(INSTALL_DIR) $(IDIR_UCLIBC_NG)/$(ADK_TARGET_LIBC_PATH) $(IDIR_UCLIBC_NG)/etc - -$(CP) $(STAGING_TARGET_DIR)/uclibc-ng/lib*/* $(IDIR_UCLIBC_NG)/$(ADK_TARGET_LIBC_PATH) - -@rm $(IDIR_UCLIBC_NG)/$(ADK_TARGET_LIBC_PATH)/libthread_db* 2>/dev/null + -$(CP) $(STAGING_TARGET_DIR)/lib/ld-uClibc*.so* $(IDIR_UCLIBC_NG)/$(ADK_TARGET_LIBC_PATH) + -$(CP) $(STAGING_TARGET_DIR)/lib/libc.so.* $(IDIR_UCLIBC_NG)/$(ADK_TARGET_LIBC_PATH) + -$(CP) $(STAGING_TARGET_DIR)/lib/libuClibc-*.so $(IDIR_UCLIBC_NG)/$(ADK_TARGET_LIBC_PATH) test -z $(ADK_RUNTIME_TIMEZONE) || \ grep $(ADK_RUNTIME_TIMEZONE) ./files/tz.lst | \ cut -f 2 > $(IDIR_UCLIBC_NG)/etc/TZ ifeq ($(ADK_TARGET_LIBC_WITH_LOCALE),y) ${INSTALL_DIR} $(IDIR_UCLIBC_NG)/usr/bin - $(INSTALL_BIN) $(STAGING_TARGET_DIR)/uclibc-ng/usr/bin/locale $(IDIR_UCLIBC_NG)/usr/bin + $(INSTALL_BIN) $(STAGING_TARGET_DIR)/usr/bin/locale \ + $(IDIR_UCLIBC_NG)/usr/bin endif uclibc-ng-dev-install: @@ -50,7 +52,7 @@ uclibc-ng-dev-install: headers_install $(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VERSION} \ PREFIX=$(IDIR_UCLIBC_NG_DEV)/ \ - DEVEL_PREFIX=/usr/ \ + DEVEL_PREFIX=/usr \ RUNTIME_PREFIX=$(IDIR_UCLIBC_NG_DEV)/ \ HOSTCC="$(CC_FOR_BUILD)" \ CPU_CFLAGS="$(TARGET_CFLAGS)" \ diff --git a/toolchain/uclibc-ng/Makefile b/toolchain/uclibc-ng/Makefile index a31f4e3af..70f4c762f 100644 --- a/toolchain/uclibc-ng/Makefile +++ b/toolchain/uclibc-ng/Makefile @@ -370,23 +370,12 @@ $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled UCLIBC_EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \ VERBOSE=1 \ install_runtime install_dev - PATH='$(HOST_PATH)' $(MAKE) -C $(WRKBUILD) \ - ARCH="$(ADK_TARGET_ARCH)" \ - CROSS_COMPILE="$(TARGET_CROSS)" \ - HOSTCC="$(HOST_CC)" \ - PREFIX=$(STAGING_TARGET_DIR)/uclibc-ng \ - DEVEL_PREFIX=/usr/ \ - RUNTIME_PREFIX=/ \ - UCLIBC_EXTRA_CFLAGS="$(TARGET_CFLAGS)" \ - UCLIBC_EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \ - VERBOSE=1 \ - install_runtime ifeq ($(ADK_TARGET_LIBC_UTILS),y) PATH='$(HOST_PATH)' $(MAKE) -C $(WRKBUILD) \ ARCH="$(ADK_TARGET_ARCH)" \ CROSS_COMPILE="$(TARGET_CROSS)" \ HOSTCC="$(HOST_CC)" \ - PREFIX=$(STAGING_TARGET_DIR)/uclibc-ng \ + PREFIX=$(STAGING_TARGET_DIR) \ DEVEL_PREFIX=/usr/ \ RUNTIME_PREFIX=/ \ UCLIBC_EXTRA_CFLAGS="$(TARGET_CFLAGS)" \ |