diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-06-04 01:31:03 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-06-04 01:31:03 +0000 |
| commit | 1e19a6d869cb2efb486467bad28c90d9ad2b9969 (patch) | |
| tree | 00d40dee12da87e40483d21ae6e48e5e99c42c25 /package | |
| parent | 6d6826fc9d75971716fd11198eb125f5596061d3 (diff) | |
don't compile libipkg in busybox if ipkg is disabled
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3901 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
| -rw-r--r-- | package/busybox/patches/911-ipkg.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/package/busybox/patches/911-ipkg.patch b/package/busybox/patches/911-ipkg.patch index 7b6437c98..1d7a4e357 100644 --- a/package/busybox/patches/911-ipkg.patch +++ b/package/busybox/patches/911-ipkg.patch @@ -203,16 +203,16 @@ diff -ruN busybox-1.1.2-orig/archival/libipkg/Makefile.in busybox-1.1.2+ipkg-0.9 + str_util.c \ + xsystem.c \ + -+LIBIPKG-y += $(LIBIPKG_CORE_SOURCES) -+LIBIPKG-y += $(LIBIPKG_CMD_SOURCES) -+LIBIPKG-y += $(LIBIPKG_DB_SOURCES) -+LIBIPKG-y += $(LIBIPKG_LIST_SOURCES) -+LIBIPKG-y += $(LIBIPKG_UTIL_SOURCES) ++LIBIPKG-$(CONFIG_IPKG) += $(LIBIPKG_CORE_SOURCES) ++LIBIPKG-$(CONFIG_IPKG) += $(LIBIPKG_CMD_SOURCES) ++LIBIPKG-$(CONFIG_IPKG) += $(LIBIPKG_DB_SOURCES) ++LIBIPKG-$(CONFIG_IPKG) += $(LIBIPKG_LIST_SOURCES) ++LIBIPKG-$(CONFIG_IPKG) += $(LIBIPKG_UTIL_SOURCES) +LIBIPKG_OBJS=$(patsubst %.c,$(LIBIPKG_DIR)%.o, $(LIBIPKG-y)) + +CFLAGS += -DIPKG_LIB -DIPKGLIBDIR="\"/usr/lib\"" -DHOST_CPU_STR="\"$(TARGET_ARCH)\"" + -+libraries-y += $(LIBIPKG_DIR)$(LIBIPKG_AR) ++libraries-$(CONFIG_IPKG) += $(LIBIPKG_DIR)$(LIBIPKG_AR) + +$(LIBIPKG_DIR)$(LIBIPKG_AR): $(LIBIPKG_OBJS) + $(do_ar) |