diff options
Diffstat (limited to 'package/base-files')
| -rw-r--r-- | package/base-files/Makefile | 12 | ||||
| -rw-r--r-- | package/base-files/ipkg/uclibc.control | 2 |
2 files changed, 11 insertions, 3 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 8b74ee0d9..7601de2ad 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -29,7 +29,15 @@ LIBGCC_VERSION:=${shell cat $(STAGING_DIR)/gcc_version} IDIR_LIBGCC:=$(PKG_BUILD_DIR)/libgcc IPKG_LIBGCC:=$(PACKAGE_DIR)/libgcc_$(LIBGCC_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk -PACKAGES:=$(IPKG_BASE) $(IPKG_UCLIBC) $(IPKG_LIBGCC) +PACKAGES:=$(IPKG_BASE) $(IPKG_UCLIBC) +PACKAGES_INSTALL:=$(IPKG_BASE) $(IPKG_UCLIBC) + +ifeq ($(BR2_PACKAGE_LIBGCC),y) +PACKAGES_INSTALL+=$(IPKG_LIBGCC) +endif +ifeq ($(BR2_PACKAGE_LIBGCC),m) +PACKAGES+=$(IPKG_LIBGCC) +endif $(PKG_BUILD_DIR)/.prepared: mkdir -p $(PKG_BUILD_DIR) $(PACKAGE_DIR) @@ -88,4 +96,4 @@ prepare: compile-targets: $(PACKAGES) install-targets: compile mkdir -p $(TARGET_DIR) - $(IPKG) install $(PACKAGES) + $(IPKG) install $(PACKAGES_INSTALL) diff --git a/package/base-files/ipkg/uclibc.control b/package/base-files/ipkg/uclibc.control index d07ed9068..1cdfe157c 100644 --- a/package/base-files/ipkg/uclibc.control +++ b/package/base-files/ipkg/uclibc.control @@ -1,5 +1,5 @@ Package: uclibc Priority: optional Section: net -Depends: base-files, libgcc +Depends: base-files Description: Standard C library for embedded Linux systems |