From: Felix Fietkau Date: Sun, 4 Jun 2006 01:31:03 +0000 (+0000) Subject: don't compile libipkg in busybox if ipkg is disabled X-Git-Tag: kamikaze_7.06~1516 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=33a39bc348ef40856153212a5f2ebd37dcef648c;p=openwrt%2Fsvn-archive%2Fopenwrt.git don't compile libipkg in busybox if ipkg is disabled SVN-Revision: 3901 --- diff --git a/openwrt/package/busybox/patches/911-ipkg.patch b/openwrt/package/busybox/patches/911-ipkg.patch index 7b6437c98c..1d7a4e3574 100644 --- a/openwrt/package/busybox/patches/911-ipkg.patch +++ b/openwrt/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)