From 422ce6536b6d45e4632d526ae04c6af0bd36e80a Mon Sep 17 00:00:00 2001 From: Will Newton Date: Wed, 2 Sep 2009 16:02:02 +0100 Subject: package: Remove unnecessary dependencies on uclibc. A C library will have been built by the toolchain makefiles, so there is no need for packages to explicitly depend on uclibc. Signed-off-by: Will Newton Signed-off-by: Peter Korsgaard --- package/alsamixergui/alsamixergui.mk | 2 +- package/argus/argus.mk | 2 +- package/at/at.mk | 2 +- package/autoconf/autoconf.mk | 2 +- package/automake/automake.mk | 2 +- package/axel/axel.mk | 2 +- package/bash/bash.mk | 4 ++-- package/berkeleydb/berkeleydb.mk | 2 +- package/bind/bind.mk | 1 - package/bison/bison.mk | 2 +- package/blackbox/blackbox.mk | 2 +- package/bmon/bmon.mk | 2 +- package/boa/boa.mk | 2 +- package/bridge-utils/bridge.mk | 1 - package/bsdiff/bsdiff.mk | 2 +- package/busybox/busybox.mk | 2 +- package/busybox/initramfs.mk | 2 +- package/bzip2/bzip2.mk | 2 +- package/cairo/cairo.mk | 2 +- package/coreutils/coreutils.mk | 4 ++-- package/cups/cups.mk | 2 +- package/cvs/cvs.mk | 2 +- package/dash/dash.mk | 2 +- package/database/mysql_client/mysql_client.mk | 2 +- package/database/sqlite/sqlite.mk | 1 - package/dbus-glib/dbus-glib.mk | 2 +- package/dbus-python/dbus-python.mk | 2 +- package/dbus/dbus.mk | 2 +- package/devmem2/devmem2.mk | 2 +- package/dhcp/dhcp.mk | 6 +++--- package/dialog/dialog.mk | 2 +- package/diffutils/diffutils.mk | 2 +- package/dillo/dillo.mk | 2 +- package/directfb/directfb.mk | 2 +- package/distcc/distcc.mk | 2 +- package/dmalloc/dmalloc.mk | 2 +- package/dnsmasq/dnsmasq.mk | 2 -- package/docker/docker.mk | 2 +- package/dosfstools/dosfstools.mk | 2 +- package/dropbear/dropbear.mk | 2 +- package/dummy/dummy.mk | 2 +- package/e2fsprogs/e2fsprogs.mk | 4 ++-- package/editors/nano/nano.mk | 2 +- package/editors/uemacs/uemacs.mk | 2 +- package/editors/vim/vim.mk | 2 +- package/eeprog/eeprog.mk | 2 +- package/ethtool/ethtool.mk | 2 -- package/expat/expat.mk | 2 +- package/ezxml/ezxml.mk | 2 +- package/fakeroot/fakeroot.mk | 4 ++-- package/fbset/fbset.mk | 2 +- package/fbv/fbv.mk | 2 +- package/fconfig/fconfig.mk | 2 +- package/file/file.mk | 2 +- package/findutils/findutils.mk | 2 +- package/fis/fis.mk | 2 +- package/flex/flex.mk | 2 +- package/fltk/fltk.mk | 2 +- package/fontconfig/fontconfig.mk | 2 +- package/freetype/freetype.mk | 2 +- package/fuse/libfuse.mk | 2 +- package/gadgetfs-test/gadgetfs-test.mk | 4 ++-- package/games/ace_of_penguins/ace_of_penguins.mk | 2 +- package/games/gnuchess/gnuchess.mk | 2 -- package/games/magiccube4d/magiccube4d.mk | 2 -- package/games/rubix/rubix.mk | 2 -- package/games/vice/vice.mk | 2 -- package/games/xboard/xboard.mk | 4 +--- package/gamin/gamin.mk | 2 +- package/gawk/gawk.mk | 2 +- package/gettext/gettext.mk | 2 +- package/gmp/gmp.mk | 4 ++-- package/gperf/gperf.mk | 6 ------ package/gqview/gqview.mk | 2 +- package/gzip/gzip.mk | 2 +- package/hal/hal.mk | 2 +- package/haserl/haserl.mk | 2 -- package/hdparm/hdparm.mk | 2 +- package/hotplug/hotplug.mk | 2 +- package/hwdata/hwdata.mk | 2 +- package/i2c-tools/i2c-tools.mk | 2 +- package/icu/icu.mk | 2 +- package/ifplugd/ifplugd.mk | 2 +- package/imagemagick/imagemagick.mk | 2 +- package/input-tools/input-tools.mk | 2 +- package/iostat/iostat.mk | 2 +- package/iperf/iperf.mk | 2 -- package/ipkg/ipkg.mk | 2 -- package/ipsec-tools/ipsec-tools.mk | 2 +- package/java/classpath/classpath.mk | 2 +- package/java/jamvm/jamvm.mk | 2 +- package/jpeg/jpeg.mk | 2 +- package/kexec/kexec.mk | 4 +--- package/kismet/kismet.mk | 2 +- package/l2tp/l2tp.mk | 2 +- package/leafpad/leafpad.mk | 2 +- package/less/less.mk | 2 +- package/libaio/libaio.mk | 2 +- package/libarchive/libarchive.mk | 2 -- package/libart/libart.mk | 2 -- package/libcgi/libcgi.mk | 2 +- package/libcgicc/libcgicc.mk | 2 +- package/libconfig/libconfig.mk | 2 -- package/libconfuse/libconfuse.mk | 2 -- package/libdaemon/libdaemon.mk | 2 +- package/libdnet/libdnet.mk | 4 +--- package/libdrm/libdrm.mk | 2 +- package/libeXosip2/libeXosip2.mk | 2 +- package/libelf/libelf.mk | 4 ++-- package/liberation/liberation.mk | 2 +- package/libevent/libevent.mk | 2 +- package/libgcrypt/libgcrypt.mk | 2 +- package/libglib12/libglib12.mk | 2 +- package/libglib2/libglib2.mk | 2 +- package/libgpg-error/libgpg-error.mk | 2 +- package/libgtk12/libgtk12.mk | 2 +- package/libiconv/libiconv.mk | 2 -- package/libidn/libidn.mk | 2 +- package/liblockfile/liblockfile.mk | 2 +- package/liboil/liboil.mk | 2 +- package/libosip2/libosip2.mk | 2 +- package/libpcap/libpcap.mk | 2 +- package/libpng/libpng.mk | 2 +- package/libraw1394/libraw1394.mk | 2 +- package/libsoup/libsoup.mk | 2 +- package/libsysfs/libsysfs.mk | 2 +- package/libtool/libtool.mk | 2 -- package/libungif/libungif.mk | 2 +- package/libusb/libusb.mk | 2 +- package/libxml2/libxml2.mk | 2 -- package/libxslt/libxslt.mk | 2 +- package/lighttpd/lighttpd.mk | 2 +- package/links/links.mk | 2 +- package/linux-fusion/linux-fusion.mk | 6 +----- package/lm-sensors/lm-sensors.mk | 2 +- package/lockfile-progs/lockfile-progs.mk | 2 +- package/lrzsz/lrzsz.mk | 2 +- package/lsof/lsof.mk | 2 +- package/ltp-testsuite/ltp-testsuite.mk | 2 +- package/ltrace/ltrace.mk | 2 +- package/lua/lua.mk | 2 +- package/lvm2/lvm2.mk | 4 ++-- package/lzma/lzma.mk | 2 +- package/lzo/lzo.mk | 2 -- package/m4/m4.mk | 2 -- package/make/make.mk | 2 +- package/matchbox/matchbox.mk | 8 ++++---- package/mdadm/mdadm.mk | 2 +- package/mdnsresponder/mdnsresponder.mk | 2 +- package/memtester/memtester.mk | 2 +- package/metacity/metacity.mk | 2 +- package/microcom/microcom.mk | 2 +- package/microperl/microperl.mk | 2 +- package/microwin/microwin.mk | 2 +- package/midori/midori.mk | 2 +- package/mii-diag/mii-diag.mk | 2 +- package/module-init-tools/module-init-tools.mk | 2 +- package/modutils/modutils.mk | 4 ++-- package/mpatrol/mpatrol.mk | 2 +- package/mpfr/mpfr.mk | 4 ++-- package/mrouted/mrouted.mk | 2 +- package/multimedia/alsa-lib/alsa-lib.mk | 4 +--- package/multimedia/alsa-utils/alsa-utils.mk | 2 +- package/multimedia/asterisk/asterisk.mk | 2 +- package/multimedia/aumix/aumix.mk | 2 +- package/multimedia/festival/festival/festival.mk | 2 +- package/multimedia/festival/speech-tools/speech-tools.mk | 2 +- package/multimedia/libid3tag/libid3tag.mk | 2 +- package/multimedia/libmad/libmad.mk | 2 +- package/multimedia/libmms/libmms.mk | 2 +- package/multimedia/libogg/libogg.mk | 2 +- package/multimedia/libsndfile/libsndfile.mk | 1 - package/multimedia/libvorbis/libvorbis.mk | 4 ++-- package/multimedia/madplay/madplay.mk | 2 +- package/multimedia/mpg123/mpg123.mk | 2 +- package/multimedia/mplayer/mplayer.mk | 2 +- package/multimedia/taglib/taglib.mk | 2 -- package/multimedia/vlc/vlc.mk | 4 ---- package/mutt/mutt.mk | 2 +- package/nbd/nbd.mk | 2 +- package/netcat/netcat.mk | 2 -- package/netkitbase/netkitbase.mk | 2 +- package/netkittelnet/netkittelnet.mk | 2 +- package/netplug/netplug.mk | 2 +- package/netstat-nat/netstat-nat.mk | 1 - package/newt/newt.mk | 2 +- package/nfs-utils/nfs-utils.mk | 2 +- package/ng-spice-rework/ng-spice-rework.mk | 2 -- package/ntp/ntp.mk | 2 +- package/olsr/olsr.mk | 2 +- package/openmotif/openmotif.mk | 2 +- package/openntpd/openntpd.mk | 2 +- package/openswan/openswan.mk | 2 +- package/openvpn/openvpn.mk | 2 +- package/pango/pango.mk | 2 +- package/patch/patch.mk | 2 +- package/pciutils/pciutils.mk | 2 +- package/pcmanfm/pcmanfm.mk | 2 +- package/pcmcia/pcmcia.mk | 2 +- package/pcre/pcre.mk | 2 -- package/php/php.mk | 2 +- package/pkg-config/pkg-config.mk | 2 +- package/popt/popt.mk | 2 -- package/portage/portage.mk | 4 ++-- package/portmap/portmap.mk | 2 +- package/pppd/pppd.mk | 2 +- package/pptp-linux/pptp-linux.mk | 2 +- package/procps/procps.mk | 2 +- package/proftpd/proftpd.mk | 2 +- package/psmisc/psmisc.mk | 2 +- package/python/python.mk | 2 +- package/qt/qt.mk | 2 +- package/quagga/quagga.mk | 2 +- package/radvd/radvd.mk | 2 +- package/rdesktop/rdesktop.mk | 2 +- package/rp-pppoe/rp-pppoe.mk | 2 +- package/rsync/rsync.mk | 2 -- package/ruby/ruby.mk | 2 +- package/sdl/sdl.mk | 2 +- package/sdl_image/sdl_image.mk | 2 +- package/sdl_mixer/sdl_mixer.mk | 2 +- package/sdl_ttf/sdl_ttf.mk | 2 +- package/sed/sed.mk | 2 +- package/setserial/setserial.mk | 2 +- package/sfdisk/sfdisk.mk | 2 +- package/shared-mime-info/shared-mime-info.mk | 2 +- package/slang/slang.mk | 2 +- package/smartmontools/smartmontools.mk | 2 +- package/socat/socat.mk | 2 +- package/startup-notification/startup-notification.mk | 2 -- package/strace/strace.mk | 2 -- package/stunnel/stunnel.mk | 2 +- package/sudo/sudo.mk | 2 +- package/sylpheed/sylpheed.mk | 2 +- package/synergy/synergy.mk | 2 +- package/sysklogd/sysklogd.mk | 2 +- package/sysvinit/sysvinit.mk | 2 +- package/tar/tar.mk | 2 +- package/tcl/tcl.mk | 2 +- package/tcpdump/dhcpdump.mk | 2 +- package/tcpdump/tcpdump.mk | 2 +- package/tftpd/tftpd.mk | 2 +- package/thttpd/thttpd.mk | 2 +- package/tiff/tiff.mk | 2 +- package/tinyhttpd/tinyhttpd.mk | 2 +- package/tn5250/tn5250.mk | 2 +- package/torsmo/torsmo.mk | 2 -- package/tslib/tslib.mk | 2 -- package/udev/udev.mk | 2 +- package/udhcp/udhcp.mk | 2 +- package/udpcast/udpcast.mk | 2 +- package/usbmount/usbmount.mk | 2 +- package/usbutils/usbutils.mk | 2 +- package/util-linux/util-linux.mk | 2 +- package/vpnc/vpnc.mk | 2 +- package/vsftpd/vsftpd.mk | 4 ++-- package/vtun/vtun.mk | 2 +- package/wget/wget.mk | 2 +- package/which/which.mk | 2 -- package/wipe/wipe.mk | 2 +- package/wpa_supplicant/wpa_supplicant.mk | 2 +- package/x11r7/pthread-stubs/pthread-stubs.mk | 1 - package/x11r7/xfont_font-util/xfont_font-util.mk | 2 +- package/x11r7/xkeyboard-config/xkeyboard-config.mk | 2 -- package/x11vnc/x11vnc.mk | 2 -- package/xerces/xerces.mk | 2 +- package/xfsprogs/xfsprogs.mk | 2 +- package/xpdf/xpdf.mk | 2 +- package/xstroke/xstroke.mk | 2 -- package/xvkbd/xvkbd.mk | 2 +- package/zlib/zlib.mk | 2 +- 271 files changed, 249 insertions(+), 341 deletions(-) (limited to 'package') diff --git a/package/alsamixergui/alsamixergui.mk b/package/alsamixergui/alsamixergui.mk index 07477e6a5..e575a223b 100644 --- a/package/alsamixergui/alsamixergui.mk +++ b/package/alsamixergui/alsamixergui.mk @@ -12,7 +12,7 @@ ALSAMIXERGUI_INSTALL_TARGET = YES ALSAMIXERGUI_CONF_OPT = LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib -lstdc++ -lX11" -ALSAMIXERGUI_DEPENDENCIES = uclibc fltk +ALSAMIXERGUI_DEPENDENCIES = fltk $(eval $(call AUTOTARGETS,package,alsamixergui)) diff --git a/package/argus/argus.mk b/package/argus/argus.mk index e1c85415f..389ba3885 100644 --- a/package/argus/argus.mk +++ b/package/argus/argus.mk @@ -51,7 +51,7 @@ $(TARGET_DIR)/$(ARGUS_TARGET_BINARY): $(ARGUS_DIR)/$(ARGUS_BINARY) cp -dpf $(ARGUS_DIR)/$(ARGUS_BINARY) $@ $(STRIPCMD) $(STRIP_STRIP_ALL) $@ -argus: uclibc libpcap $(TARGET_DIR)/$(ARGUS_TARGET_BINARY) +argus: libpcap $(TARGET_DIR)/$(ARGUS_TARGET_BINARY) argus-clean: -$(MAKE) -C $(ARGUS_DIR) clean diff --git a/package/at/at.mk b/package/at/at.mk index 73d58a216..b3b2f353d 100644 --- a/package/at/at.mk +++ b/package/at/at.mk @@ -56,7 +56,7 @@ endif echo 'rm -rf $(TARGET_DIR)/usr/doc/at' >> $(PROJECT_BUILD_DIR)/.fakeroot.at $(INSTALL) -m 0755 -D $(AT_DIR)/debian/rc $(TARGET_DIR)/$(AT_TARGET_SCRIPT) -at: uclibc host-fakeroot $(TARGET_DIR)/$(AT_TARGET_SCRIPT) +at: host-fakeroot $(TARGET_DIR)/$(AT_TARGET_SCRIPT) at-clean: -$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(AT_DIR) uninstall diff --git a/package/autoconf/autoconf.mk b/package/autoconf/autoconf.mk index 5e29909c1..4f5d95a63 100644 --- a/package/autoconf/autoconf.mk +++ b/package/autoconf/autoconf.mk @@ -13,7 +13,7 @@ endif AUTOCONF_CONF_ENV = EMACS="no" -AUTOCONF_DEPENDENCIES = uclibc microperl +AUTOCONF_DEPENDENCIES = microperl $(eval $(call AUTOTARGETS,package,autoconf)) diff --git a/package/automake/automake.mk b/package/automake/automake.mk index 6b87caa92..127ec8bb9 100644 --- a/package/automake/automake.mk +++ b/package/automake/automake.mk @@ -11,7 +11,7 @@ ifeq ($(BR2_ENABLE_DEBUG),y) # install-exec doesn't install aclocal stuff AUTOMAKE_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install endif -AUTOMAKE_DEPENDENCIES = uclibc autoconf microperl +AUTOMAKE_DEPENDENCIES = autoconf microperl $(eval $(call AUTOTARGETS,package,automake)) diff --git a/package/axel/axel.mk b/package/axel/axel.mk index ecd512c04..2e42a18c8 100644 --- a/package/axel/axel.mk +++ b/package/axel/axel.mk @@ -36,7 +36,7 @@ ifeq ($(BR2_HAVE_MANPAGES),y) $(MAKE) DESTDIR=$(TARGET_DIR) -C $(AXEL_DIR) install-man endif -axel: uclibc $(TARGET_DIR)/$(AXEL_TARGET_BINARY) +axel: $(TARGET_DIR)/$(AXEL_TARGET_BINARY) axel-clean: $(MAKE) DESTDIR=$(TARGET_DIR) -C $(AXEL_DIR) uninstall diff --git a/package/bash/bash.mk b/package/bash/bash.mk index 6eb2848a9..57c88e880 100644 --- a/package/bash/bash.mk +++ b/package/bash/bash.mk @@ -92,9 +92,9 @@ endif # If both bash and busybox are selected, make certain bash wins # the fight over who gets to own the /bin/sh symlink. ifeq ($(BR2_PACKAGE_BUSYBOX),y) -bash: ncurses uclibc busybox $(TARGET_DIR)/$(BASH_TARGET_BINARY) +bash: ncurses busybox $(TARGET_DIR)/$(BASH_TARGET_BINARY) else -bash: ncurses uclibc $(TARGET_DIR)/$(BASH_TARGET_BINARY) +bash: ncurses $(TARGET_DIR)/$(BASH_TARGET_BINARY) endif # If both bash and busybox are selected, the /bin/sh symlink diff --git a/package/berkeleydb/berkeleydb.mk b/package/berkeleydb/berkeleydb.mk index bea3eb718..4a0887b9b 100644 --- a/package/berkeleydb/berkeleydb.mk +++ b/package/berkeleydb/berkeleydb.mk @@ -90,7 +90,7 @@ berkeleydb-clean: berkeleydb-dirclean: rm -rf $(DB_DIR) -berkeleydb: uclibc $(TARGET_DIR)/lib/$(DB_SHARLIB) +berkeleydb: $(TARGET_DIR)/lib/$(DB_SHARLIB) ############################################################# # diff --git a/package/bind/bind.mk b/package/bind/bind.mk index c6d77e513..a7fca8ff4 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -7,7 +7,6 @@ BIND_VERSION = 9.5.1-P3 BIND_SOURCE = bind-$(BIND_VERSION).tar.gz BIND_SITE = ftp://ftp.isc.org/isc/bind9/$(BIND_VERSION) BIND_LIBTOOL_PATCH = NO -BIND_DEPENDENCIES = uclibc BIND_INSTALL_STAGING = NO BIND_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install BIND_TARGET_SBINS = lwresd named named-checkconf named-checkzone diff --git a/package/bison/bison.mk b/package/bison/bison.mk index 1bac12084..c664f0a60 100644 --- a/package/bison/bison.mk +++ b/package/bison/bison.mk @@ -62,7 +62,7 @@ endif rm -rf $(TARGET_DIR)/usr/share/doc cp -a package/bison/yacc $(TARGET_DIR)/usr/bin/yacc -bison: uclibc $(TARGET_DIR)/$(BISON_TARGET_BINARY) +bison: $(TARGET_DIR)/$(BISON_TARGET_BINARY) bison-clean: -$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(BISON_DIR) uninstall diff --git a/package/blackbox/blackbox.mk b/package/blackbox/blackbox.mk index 371a4a44d..41deb5860 100644 --- a/package/blackbox/blackbox.mk +++ b/package/blackbox/blackbox.mk @@ -14,6 +14,6 @@ BLACKBOX_INSTALL_TARGET:=YES BLACKBOX_CONF_OPT:=--x-includes=$(STAGING_DIR)/usr/include/X11 \ --x-libraries=$(STAGING_DIR)/usr/lib -BLACKBOX_DEPENDENCIES:=uclibc xserver_xorg-server +BLACKBOX_DEPENDENCIES:=xserver_xorg-server $(eval $(call AUTOTARGETS,package,blackbox)) diff --git a/package/bmon/bmon.mk b/package/bmon/bmon.mk index 0b60ad420..759b08416 100644 --- a/package/bmon/bmon.mk +++ b/package/bmon/bmon.mk @@ -7,7 +7,7 @@ BMON_VERSION = 2.1.0 BMON_SOURCE = bmon-$(BMON_VERSION).tar.gz BMON_SITE = http://distfiles.gentoo.org/distfiles -BMON_DEPENDENCIES = ncurses uclibc +BMON_DEPENDENCIES = ncurses BMON_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install $(eval $(call AUTOTARGETS,package,bmon)) diff --git a/package/boa/boa.mk b/package/boa/boa.mk index d0531b1f8..0f20318d6 100644 --- a/package/boa/boa.mk +++ b/package/boa/boa.mk @@ -63,7 +63,7 @@ $(BOA_WORKDIR)/.installed: $(BOA_WORKDIR)/src/boa $(BOA_WORKDIR)/src/boa_indexer $(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/usr/sbin/boa $(TARGET_DIR)/usr/lib/boa/boa_indexer touch $(BOA_WORKDIR)/.installed -boa: uclibc $(BOA_WORKDIR)/.installed +boa: $(BOA_WORKDIR)/.installed boa-source: $(DL_DIR)/$(BOA_SOURCE) diff --git a/package/bridge-utils/bridge.mk b/package/bridge-utils/bridge.mk index f49935726..925de0649 100644 --- a/package/bridge-utils/bridge.mk +++ b/package/bridge-utils/bridge.mk @@ -12,7 +12,6 @@ BRIDGE_INSTALL_STAGING:=NO BRIDGE_INSTALL_TARGET:=YES BRIDGE_INSTALL_TARGET_OPT:=DESTDIR=$(TARGET_DIR) install BRIDGE_CONF_OPT:=--with-linux-headers=$(LINUX_HEADERS_DIR) -BRIDGE_DEPENDENCIES:=uclibc $(eval $(call AUTOTARGETS,package,bridge)) diff --git a/package/bsdiff/bsdiff.mk b/package/bsdiff/bsdiff.mk index ad72f70e1..62608e92a 100644 --- a/package/bsdiff/bsdiff.mk +++ b/package/bsdiff/bsdiff.mk @@ -33,7 +33,7 @@ $(TARGET_DIR)/$(BSDIFF_TARGET_BINARY): $(BSDIFF_DIR)/$(BSDIFF_BINARY) cp -dpf $(BSDIFF_DIR)/bsdiff $(TARGET_DIR)/usr/bin/. cp -dpf $(BSDIFF_DIR)/bspatch $(TARGET_DIR)/usr/bin/. -bsdiff: uclibc bzip2 $(TARGET_DIR)/$(BSDIFF_TARGET_BINARY) +bsdiff: bzip2 $(TARGET_DIR)/$(BSDIFF_TARGET_BINARY) bsdiff-source: $(DL_DIR)/$(BSDIFF_SOURCE) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 7be49b387..48f457485 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -124,7 +124,7 @@ endif # Just in case -chmod a+x $(TARGET_DIR)/usr/share/udhcpc/default.script -busybox: uclibc $(TARGET_DIR)/bin/busybox +busybox: $(TARGET_DIR)/bin/busybox busybox-source: $(DL_DIR)/$(BUSYBOX_SOURCE) diff --git a/package/busybox/initramfs.mk b/package/busybox/initramfs.mk index dbec0520b..c67e866cc 100644 --- a/package/busybox/initramfs.mk +++ b/package/busybox/initramfs.mk @@ -125,7 +125,7 @@ $(PROJECT_BUILD_DIR)/.initramfs_done: $(BR2_INITRAMFS_DIR)/bin/busybox \ touch $@ busybox-initramfs-source: -busybox-initramfs: uclibc $(PROJECT_BUILD_DIR)/.initramfs_done +busybox-initramfs: $(PROJECT_BUILD_DIR)/.initramfs_done busybox-initramfs-menuconfig: host-sed $(BUILD_DIR) busybox-source $(BUSYBOX_INITRAMFS_DIR)/.configured $(MAKE) __TARGET_ARCH=$(ARCH) -C $(BUSYBOX_INITRAMFS_DIR) menuconfig diff --git a/package/bzip2/bzip2.mk b/package/bzip2/bzip2.mk index 647cb34f9..98de5326d 100644 --- a/package/bzip2/bzip2.mk +++ b/package/bzip2/bzip2.mk @@ -96,7 +96,7 @@ $(TARGET_DIR)/usr/lib/libbz2.a: $(STAGING_DIR)/usr/lib/libbz2.a bzip2-headers: $(TARGET_DIR)/usr/lib/libbz2.a -bzip2: uclibc $(BZIP2_TARGET_BINARY) +bzip2: $(BZIP2_TARGET_BINARY) bzip2-clean: rm -f $(addprefix $(TARGET_DIR),/lib/libbz2.* \ diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk index a0840834f..f83c9a344 100644 --- a/package/cairo/cairo.mk +++ b/package/cairo/cairo.mk @@ -39,7 +39,7 @@ CAIRO_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \ ac_cv_func_working_mktime=yes jm_cv_func_working_re_compile_pattern=yes \ ac_use_included_regex=no gl_cv_c_restrict=no -CAIRO_DEPENDENCIES = uclibc host-pkgconfig fontconfig pixman +CAIRO_DEPENDENCIES = host-pkgconfig fontconfig pixman ifeq ($(BR2_PACKAGE_DIRECTFB),y) CAIRO_CONF_OPT += --enable-directfb diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk index 2c9c0d3b3..087948b8f 100644 --- a/package/coreutils/coreutils.mk +++ b/package/coreutils/coreutils.mk @@ -133,9 +133,9 @@ endif # If both coreutils and busybox are selected, make certain coreutils # wins the fight over who gets to have their utils actually installed. ifeq ($(BR2_PACKAGE_BUSYBOX),y) -coreutils: uclibc busybox $(TARGET_DIR)/$(COREUTILS_TARGET_BINARY) +coreutils: busybox $(TARGET_DIR)/$(COREUTILS_TARGET_BINARY) else -coreutils: uclibc $(TARGET_DIR)/$(COREUTILS_TARGET_BINARY) +coreutils: $(TARGET_DIR)/$(COREUTILS_TARGET_BINARY) endif # If both coreutils and busybox are selected, the corresponding applets diff --git a/package/cups/cups.mk b/package/cups/cups.mk index a22651fc7..c4816c491 100644 --- a/package/cups/cups.mk +++ b/package/cups/cups.mk @@ -110,7 +110,7 @@ $(CUPS_DIR)/.installed: $(CUPS_DIR)/.compiled $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/bin/cups-config touch $@ -cups: uclibc host-autoconf $(CUPS_DEPENDENCIES) $(CUPS_DIR)/.installed +cups: host-autoconf $(CUPS_DEPENDENCIES) $(CUPS_DIR)/.installed cups-source: $(DL_DIR)/$(CUPS_SOURCE) diff --git a/package/cvs/cvs.mk b/package/cvs/cvs.mk index 601aa96f6..9ad7337d3 100644 --- a/package/cvs/cvs.mk +++ b/package/cvs/cvs.mk @@ -75,7 +75,7 @@ $(TARGET_DIR)/$(CVS_TARGET_BINARY): $(CVS_DIR)/$(CVS_BINARY) install -D $(CVS_DIR)/$(CVS_BINARY) $(TARGET_DIR)/$(CVS_TARGET_BINARY) $(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/$(CVS_TARGET_BINARY) -cvs: uclibc ncurses $(TARGET_DIR)/$(CVS_TARGET_BINARY) +cvs: ncurses $(TARGET_DIR)/$(CVS_TARGET_BINARY) cvs-clean: -$(MAKE) -C $(CVS_DIR) clean diff --git a/package/dash/dash.mk b/package/dash/dash.mk index 932fe9490..4a762750b 100644 --- a/package/dash/dash.mk +++ b/package/dash/dash.mk @@ -54,7 +54,7 @@ $(TARGET_DIR)/$(DASH_TARGET_BINARY): $(DASH_DIR)/$(DASH_BINARY) cp -a $(DASH_DIR)/$(DASH_BINARY) $(TARGET_DIR)/$(DASH_TARGET_BINARY) touch -c $(TARGET_DIR)/$(DASH_TARGET_BINARY) -dash: uclibc $(TARGET_DIR)/$(DASH_TARGET_BINARY) +dash: $(TARGET_DIR)/$(DASH_TARGET_BINARY) dash-clean: $(MAKE1) CC=$(TARGET_CC) -C $(DASH_DIR) clean diff --git a/package/database/mysql_client/mysql_client.mk b/package/database/mysql_client/mysql_client.mk index 015817ef8..7f3b09186 100644 --- a/package/database/mysql_client/mysql_client.mk +++ b/package/database/mysql_client/mysql_client.mk @@ -8,7 +8,7 @@ MYSQL_CLIENT_SOURCE = mysql-$(MYSQL_CLIENT_VERSION).tar.gz MYSQL_CLIENT_SITE = http://mirrors.24-7-solutions.net/pub/mysql/Downloads/MySQL-5.1 MYSQL_CLIENT_INSTALL_TARGET = YES MYSQL_CLIENT_INSTALL_STAGING = YES -MYSQL_CLIENT_DEPENDENCIES = uclibc readline ncurses +MYSQL_CLIENT_DEPENDENCIES = readline ncurses MYSQL_CLIENT_CONF_ENV = ac_cv_sys_restartable_syscalls=yes MYSQL_CLIENT_CONF_OPT = \ diff --git a/package/database/sqlite/sqlite.mk b/package/database/sqlite/sqlite.mk index 564ea3e59..6b57185b5 100644 --- a/package/database/sqlite/sqlite.mk +++ b/package/database/sqlite/sqlite.mk @@ -10,7 +10,6 @@ SQLITE_SITE = http://www.sqlite.org SQLITE_INSTALL_STAGING = YES SQLITE_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install SQLITE_LIBTOOL_PATCH = NO -SQLITE_DEPENDENCIES = uclibc SQLITE_CONF_OPT = --enable-shared \ --enable-static \ diff --git a/package/dbus-glib/dbus-glib.mk b/package/dbus-glib/dbus-glib.mk index 2bafca629..20195877f 100644 --- a/package/dbus-glib/dbus-glib.mk +++ b/package/dbus-glib/dbus-glib.mk @@ -23,7 +23,7 @@ DBUS_GLIB_CONF_OPT = --localstatedir=/var \ --disable-doxygen-docs \ --enable-asserts=yes -DBUS_GLIB_DEPENDENCIES = uclibc host-pkgconfig dbus host-dbus host-dbus-glib libglib2 expat +DBUS_GLIB_DEPENDENCIES = host-pkgconfig dbus host-dbus host-dbus-glib libglib2 expat $(eval $(call AUTOTARGETS,package,dbus-glib)) diff --git a/package/dbus-python/dbus-python.mk b/package/dbus-python/dbus-python.mk index 5100fec5c..4fd2a4543 100644 --- a/package/dbus-python/dbus-python.mk +++ b/package/dbus-python/dbus-python.mk @@ -19,6 +19,6 @@ DBUS_PYTHON_CONF_ENV = am_cv_pathless_PYTHON=python \ DBUS_PYTHON_CONF_OPT = --disable-html-docs --disable-api-docs -DBUS_PYTHON_DEPENDENCIES = uclibc dbus-glib libpython +DBUS_PYTHON_DEPENDENCIES = dbus-glib libpython $(eval $(call AUTOTARGETS,package,dbus-python)) diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index dd11677e0..1efed4fc2 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -17,7 +17,7 @@ else DBUS_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install-strip STRIPPROG="$(STRIPCMD)" endif -DBUS_DEPENDENCIES = uclibc host-pkgconfig +DBUS_DEPENDENCIES = host-pkgconfig DBUS_CONF_ENV = ac_cv_have_abstract_sockets=yes DBUS_CONF_OPT = --program-prefix="" \ diff --git a/package/devmem2/devmem2.mk b/package/devmem2/devmem2.mk index 04fc77cb9..457a18102 100644 --- a/package/devmem2/devmem2.mk +++ b/package/devmem2/devmem2.mk @@ -23,7 +23,7 @@ $(TARGET_DIR)/sbin/$(DEVMEM2_BINARY): $(DEVMEM2_DIR)/$(DEVMEM2_BINARY) cp $^ $@ $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@ -devmem2: uclibc $(TARGET_DIR)/sbin/$(DEVMEM2_BINARY) +devmem2: $(TARGET_DIR)/sbin/$(DEVMEM2_BINARY) devmem2-source: $(DL_DIR)/$(DEVMEM2_SOURCE) diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk index a18b7b454..4ae5bc714 100644 --- a/package/dhcp/dhcp.mk +++ b/package/dhcp/dhcp.mk @@ -104,11 +104,11 @@ endif #rm -rf $(TARGET_DIR)/usr/share/locale #rm -rf $(TARGET_DIR)/usr/share/doc -dhcp_server: uclibc $(TARGET_DIR)/$(DHCP_SERVER_TARGET_BINARY) +dhcp_server: $(TARGET_DIR)/$(DHCP_SERVER_TARGET_BINARY) -dhcp_relay: uclibc $(TARGET_DIR)/$(DHCP_RELAY_TARGET_BINARY) +dhcp_relay: $(TARGET_DIR)/$(DHCP_RELAY_TARGET_BINARY) -dhcp_client: uclibc $(TARGET_DIR)/$(DHCP_CLIENT_TARGET_BINARY) +dhcp_client: $(TARGET_DIR)/$(DHCP_CLIENT_TARGET_BINARY) dhcp-clean: -$(MAKE) -C $(DHCP_DIR) clean diff --git a/package/dialog/dialog.mk b/package/dialog/dialog.mk index 005a1bb54..292cb844d 100644 --- a/package/dialog/dialog.mk +++ b/package/dialog/dialog.mk @@ -43,7 +43,7 @@ ifneq ($(BR2_HAVE_MANPAGES),y) rm -Rf $(TARGET_DIR)/usr/share/man endif -dialog: uclibc ncurses $(TARGET_DIR)/$(DIALOG_TARGET_BINARY) +dialog: ncurses $(TARGET_DIR)/$(DIALOG_TARGET_BINARY) dialog-source: $(DL_DIR)/$(DIALOG_SOURCE) diff --git a/package/diffutils/diffutils.mk b/package/diffutils/diffutils.mk index 82b42c7ff..5d122b884 100644 --- a/package/diffutils/diffutils.mk +++ b/package/diffutils/diffutils.mk @@ -106,7 +106,7 @@ ifneq ($(BR2_ENABLE_LOCALE),y) rm -rf $(TARGET_DIR)/usr/share/locale endif -diffutils: uclibc $(TARGET_DIR)/$(DIFFUTILS_TARGET_BINARY) +diffutils: $(TARGET_DIR)/$(DIFFUTILS_TARGET_BINARY) diff-utils-unpacked: $(DIFFUTILS_DIR)/.unpacked diff --git a/package/dillo/dillo.mk b/package/dillo/dillo.mk index 1dcfd5557..ac5da9796 100644 --- a/package/dillo/dillo.mk +++ b/package/dillo/dillo.mk @@ -39,7 +39,7 @@ $(DILLO_DIR)/.installed: $(DILLO_DIR)/src/dillo $(MAKE) -C $(DILLO_DIR) DESTDIR=$(TARGET_DIR) install touch $(DILLO_DIR)/.installed -dillo: uclibc xserver_xorg-server libglib12 libgtk12 jpeg libpng $(DILLO_DIR)/.installed +dillo: xserver_xorg-server libglib12 libgtk12 jpeg libpng $(DILLO_DIR)/.installed dillo-source: $(DL_DIR)/$(DILLO_SOURCE) diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk index 1c3b78adf..afbd7c08e 100644 --- a/package/directfb/directfb.mk +++ b/package/directfb/directfb.mk @@ -141,6 +141,6 @@ DIRECTFB_CONF_OPT = \ --disable-video4linux \ --disable-video4linux2 -DIRECTFB_DEPENDENCIES = uclibc $(DIRECTFB_DEP) freetype $(DIRECTFB_FUSION) +DIRECTFB_DEPENDENCIES = $(DIRECTFB_DEP) freetype $(DIRECTFB_FUSION) $(eval $(call AUTOTARGETS,package,directfb)) diff --git a/package/distcc/distcc.mk b/package/distcc/distcc.mk index 59e298f2a..5138fa24d 100644 --- a/package/distcc/distcc.mk +++ b/package/distcc/distcc.mk @@ -52,7 +52,7 @@ $(TARGET_DIR)/$(DISTCC_TARGET_BINARY): $(DISTCC_BUILDDIR)/$(DISTCC_BINARY) install -D $(DISTCC_BUILDDIR)/$(DISTCC_BINARY)d $(TARGET_DIR)/$(DISTCC_TARGET_BINARY)d install -D $(DISTCC_BUILDDIR)/$(DISTCC_BINARY) $(TARGET_DIR)/$(DISTCC_TARGET_BINARY) -distcc: uclibc $(TARGET_DIR)/$(DISTCC_TARGET_BINARY) +distcc: $(TARGET_DIR)/$(DISTCC_TARGET_BINARY) distcc-clean: rm -f $(TARGET_DIR)/$(DISTCC_TARGET_BINARY) diff --git a/package/dmalloc/dmalloc.mk b/package/dmalloc/dmalloc.mk index 164d9da26..d34d02095 100644 --- a/package/dmalloc/dmalloc.mk +++ b/package/dmalloc/dmalloc.mk @@ -82,7 +82,7 @@ $(TARGET_DIR)/$(DMALLOC_TARGET_BINARY): $(DMALLOC_DIR)/$(DMALLOC_BINARY) cp -dpf $(STAGING_DIR)/usr/bin/dmalloc $(TARGET_DIR)/$(DMALLOC_TARGET_BINARY) $(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/$(DMALLOC_TARGET_BINARY) -dmalloc: uclibc $(TARGET_DIR)/$(DMALLOC_TARGET_BINARY) +dmalloc: $(TARGET_DIR)/$(DMALLOC_TARGET_BINARY) dmalloc-clean: -rm -f $(TARGET_DIR)/usr/lib/libdmalloc* diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk index d37c65f15..a7e43dcb0 100644 --- a/package/dnsmasq/dnsmasq.mk +++ b/package/dnsmasq/dnsmasq.mk @@ -12,8 +12,6 @@ DNSMASQ_MAKE_ENV = CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" LDFLAGS="$(TARGET DNSMASQ_MAKE_OPT = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr DNSMASQ_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) PREFIX=/usr install -DNSMASQ_DEPENDENCIES = uclibc - ifneq ($(BR2_INET_IPV6),y) DNSMASQ_COPTS += -DNO_IPV6 endif diff --git a/package/docker/docker.mk b/package/docker/docker.mk index 3b8c25cfe..2dfe0f3e6 100644 --- a/package/docker/docker.mk +++ b/package/docker/docker.mk @@ -19,7 +19,7 @@ DOCKER_MAKE_OPT = CC=$(TARGET_CC) CXX=$(TARGET_CXX) LD=$(TARGET_LD) \ DOCKER_INSTALL_TARGET_OPT = PREFIX=$(TARGET_DIR)/usr install -DOCKER_DEPENDENCIES = uclibc host-pkgconfig libglib2 xserver_xorg-server +DOCKER_DEPENDENCIES = host-pkgconfig libglib2 xserver_xorg-server $(eval $(call AUTOTARGETS,package,docker)) diff --git a/package/dosfstools/dosfstools.mk b/package/dosfstools/dosfstools.mk index a88ab3ddf..e1e9fe34e 100644 --- a/package/dosfstools/dosfstools.mk +++ b/package/dosfstools/dosfstools.mk @@ -44,7 +44,7 @@ $(TARGET_DIR)/$(DOSFSLABEL_TARGET_BINARY): $(DOSFSTOOLS_DIR)/.built cp -a $(DOSFSTOOLS_DIR)/$(DOSFSLABEL_BINARY) $@ touch -c $@ -dosfstools: uclibc $(TARGET_DIR)/$(DOSFSTOOLS_TARGET_BINARY) $(TARGET_DIR)/$(DOSFSCK_TARGET_BINARY) +dosfstools: $(TARGET_DIR)/$(DOSFSTOOLS_TARGET_BINARY) $(TARGET_DIR)/$(DOSFSCK_TARGET_BINARY) dosfstools-clean: rm -f $(TARGET_DIR)/$(MKDOSFS_TARGET_BINARY) diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk index 63d3daaf1..2340f6a93 100644 --- a/package/dropbear/dropbear.mk +++ b/package/dropbear/dropbear.mk @@ -7,7 +7,7 @@ DROPBEAR_VERSION = 0.52 DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.gz DROPBEAR_SITE = http://matt.ucc.asn.au/dropbear/releases -DROPBEAR_DEPENDENCIES = uclibc zlib +DROPBEAR_DEPENDENCIES = zlib DROPBEAR_TARGET_BINS = dbclient dropbearkey dropbearconvert scp ssh DROPBEAR_MAKE = $(MAKE) MULTI=1 SCPPROGRESS=1 \ PROGRAMS="dropbear dbclient dropbearkey dropbearconvert scp" diff --git a/package/dummy/dummy.mk b/package/dummy/dummy.mk index 3eb5f0bb4..51ecb9bea 100644 --- a/package/dummy/dummy.mk +++ b/package/dummy/dummy.mk @@ -65,7 +65,7 @@ $(TARGET_DIR)/$(DUMMY_TARGET_BINARY): $(DUMMY_DIR)/$(DUMMY_BINARY) # Main rule which shows which other packages must be installed before the dummy # package is installed. This to ensure that all depending libraries are # installed. -dummy: uclibc $(TARGET_DIR)/$(DUMMY_TARGET_BINARY) +dummy: $(TARGET_DIR)/$(DUMMY_TARGET_BINARY) # Source download rule. Main purpose to download the source package. Since some # people would like to work offline, it is mandotory to implement a rule which diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk index 3931548bf..53bb5f1ca 100644 --- a/package/e2fsprogs/e2fsprogs.mk +++ b/package/e2fsprogs/e2fsprogs.mk @@ -141,8 +141,8 @@ $(TARGET_DIR)/$(LIBUUID_TARGET_DIR)/$(LIBUUID_TARGET_BINARY): $(STAGING_DIR)/lib $(TARGET_DIR)/$(LIBUUID_TARGET_DIR)/ touch -c $@ -libuuid: uclibc $(TARGET_DIR)/$(LIBUUID_TARGET_DIR)/$(LIBUUID_TARGET_BINARY) -e2fsprogs: uclibc libuuid $(TARGET_DIR)/$(E2FSPROGS_TARGET_BINARY) +libuuid: $(TARGET_DIR)/$(LIBUUID_TARGET_DIR)/$(LIBUUID_TARGET_BINARY) +e2fsprogs: libuuid $(TARGET_DIR)/$(E2FSPROGS_TARGET_BINARY) e2fsprogs-clean: $(MAKE1) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(E2FSPROGS_DIR) uninstall diff --git a/package/editors/nano/nano.mk b/package/editors/nano/nano.mk index 15cc5991c..00015b13d 100644 --- a/package/editors/nano/nano.mk +++ b/package/editors/nano/nano.mk @@ -41,7 +41,7 @@ $(NANO_DIR)/$(NANO_BINARY): $(NANO_DIR)/.configured $(TARGET_DIR)/$(NANO_TARGET_BINARY): $(NANO_DIR)/$(NANO_BINARY) install -D $(NANO_DIR)/$(NANO_BINARY) $(TARGET_DIR)/$(NANO_TARGET_BINARY) -nano: uclibc ncurses $(TARGET_DIR)/$(NANO_TARGET_BINARY) +nano: ncurses $(TARGET_DIR)/$(NANO_TARGET_BINARY) nano-clean: rm -f $(TARGET_DIR)/$(NANO_TARGET_BINARY) diff --git a/package/editors/uemacs/uemacs.mk b/package/editors/uemacs/uemacs.mk index 51a37bc92..0fd51f57a 100644 --- a/package/editors/uemacs/uemacs.mk +++ b/package/editors/uemacs/uemacs.mk @@ -29,7 +29,7 @@ $(UEMACS_DIR)/$(UEMACS_BINARY): $(UEMACS_DIR)/.unpacked $(TARGET_DIR)/$(UEMACS_TARGET_BINARY): $(UEMACS_DIR)/$(UEMACS_BINARY) $(INSTALL) -m 0755 -D $(UEMACS_DIR)/$(UEMACS_BINARY) $(TARGET_DIR)/$(UEMACS_TARGET_BINARY) -uemacs: uclibc ncurses $(TARGET_DIR)/$(UEMACS_TARGET_BINARY) +uemacs: ncurses $(TARGET_DIR)/$(UEMACS_TARGET_BINARY) uemacs-clean: rm -f $(TARGET_DIR)/$(UEMACS_TARGET_BINARY) diff --git a/package/editors/vim/vim.mk b/package/editors/vim/vim.mk index d84e7c029..9a0c80ef9 100644 --- a/package/editors/vim/vim.mk +++ b/package/editors/vim/vim.mk @@ -75,7 +75,7 @@ ifeq ($(BR2_PACKAGE_VIM_RUNTIME),y) ) endif -vim: uclibc host-pkgconfig ncurses vim-source $(TARGET_DIR)/usr/bin/vim +vim: host-pkgconfig ncurses vim-source $(TARGET_DIR)/usr/bin/vim ############################################################# # diff --git a/package/eeprog/eeprog.mk b/package/eeprog/eeprog.mk index 98b9173da..b19c7a3bd 100644 --- a/package/eeprog/eeprog.mk +++ b/package/eeprog/eeprog.mk @@ -27,7 +27,7 @@ $(EEPROG_DIR)/$(EEPROG_BINARY): $(EEPROG_DIR)/.unpacked $(TARGET_DIR)/$(EEPROG_TARGET_BINARY): $(EEPROG_DIR)/$(EEPROG_BINARY) $(INSTALL) -m 0755 -D $(EEPROG_DIR)/$(EEPROG_BINARY) $(TARGET_DIR)/$(EEPROG_TARGET_BINARY) -eeprog: uclibc $(TARGET_DIR)/$(EEPROG_TARGET_BINARY) +eeprog: $(TARGET_DIR)/$(EEPROG_TARGET_BINARY) eeprog-clean: rm -f $(TARGET_DIR)/$(EEPROG_TARGET_BINARY) diff --git a/package/ethtool/ethtool.mk b/package/ethtool/ethtool.mk index 7ebae5212..f6d58fd1e 100644 --- a/package/ethtool/ethtool.mk +++ b/package/ethtool/ethtool.mk @@ -11,6 +11,4 @@ ETHTOOL_AUTORECONF:=no ETHTOOL_INSTALL_STAGING:=NO ETHTOOL_INSTALL_TARGET:=YES -ETHTOOL_DEPENDENCIES:=uclibc - $(eval $(call AUTOTARGETS,package,ethtool)) diff --git a/package/expat/expat.mk b/package/expat/expat.mk index 6706716b7..ef17c1a81 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -16,7 +16,7 @@ EXPAT_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) installlib EXPAT_CONF_OPT = --enable-shared -EXPAT_DEPENDENCIES = uclibc host-pkgconfig +EXPAT_DEPENDENCIES = host-pkgconfig $(eval $(call AUTOTARGETS,package,expat)) diff --git a/package/ezxml/ezxml.mk b/package/ezxml/ezxml.mk index 7f9c0e698..bf2e35f58 100644 --- a/package/ezxml/ezxml.mk +++ b/package/ezxml/ezxml.mk @@ -28,7 +28,7 @@ $(STAGING_DIR)/usr/lib/libezxml.a: $(EZXML_DIR)/libezxml.a cp $(EZXML_DIR)/ezxml.h $(STAGING_DIR)/usr/include cp $(EZXML_DIR)/libezxml.a $(STAGING_DIR)/usr/lib -ezxml: uclibc $(STAGING_DIR)/usr/lib/libezxml.a +ezxml: $(STAGING_DIR)/usr/lib/libezxml.a ezxml-source: $(DL_DIR)/$(EZXML_SOURCE) diff --git a/package/fakeroot/fakeroot.mk b/package/fakeroot/fakeroot.mk index 0db6628c6..b8afeb367 100644 --- a/package/fakeroot/fakeroot.mk +++ b/package/fakeroot/fakeroot.mk @@ -48,7 +48,7 @@ $(HOST_DIR)/usr/bin/fakeroot: $(FAKEROOT_DIR1)/faked $(MAKE) -C $(FAKEROOT_DIR1) install touch -c $@ -host-fakeroot: uclibc $(HOST_DIR)/usr/bin/fakeroot +host-fakeroot: $(HOST_DIR)/usr/bin/fakeroot host-fakeroot-clean: -$(MAKE) -C $(FAKEROOT_DIR1) clean @@ -106,7 +106,7 @@ endif rm -rf $(TARGET_DIR)/usr/share/doc touch -c $@ -fakeroot: uclibc $(TARGET_DIR)/usr/bin/fakeroot +fakeroot: $(TARGET_DIR)/usr/bin/fakeroot fakeroot-clean: -$(MAKE) -C $(FAKEROOT_DIR2) clean diff --git a/package/fbset/fbset.mk b/package/fbset/fbset.mk index 008e5644f..32ab4b876 100644 --- a/package/fbset/fbset.mk +++ b/package/fbset/fbset.mk @@ -30,7 +30,7 @@ $(TARGET_DIR)/$(FBSET_TARGET_BINARY): $(FBSET_DIR)/$(FBSET_BINARY) -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(FBSET_TARGET_BINARY) touch -c $@ -fbset: uclibc $(TARGET_DIR)/$(FBSET_TARGET_BINARY) +fbset: $(TARGET_DIR)/$(FBSET_TARGET_BINARY) fbset-source: $(DL_DIR)/$(FBSET_SOURCE) diff --git a/package/fbv/fbv.mk b/package/fbv/fbv.mk index 8b4d296f8..44ce5c62b 100644 --- a/package/fbv/fbv.mk +++ b/package/fbv/fbv.mk @@ -38,7 +38,7 @@ $(FBV_DIR)/$(FBV_BINARY): $(FBV_DIR)/.configured $(TARGET_DIR)/$(FBV_TARGET_BINARY): $(FBV_DIR)/$(FBV_BINARY) install -D $(FBV_DIR)/$(FBV_BINARY) $(TARGET_DIR)/$(FBV_TARGET_BINARY) -fbv: uclibc libpng jpeg libungif $(TARGET_DIR)/$(FBV_TARGET_BINARY) +fbv: libpng jpeg libungif $(TARGET_DIR)/$(FBV_TARGET_BINARY) fbv-clean: rm -f $(TARGET_DIR)/$(FBV_TARGET_BINARY) diff --git a/package/fconfig/fconfig.mk b/package/fconfig/fconfig.mk index e4eb15036..72f6c4a8d 100644 --- a/package/fconfig/fconfig.mk +++ b/package/fconfig/fconfig.mk @@ -31,7 +31,7 @@ $(TARGET_DIR)/$(FCONFIG_TARGET_BINARY): $(FCONFIG_DIR)/$(FCONFIG_BINARY) $(INSTALL) -D -m 0755 $(FCONFIG_DIR)/$(FCONFIG_BINARY) $(TARGET_DIR)/$(FCONFIG_TARGET_BINARY) $(STRIPCMD) $(STRIP_STRIP_ALL) $@ -fconfig: uclibc $(TARGET_DIR)/$(FCONFIG_TARGET_BINARY) +fconfig: $(TARGET_DIR)/$(FCONFIG_TARGET_BINARY) fconfig-clean: -$(MAKE) -C $(FCONFIG_DIR) clean diff --git a/package/file/file.mk b/package/file/file.mk index e285f5261..fd04d20a8 100644 --- a/package/file/file.mk +++ b/package/file/file.mk @@ -103,7 +103,7 @@ endif rm -f $(TARGET_DIR)/lib/libmagic.la mv $(TARGET_DIR)/usr/include/magic.h $(STAGING_DIR)/usr/include -file: zlib uclibc $(TARGET_DIR)/$(FILE_TARGET_BINARY) +file: zlib $(TARGET_DIR)/$(FILE_TARGET_BINARY) file-clean: -$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(FILE_DIR2) uninstall diff --git a/package/findutils/findutils.mk b/package/findutils/findutils.mk index 3dd16ca19..b8c1699a9 100644 --- a/package/findutils/findutils.mk +++ b/package/findutils/findutils.mk @@ -71,7 +71,7 @@ endif rm -rf $(TARGET_DIR)/share/locale rm -rf $(TARGET_DIR)/usr/share/doc -findutils: uclibc findutils-target_binary +findutils: findutils-target_binary findutils-clean: $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(FINDUTILS_DIR) uninstall diff --git a/package/fis/fis.mk b/package/fis/fis.mk index 4a7e7164d..e532aff2b 100644 --- a/package/fis/fis.mk +++ b/package/fis/fis.mk @@ -32,7 +32,7 @@ $(TARGET_DIR)/$(FIS_TARGET_BINARY): $(FIS_DIR)/$(FIS_BINARY) $(INSTALL) -D -m 0755 $(FIS_DIR)/$(FIS_BINARY) $(TARGET_DIR)/$(FIS_TARGET_BINARY) $(STRIPCMD) $(STRIP_STRIP_ALL) $@ -fis: uclibc $(TARGET_DIR)/$(FIS_TARGET_BINARY) +fis: $(TARGET_DIR)/$(FIS_TARGET_BINARY) fis-clean: -$(MAKE) -C $(FIS_DIR) clean diff --git a/package/flex/flex.mk b/package/flex/flex.mk index 08c17d096..e5da3be88 100644 --- a/package/flex/flex.mk +++ b/package/flex/flex.mk @@ -89,7 +89,7 @@ endif rm -rf $(TARGET_DIR)/usr/share/doc (cd $(TARGET_DIR)/usr/bin; ln -snf flex lex) -flex: uclibc $(TARGET_DIR)/$(FLEX_TARGET_BINARY) +flex: $(TARGET_DIR)/$(FLEX_TARGET_BINARY) flex-clean: $(MAKE) \ diff --git a/package/fltk/fltk.mk b/package/fltk/fltk.mk index 9574cb84a..3a5233b80 100644 --- a/package/fltk/fltk.mk +++ b/package/fltk/fltk.mk @@ -18,6 +18,6 @@ FLTK_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \ --build=$(GNU_HOST_NAME) --prefix=/usr \ --sysconfdir=/etc --enable-shared --enable-threads --with-x -FLTK_DEPENDENCIES = uclibc xserver_xorg-server +FLTK_DEPENDENCIES = xserver_xorg-server $(eval $(call AUTOTARGETS,package,fltk)) \ No newline at end of file diff --git a/package/fontconfig/fontconfig.mk b/package/fontconfig/fontconfig.mk index e61d73611..8fbbedcce 100644 --- a/package/fontconfig/fontconfig.mk +++ b/package/fontconfig/fontconfig.mk @@ -21,7 +21,7 @@ FONTCONFIG_CONF_OPT = --with-arch=$(GNU_TARGET_NAME) \ --with-expat-includes=$(STAGING_DIR)/usr/include \ --disable-docs -FONTCONFIG_DEPENDENCIES = uclibc freetype expat +FONTCONFIG_DEPENDENCIES = freetype expat $(eval $(call AUTOTARGETS,package,fontconfig)) diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk index 988483fe4..082948e50 100644 --- a/package/freetype/freetype.mk +++ b/package/freetype/freetype.mk @@ -11,7 +11,7 @@ FREETYPE_INSTALL_STAGING = YES FREETYPE_INSTALL_TARGET = YES FREETYPE_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install FREETYPE_MAKE_OPT = CCexe="$(HOSTCC)" -FREETYPE_DEPENDENCIES = uclibc host-pkgconfig $(if $(BR2_PACKAGE_ZLIB),zlib) +FREETYPE_DEPENDENCIES = host-pkgconfig $(if $(BR2_PACKAGE_ZLIB),zlib) $(eval $(call AUTOTARGETS,package,freetype)) diff --git a/package/fuse/libfuse.mk b/package/fuse/libfuse.mk index 5dcb20a4a..8016fce54 100644 --- a/package/fuse/libfuse.mk +++ b/package/fuse/libfuse.mk @@ -55,7 +55,7 @@ $(TARGET_DIR)/usr/lib/libfuse.so: $(STAGING_DIR)/usr/lib/libfuse.so $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libfuse.so touch -c $@ -libfuse: uclibc $(TARGET_DIR)/usr/lib/libfuse.so +libfuse: $(TARGET_DIR)/usr/lib/libfuse.so libfuse-source: $(DL_DIR)/$(LIBFUSE_SOURCE) diff --git a/package/gadgetfs-test/gadgetfs-test.mk b/package/gadgetfs-test/gadgetfs-test.mk index 201f6fe6a..572755b25 100644 --- a/package/gadgetfs-test/gadgetfs-test.mk +++ b/package/gadgetfs-test/gadgetfs-test.mk @@ -28,9 +28,9 @@ $(TARGET_DIR)/usr/bin/gadgetfs-test: $(GADGETFS_TEST_DIR)/gadgetfs-test $(MAKE) -C $(GADGETFS_TEST_DIR) DESTDIR=$(TARGET_DIR) prefix=/usr install ifeq ($(BR2_PACKAGE_GADGETFS_TEST_USE_AIO),y) -gadgetfs-test: uclibc libaio $(TARGET_DIR)/usr/bin/gadgetfs-test +gadgetfs-test: libaio $(TARGET_DIR)/usr/bin/gadgetfs-test else -gadgetfs-test: uclibc $(TARGET_DIR)/usr/bin/gadgetfs-test +gadgetfs-test: $(TARGET_DIR)/usr/bin/gadgetfs-test endif gadgetfs-test-source: $(DL_DIR)/$(GADGETFS_TEST_SOURCE) diff --git a/package/games/ace_of_penguins/ace_of_penguins.mk b/package/games/ace_of_penguins/ace_of_penguins.mk index 2e4fda6e9..65a2667af 100644 --- a/package/games/ace_of_penguins/ace_of_penguins.mk +++ b/package/games/ace_of_penguins/ace_of_penguins.mk @@ -10,6 +10,6 @@ ACE_OF_PENGUINS_AUTORECONF = YES ACE_OF_PENGUINS_STAGING = NO ACE_OF_PENGUINS_TARGET = YES -ACE_OF_PENGUINS_DEPENDENCIES = uclibc libpng xserver_xorg-server +ACE_OF_PENGUINS_DEPENDENCIES = libpng xserver_xorg-server $(eval $(call AUTOTARGETS,package/games,ace_of_penguins)) diff --git a/package/games/gnuchess/gnuchess.mk b/package/games/gnuchess/gnuchess.mk index b1ff3b73a..921d0fdc8 100644 --- a/package/games/gnuchess/gnuchess.mk +++ b/package/games/gnuchess/gnuchess.mk @@ -11,7 +11,5 @@ GNUCHESS_INSTALL_TARGET = YES GNUCHESS_CONF_ENV = ac_cv_func_realloc_0_nonnull=yes ac_cv_func_malloc_0_nonnull=yes -GNUCHESS_DEPENDENCIES = uclibc - $(eval $(call AUTOTARGETS,package/games,gnuchess)) diff --git a/package/games/magiccube4d/magiccube4d.mk b/package/games/magiccube4d/magiccube4d.mk index fa36be289..a92ffd265 100644 --- a/package/games/magiccube4d/magiccube4d.mk +++ b/package/games/magiccube4d/magiccube4d.mk @@ -10,7 +10,5 @@ MAGICCUBE4D_INSTALL_STAGING = NO MAGICCUBE4D_INSTALL_TARGET = YES MAGICCUBE4D_INSTALL_TARGET_OPT = GAMESDIR=$(TARGET_DIR)/usr/games install -MAGICCUBE4D_DEPENDENCIES = uclibc - $(eval $(call AUTOTARGETS,package/games,magiccube4d)) diff --git a/package/games/rubix/rubix.mk b/package/games/rubix/rubix.mk index 586f9cf60..d81780a0a 100644 --- a/package/games/rubix/rubix.mk +++ b/package/games/rubix/rubix.mk @@ -12,7 +12,5 @@ RUBIX_INSTALL_TARGET_OPT = GAMESDIR=$(TARGET_DIR)/usr/games install RUBIX_MAKE_OPT = CC=$(TARGET_CC) XINC="-I$(STAGING_DIR)/usr/include/X11" XLIB="-L$(STAGING_DIR)/usr/lib -lX11" -RUBIX_DEPENDENCIES = uclibc - $(eval $(call AUTOTARGETS,package/games,rubix)) diff --git a/package/games/vice/vice.mk b/package/games/vice/vice.mk index e59c6bfa1..b04b8920d 100644 --- a/package/games/vice/vice.mk +++ b/package/games/vice/vice.mk @@ -11,7 +11,5 @@ VICE_INSTALL_TARGET = YES VICE_CONF_OPT = --without-resid --with-alsa CFLAGS="-O0" -VICE_DEPENDENCIES = uclibc - $(eval $(call AUTOTARGETS,package/games,vice)) diff --git a/package/games/xboard/xboard.mk b/package/games/xboard/xboard.mk index b14aaf5ca..be51e99e3 100644 --- a/package/games/xboard/xboard.mk +++ b/package/games/xboard/xboard.mk @@ -10,9 +10,7 @@ XBOARD_INSTALL_STAGING = NO XBOARD_INSTALL_TARGET = YES XBOARD_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install -XBOARD_CONF_OPT --prefix=/usr - -XBOARD_DEPENDENCIES = uclibc gnuchess +XBOARD_DEPENDENCIES = gnuchess $(eval $(call AUTOTARGETS,package/games,xboard)) diff --git a/package/gamin/gamin.mk b/package/gamin/gamin.mk index ffd9be80d..90b215a91 100644 --- a/package/gamin/gamin.mk +++ b/package/gamin/gamin.mk @@ -24,7 +24,7 @@ ifneq ($(BR2_LARGEFILE),y) GAMIN_CONF_ENV += CC="$(TARGET_CC) $(TARGET_CFLAGS) -DNO_LARGEFILE_SOURCE" endif -GAMIN_DEPENDENCIES = uclibc libglib2 +GAMIN_DEPENDENCIES = libglib2 $(eval $(call AUTOTARGETS,package,gamin)) diff --git a/package/gawk/gawk.mk b/package/gawk/gawk.mk index 1f8e67804..f042a810d 100644 --- a/package/gawk/gawk.mk +++ b/package/gawk/gawk.mk @@ -65,7 +65,7 @@ endif rm -rf $(TARGET_DIR)/share/locale rm -rf $(TARGET_DIR)/usr/share/doc -gawk: uclibc $(TARGET_DIR)/$(GAWK_TARGET_BINARY) +gawk: $(TARGET_DIR)/$(GAWK_TARGET_BINARY) gawk-clean: $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(GAWK_DIR) uninstall diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk index c6e017849..ff10a09dd 100644 --- a/package/gettext/gettext.mk +++ b/package/gettext/gettext.mk @@ -120,7 +120,7 @@ $(STAGING_DIR)/$(GETTEXT_TARGET_BINARY): $(GETTEXT_DIR)/$(GETTEXT_BINARY) autopoint envsubst gettext.sh gettextize msg* ?gettext) touch -c $@ -gettext: uclibc host-pkgconfig $(if $(BR2_PACKAGE_LIBICONV),libiconv) $(STAGING_DIR)/$(GETTEXT_TARGET_BINARY) +gettext: host-pkgconfig $(if $(BR2_PACKAGE_LIBICONV),libiconv) $(STAGING_DIR)/$(GETTEXT_TARGET_BINARY) gettext-unpacked: $(GETTEXT_DIR)/.unpacked diff --git a/package/gmp/gmp.mk b/package/gmp/gmp.mk index 8e2852275..dafd5dbea 100644 --- a/package/gmp/gmp.mk +++ b/package/gmp/gmp.mk @@ -61,8 +61,8 @@ ifeq ($(BR2_PACKAGE_LIBGMP_HEADERS),y) cp -dpf $(STAGING_DIR)/usr/include/gmp.h $(TARGET_DIR)/usr/include/ endif -libgmp: uclibc $(TARGET_DIR)/usr/lib/libgmp$(LIBTGTEXT) -stage-libgmp: uclibc $(STAGING_DIR)/usr/lib/$(GMP_BINARY) +libgmp: $(TARGET_DIR)/usr/lib/libgmp$(LIBTGTEXT) +stage-libgmp: $(STAGING_DIR)/usr/lib/$(GMP_BINARY) libgmp-clean: rm -f $(TARGET_DIR)/usr/lib/libgmp.* $(TARGET_DIR)/usr/include/gmp.h \ diff --git a/package/gperf/gperf.mk b/package/gperf/gperf.mk index efa6bad2d..0dc6d6e93 100644 --- a/package/gperf/gperf.mk +++ b/package/gperf/gperf.mk @@ -12,12 +12,6 @@ GPERF_INSTALL_TARGET = YES GPERF_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install GPERF_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install -GPERF_CONF_ENV = - -GPERF_CONF_OPT = - -GPERF_DEPENDENCIES = uclibc - $(eval $(call AUTOTARGETS,package,gperf)) $(GPERF_HOOK_POST_INSTALL): $(GPERF_TARGET_INSTALL_TARGET) diff --git a/package/gqview/gqview.mk b/package/gqview/gqview.mk index 8d769209c..d5ac86196 100644 --- a/package/gqview/gqview.mk +++ b/package/gqview/gqview.mk @@ -10,7 +10,7 @@ GQVIEW_AUTORECONF = NO GQVIEW_INSTALL_STAGING = NO GQVIEW_INSTALL_TARGET = YES -GQVIEW_DEPENDENCIES = uclibc host-pkgconfig libgtk2 +GQVIEW_DEPENDENCIES = host-pkgconfig libgtk2 $(eval $(call AUTOTARGETS,package,gqview)) diff --git a/package/gzip/gzip.mk b/package/gzip/gzip.mk index 84031613f..0a8d241fd 100644 --- a/package/gzip/gzip.mk +++ b/package/gzip/gzip.mk @@ -48,7 +48,7 @@ ifneq ($(BR2_HAVE_MANPAGES),y) rm -rf $(TARGET_DIR)/usr/share/man endif -gzip: uclibc $(GZIP_TARGET_BINARY) +gzip: $(GZIP_TARGET_BINARY) gzip-clean: $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(GZIP_DIR) uninstall diff --git a/package/hal/hal.mk b/package/hal/hal.mk index 5042509e1..a23f32c38 100644 --- a/package/hal/hal.mk +++ b/package/hal/hal.mk @@ -87,7 +87,7 @@ $(TARGET_DIR)/$(HAL_TARGET_BINARY): $(HAL_DIR)/hald/hald done -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libhal* -hal: uclibc host-pkgconfig dbus-glib hwdata udev-volume_id $(TARGET_DIR)/$(HAL_TARGET_BINARY) +hal: host-pkgconfig dbus-glib hwdata udev-volume_id $(TARGET_DIR)/$(HAL_TARGET_BINARY) hal-clean: rm -f $(TARGET_DIR)/etc/dbus-1/system.d/hal.conf diff --git a/package/haserl/haserl.mk b/package/haserl/haserl.mk index 33d961513..d4c162e31 100644 --- a/package/haserl/haserl.mk +++ b/package/haserl/haserl.mk @@ -20,8 +20,6 @@ HASERL_CONF_ENV = ac_cv_path_install=./install-sh # the above doesn't interact nicely with a shared cache, so disable for now HASERL_USE_CONFIG_CACHE = NO -HASERL_DEPENDENCIES:=uclibc - $(eval $(call AUTOTARGETS,package,haserl)) # haserl 0.8.0 installs unneeded examples to /usr/share/haserl - remove them diff --git a/package/hdparm/hdparm.mk b/package/hdparm/hdparm.mk index 59d964f12..c1b83c0bf 100644 --- a/package/hdparm/hdparm.mk +++ b/package/hdparm/hdparm.mk @@ -34,7 +34,7 @@ ifeq ($(BR2_HAVE_MANPAGES),y) endif $(STRIPCMD) $(STRIP_STRIP_ALL) $@ -hdparm: uclibc $(TARGET_DIR)/$(HDPARM_TARGET_BINARY) +hdparm: $(TARGET_DIR)/$(HDPARM_TARGET_BINARY) hdparm-clean: -$(MAKE) -C $(HDPARM_DIR) clean diff --git a/package/hotplug/hotplug.mk b/package/hotplug/hotplug.mk index 43a621885..0b354a85c 100644 --- a/package/hotplug/hotplug.mk +++ b/package/hotplug/hotplug.mk @@ -24,7 +24,7 @@ $(TARGET_DIR)/sbin/hotplug: $(HOTPLUG_DIR)/hotplug cp $(HOTPLUG_DIR)/hotplug $(TARGET_DIR)/sbin/hotplug touch -c $(TARGET_DIR)/sbin/hotplug -hotplug: uclibc $(TARGET_DIR)/sbin/hotplug +hotplug: $(TARGET_DIR)/sbin/hotplug hotplug-source: $(HOTPLUG_SOURCE) diff --git a/package/hwdata/hwdata.mk b/package/hwdata/hwdata.mk index 72c5d2640..ed81cd744 100644 --- a/package/hwdata/hwdata.mk +++ b/package/hwdata/hwdata.mk @@ -31,7 +31,7 @@ $(TARGET_DIR)/$(HWDATA_TARGET_BINARY): $(HWDATA_DIR)/.unpacked cp -a $(HWDATA_DIR)/usb.ids $(TARGET_DIR)/usr/share/hwdata -touch -c $(TARGET_DIR)/usr/share/hwdata/* -hwdata: uclibc $(TARGET_DIR)/$(HWDATA_TARGET_BINARY) +hwdata: $(TARGET_DIR)/$(HWDATA_TARGET_BINARY) hwdata-clean: rm -rf $(TARGET_DIR)/usr/share/hwdata diff --git a/package/i2c-tools/i2c-tools.mk b/package/i2c-tools/i2c-tools.mk index bd96d9d80..5d28e1dfb 100644 --- a/package/i2c-tools/i2c-tools.mk +++ b/package/i2c-tools/i2c-tools.mk @@ -29,7 +29,7 @@ $(TARGET_DIR)/$(I2C_TOOLS_TARGET_BINARY): $(I2C_TOOLS_DIR)/$(I2C_TOOLS_BINARY) $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(@D)/$$i; \ done -i2c-tools: uclibc $(TARGET_DIR)/$(I2C_TOOLS_TARGET_BINARY) +i2c-tools: $(TARGET_DIR)/$(I2C_TOOLS_TARGET_BINARY) i2c-tools-source: $(DL_DIR)/$(I2C_TOOLS_SOURCE) diff --git a/package/icu/icu.mk b/package/icu/icu.mk index 525663aee..bb41f76cb 100644 --- a/package/icu/icu.mk +++ b/package/icu/icu.mk @@ -57,7 +57,7 @@ $(ICU_DIR)/.done: $(ICU_HOST_DIR)/.done $(SED) "s,^default_prefix=.*,default_prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/icu-config touch $(ICU_DIR)/.done -icu: uclibc $(ICU_DIR)/.done +icu: $(ICU_DIR)/.done icu-clean: rm -f $(TARGET_DIR)/bin/icu diff --git a/package/ifplugd/ifplugd.mk b/package/ifplugd/ifplugd.mk index 3d0b844cc..945d366d9 100644 --- a/package/ifplugd/ifplugd.mk +++ b/package/ifplugd/ifplugd.mk @@ -14,7 +14,7 @@ IFPLUGD_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install-exec IFPLUGD_CONF_OPT = --disable-lynx -IFPLUGD_DEPENDENCIES = uclibc libdaemon +IFPLUGD_DEPENDENCIES = libdaemon $(eval $(call AUTOTARGETS,package,ifplugd)) diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index 3c142a861..1aca8231f 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -127,7 +127,7 @@ $(TARGET_DIR)/usr/bin/convert: $(IMAGEMAGICK_LIB) -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/convert touch $@ -imagemagick: uclibc jpeg tiff $(IMAGEMAGICK_LIB) \ +imagemagick: jpeg tiff $(IMAGEMAGICK_LIB) \ $(IMAGEMAGICK_DIR)/.libinstall \ $(IMAGEMAGICK_TARGET_BINARIES) diff --git a/package/input-tools/input-tools.mk b/package/input-tools/input-tools.mk index 020e1c9ed..9f5eb19be 100644 --- a/package/input-tools/input-tools.mk +++ b/package/input-tools/input-tools.mk @@ -45,7 +45,7 @@ $(INPUT_TOOLS_TARGETS): $(TARGET_DIR)/usr/bin/%: $(INPUT_TOOLS_DIR)/utils/% cp -dpf $^ $@ $(STRIPCMD) $(STRIP_STRIP_ALL) $@ -input-tools: uclibc $(INPUT_TOOLS_TARGETS) +input-tools: $(INPUT_TOOLS_TARGETS) input-tools-source: $(DL_DIR)/$(INPUT_TOOLS_SOURCE) $(DL_DIR)/$(INPUT_TOOLS_PATCH) diff --git a/package/iostat/iostat.mk b/package/iostat/iostat.mk index d692d7f41..04e58d01b 100644 --- a/package/iostat/iostat.mk +++ b/package/iostat/iostat.mk @@ -27,7 +27,7 @@ $(IOSTAT_DIR)/$(IOSTAT_BINARY): $(IOSTAT_DIR)/.unpacked $(TARGET_DIR)/$(IOSTAT_TARGET_BINARY): $(IOSTAT_DIR)/$(IOSTAT_BINARY) $(INSTALL) -m 0755 -D $(IOSTAT_DIR)/$(IOSTAT_BINARY) $(TARGET_DIR)/$(IOSTAT_TARGET_BINARY) -iostat: uclibc $(TARGET_DIR)/$(IOSTAT_TARGET_BINARY) +iostat: $(TARGET_DIR)/$(IOSTAT_TARGET_BINARY) iostat-clean: rm -f $(TARGET_DIR)/$(IOSTAT_TARGET_BINARY) diff --git a/package/iperf/iperf.mk b/package/iperf/iperf.mk index 8defff2d7..27c8e5338 100644 --- a/package/iperf/iperf.mk +++ b/package/iperf/iperf.mk @@ -13,6 +13,4 @@ IPERF_INSTALL_TARGET:=YES IPERF_CONF_ENV:=ac_cv_func_malloc_0_nonnull=yes IPERF_CONF_OPT:=--disable-dependency-tracking --disable-web100 $(DISABLE_IPV6) -IPERF_DEPENDENCIES:=uclibc - $(eval $(call AUTOTARGETS,package,iperf)) diff --git a/package/ipkg/ipkg.mk b/package/ipkg/ipkg.mk index 2eb79bf8d..1e586ce84 100644 --- a/package/ipkg/ipkg.mk +++ b/package/ipkg/ipkg.mk @@ -14,6 +14,4 @@ IPKG_INSTALL_TARGET = YES IPKG_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \ --build=$(GNU_HOST_NAME) --prefix=/usr --sysconfdir=/etc -IPKG_DEPENDENCIES = uclibc - $(eval $(call AUTOTARGETS,package,ipkg)) \ No newline at end of file diff --git a/package/ipsec-tools/ipsec-tools.mk b/package/ipsec-tools/ipsec-tools.mk index 8190378b5..e01acc1be 100644 --- a/package/ipsec-tools/ipsec-tools.mk +++ b/package/ipsec-tools/ipsec-tools.mk @@ -145,7 +145,7 @@ ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_ADMINPORT), y) IPSEC_TOOLS_PROGS+= $(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_RACOONCTL) endif -ipsec-tools: uclibc openssl flex $(IPSEC_TOOLS_PROGS) +ipsec-tools: openssl flex $(IPSEC_TOOLS_PROGS) ipsec-tools-source: $(DL_DIR)/$(IPSEC_TOOLS_SOURCE) diff --git a/package/java/classpath/classpath.mk b/package/java/classpath/classpath.mk index 9e1905f00..49728f4c9 100644 --- a/package/java/classpath/classpath.mk +++ b/package/java/classpath/classpath.mk @@ -54,7 +54,7 @@ CLASSPATH_CONF_OPT = \ --disable-gconf-peer --disable-examples --disable-plugin \ --disable-Werror -CLASSPATH_DEPENDENCIES = uclibc host-pkgconfig libpng jpeg +CLASSPATH_DEPENDENCIES = host-pkgconfig libpng jpeg ifeq ($(BR2_PACKAGE_ALSA_LIB),y) CLASSPATH_DEPENDENCIES+= alsa-lib diff --git a/package/java/jamvm/jamvm.mk b/package/java/jamvm/jamvm.mk index 00c413cab..bd66e42b2 100644 --- a/package/java/jamvm/jamvm.mk +++ b/package/java/jamvm/jamvm.mk @@ -49,7 +49,7 @@ JAMVM_CONF_OPT = \ --disable-debug --with-classpath-install-dir=/usr -JAMVM_DEPENDENCIES = uclibc host-pkgconfig classpath +JAMVM_DEPENDENCIES = host-pkgconfig classpath #Include X libraries when we have an X server ifeq ($(BR2_PACKAGE_XORG7),y) diff --git a/package/jpeg/jpeg.mk b/package/jpeg/jpeg.mk index bb1c55b28..f2e696d54 100644 --- a/package/jpeg/jpeg.mk +++ b/package/jpeg/jpeg.mk @@ -79,7 +79,7 @@ $(TARGET_DIR)/usr/lib/libjpeg.so: $(STAGING_DIR)/usr/lib/libjpeg.a -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libjpeg.so* touch -c $@ -jpeg: uclibc $(TARGET_DIR)/usr/lib/libjpeg.so +jpeg: $(TARGET_DIR)/usr/lib/libjpeg.so jpeg-clean: -$(MAKE) -C $(JPEG_DIR) clean diff --git a/package/kexec/kexec.mk b/package/kexec/kexec.mk index 1770df853..a0fb2fd1f 100644 --- a/package/kexec/kexec.mk +++ b/package/kexec/kexec.mk @@ -9,11 +9,9 @@ KEXEC_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/horms/kexec-tools/ # no install-strip/install-exec KEXEC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install -KEXEC_DEPENDENCIES = uclibc - ifeq ($(BR2_PACKAGE_KEXEC_ZLIB),y) KEXEC_CONF_OPT += --with-zlib -KEXEC_DEPENDENCIES += zlib +KEXEC_DEPENDENCIES = zlib else KEXEC_CONF_OPT += --without-zlib endif diff --git a/package/kismet/kismet.mk b/package/kismet/kismet.mk index 2e0ac10dd..7b9c0dd28 100644 --- a/package/kismet/kismet.mk +++ b/package/kismet/kismet.mk @@ -60,7 +60,7 @@ $(TARGET_DIR)/$(KISMET_TARGET_DIRECTORY)/$(KISMET_BINARY): $(KISMET_DIR)/$(KISME install -m 755 $(KISMET_DIR)/kismet_server $(TARGET_DIR)/$(KISMET_TARGET_DIRECTORY)/kismet_server install -m 755 $(KISMET_DIR)/conf/kismet.conf $(TARGET_DIR)/etc/kismet.conf -kismet: uclibc ncurses libpcap dbus $(TARGET_DIR)/$(KISMET_TARGET_DIRECTORY)/$(KISMET_BINARY) +kismet: ncurses libpcap dbus $(TARGET_DIR)/$(KISMET_TARGET_DIRECTORY)/$(KISMET_BINARY) kismet-unpacked: $(KISMET_DIR)/.patched diff --git a/package/l2tp/l2tp.mk b/package/l2tp/l2tp.mk index b4c1f3855..e8b4c79bd 100644 --- a/package/l2tp/l2tp.mk +++ b/package/l2tp/l2tp.mk @@ -42,7 +42,7 @@ $(TARGET_DIR)/$(L2TP_TARGET_BINARY): $(L2TP_DIR)/$(L2TP_BINARY) cp -dpf package/l2tp/l2tpd $(TARGET_DIR)/etc/init.d/ $(STRIPCMD) $@ -l2tp: uclibc $(TARGET_DIR)/$(L2TP_TARGET_BINARY) +l2tp: $(TARGET_DIR)/$(L2TP_TARGET_BINARY) l2tp-clean: -$(MAKE) -C $(L2TP_DIR) clean diff --git a/package/leafpad/leafpad.mk b/package/leafpad/leafpad.mk index 44bea7ca6..99644095c 100644 --- a/package/leafpad/leafpad.mk +++ b/package/leafpad/leafpad.mk @@ -10,7 +10,7 @@ LEAFPAD_AUTORECONF = NO LEAFPAD_INSTALL_STAGING = NO LEAFPAD_INSTALL_TARGET = YES -LEAFPAD_DEPENDENCIES = uclibc libgtk2 +LEAFPAD_DEPENDENCIES = libgtk2 $(eval $(call AUTOTARGETS,package,leafpad)) diff --git a/package/less/less.mk b/package/less/less.mk index 9b9b9c1a6..581e3cee4 100644 --- a/package/less/less.mk +++ b/package/less/less.mk @@ -39,7 +39,7 @@ ifneq ($(BR2_HAVE_MANPAGES),y) rm -Rf $(TARGET_DIR)/usr/man endif -less: uclibc ncurses $(TARGET_DIR)/$(LESS_TARGET_BINARY) +less: ncurses $(TARGET_DIR)/$(LESS_TARGET_BINARY) less-source: $(DL_DIR)/$(LESS_SOURCE) diff --git a/package/libaio/libaio.mk b/package/libaio/libaio.mk index 52cd475f2..f1bb6032f 100644 --- a/package/libaio/libaio.mk +++ b/package/libaio/libaio.mk @@ -30,7 +30,7 @@ $(TARGET_DIR)/usr/lib/libaio.so: $(STAGING_DIR)/usr/lib/libaio.so cp -dpf $(STAGING_DIR)/usr/lib/libaio.so* $(TARGET_DIR)/usr/lib/ -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libaio.so -libaio: uclibc $(TARGET_DIR)/usr/lib/libaio.so +libaio: $(TARGET_DIR)/usr/lib/libaio.so libaio-source: $(DL_DIR)/$(LIBAIO_SOURCE) diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk index 72590fd02..472e34bd4 100644 --- a/package/libarchive/libarchive.mk +++ b/package/libarchive/libarchive.mk @@ -10,6 +10,4 @@ LIBARCHIVE_LIBTOOL_PATCH = NO LIBARCHIVE_INSTALL_STAGING = YES LIBARCHIVE_INSTALL_TARGET = YES -LIBARCHIVE_DEPENDENCIES = uclibc - $(eval $(call AUTOTARGETS,package,libarchive)) diff --git a/package/libart/libart.mk b/package/libart/libart.mk index 18577684e..690324cc8 100644 --- a/package/libart/libart.mk +++ b/package/libart/libart.mk @@ -15,6 +15,4 @@ LIBART_CONF_OPT = --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) --build=$(GNU_HOST_NAME) \ --prefix=/usr --sysconfdir=/etc -LIBART_DEPENDENCIES = uclibc - $(eval $(call AUTOTARGETS,package,libart)) diff --git a/package/libcgi/libcgi.mk b/package/libcgi/libcgi.mk index 32f9c3928..2f1c0bb0b 100644 --- a/package/libcgi/libcgi.mk +++ b/package/libcgi/libcgi.mk @@ -52,7 +52,7 @@ $(STAGING_DIR)/$(LIBCGI_TARGET_LIBRARY): $(LIBCGI_DIR)/$(LIBCGI_LIBRARY) $(TARGET_DIR)/$(LIBCGI_TARGET_LIBRARY): $(STAGING_DIR)/$(LIBCGI_TARGET_LIBRARY) cp -dpf $<* $(TARGET_DIR)/$(LIBCGI_DESTDIR) -libcgi: uclibc $(TARGET_DIR)/$(LIBCGI_TARGET_LIBRARY) +libcgi: $(TARGET_DIR)/$(LIBCGI_TARGET_LIBRARY) libcgi-source: $(DL_DIR)/$(LIBCGI_SOURCE) diff --git a/package/libcgicc/libcgicc.mk b/package/libcgicc/libcgicc.mk index 83898e93e..3c7604564 100644 --- a/package/libcgicc/libcgicc.mk +++ b/package/libcgicc/libcgicc.mk @@ -47,7 +47,7 @@ $(STAGING_DIR)/usr/lib/libcgicc.so: $(LIBCGICC_DIR)/.compiled $(TARGET_DIR)/usr/lib/libcgicc.so: $(STAGING_DIR)/usr/lib/libcgicc.so cp -dpf $(STAGING_DIR)/usr/lib/libcgicc.so* $(TARGET_DIR)/usr/lib/ -libcgicc: uclibc $(TARGET_DIR)/usr/lib/libcgicc.so +libcgicc: $(TARGET_DIR)/usr/lib/libcgicc.so libcgicc-unpacked: $(LIBCGICC_DIR)/.unpacked diff --git a/package/libconfig/libconfig.mk b/package/libconfig/libconfig.mk index eb427ef03..d260930ce 100644 --- a/package/libconfig/libconfig.mk +++ b/package/libconfig/libconfig.mk @@ -14,6 +14,4 @@ ifneq ($(BR2_INSTALL_LIBSTDCPP),y) LIBCONFIG_CONF_OPT:=--disable-cxx endif -LIBCONFIG_DEPENDENCIES = uclibc - $(eval $(call AUTOTARGETS,package,libconfig)) diff --git a/package/libconfuse/libconfuse.mk b/package/libconfuse/libconfuse.mk index 178f6d73f..2665c7a0a 100644 --- a/package/libconfuse/libconfuse.mk +++ b/package/libconfuse/libconfuse.mk @@ -12,6 +12,4 @@ LIBCONFUSE_INSTALL_TARGET:=YES LIBCONFUSE_CONF_OPT:=--enable-shared --disable-rpath -LIBCONFUSE_DEPENDENCIES = uclibc - $(eval $(call AUTOTARGETS,package,libconfuse)) diff --git a/package/libdaemon/libdaemon.mk b/package/libdaemon/libdaemon.mk index b38861a82..c73dd8d2a 100644 --- a/package/libdaemon/libdaemon.mk +++ b/package/libdaemon/libdaemon.mk @@ -13,6 +13,6 @@ LIBDAEMON_INSTALL_TARGET:=YES LIBDAEMON_CONF_ENV:=ac_cv_func_setpgrp_void=no LIBDAEMON_CONF_OPT:=--disable-lynx -LIBDAEMON_DEPENDENCIES:=uclibc host-pkgconfig +LIBDAEMON_DEPENDENCIES:=host-pkgconfig $(eval $(call AUTOTARGETS,package,libdaemon)) diff --git a/package/libdnet/libdnet.mk b/package/libdnet/libdnet.mk index 222996c7c..28304befb 100644 --- a/package/libdnet/libdnet.mk +++ b/package/libdnet/libdnet.mk @@ -16,10 +16,8 @@ LIBDNET_CONF_OPT = \ --enable-static \ --with-check=no -LIBDNET_DEPENDENCIES = uclibc - ifneq ($(BR2_PACKAGE_LIBDNET_PYTHON),) -LIBDNET_DEPENDENCIES += python +LIBDNET_DEPENDENCIES = python LIBDNET_CONF_OPT += --with-python LIBDNET_MAKE_OPT = PYTHON=python$(PYTHON_VERSION_MAJOR) PYINCDIR=$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) LIBDNET_INSTALL_TARGET_OPT = $(LIBDNET_MAKE_OPT) DESTDIR=$(TARGET_DIR) INSTALL_STRIP_FLAG=-s install-exec diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk index d3636e643..c29e5b320 100644 --- a/package/libdrm/libdrm.mk +++ b/package/libdrm/libdrm.mk @@ -61,7 +61,7 @@ $(TARGET_DIR)/usr/lib/libdrm.so: $(STAGING_DIR)/usr/lib/libdrm.so cp -dpf $(STAGING_DIR)/usr/lib/libdrm.so* $(TARGET_DIR)/usr/lib/ -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libdrm.so -libdrm: uclibc host-pkgconfig $(TARGET_DIR)/usr/lib/libdrm.so +libdrm: host-pkgconfig $(TARGET_DIR)/usr/lib/libdrm.so libdrm-clean: -$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(LIBDRM_DIR) uninstall diff --git a/package/libeXosip2/libeXosip2.mk b/package/libeXosip2/libeXosip2.mk index 62c6a939c..065a6484c 100644 --- a/package/libeXosip2/libeXosip2.mk +++ b/package/libeXosip2/libeXosip2.mk @@ -67,7 +67,7 @@ $(TARGET_DIR)/usr/bin/sip_reg: $(STAGING_DIR)/usr/bin/sip_reg -libeXosip2: uclibc libosip2 $(TARGET_DIR)/usr/lib/libeXosip2.so +libeXosip2: libosip2 $(TARGET_DIR)/usr/lib/libeXosip2.so libeXosip2-source: $(DL_DIR)/$(LIBEXOSIP2_SOURCE) diff --git a/package/libelf/libelf.mk b/package/libelf/libelf.mk index 21fe03671..f678f11a3 100644 --- a/package/libelf/libelf.mk +++ b/package/libelf/libelf.mk @@ -63,9 +63,9 @@ $(TARGET_DIR)/usr/lib/libelf.so.$(LIBELF_VERSION): $(STAGING_DIR)/usr/lib/libelf cp -dpR $(STAGING_DIR)/usr/include/{gelf.h,libelf*} $(TARGET_DIR)/usr/include/ $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@ -libelf: uclibc $(TARGET_DIR)/usr/lib/libelf.so.$(LIBELF_VERSION) +libelf: $(TARGET_DIR)/usr/lib/libelf.so.$(LIBELF_VERSION) else -libelf: uclibc $(STAGING_DIR)/usr/lib/libelf.so.$(LIBELF_VERSION) +libelf: $(STAGING_DIR)/usr/lib/libelf.so.$(LIBELF_VERSION) endif libelf-source: $(DL_DIR)/$(LIBELF_SOURCE) diff --git a/package/liberation/liberation.mk b/package/liberation/liberation.mk index 6ece6af54..ad6567052 100644 --- a/package/liberation/liberation.mk +++ b/package/liberation/liberation.mk @@ -24,7 +24,7 @@ $(LIBERATION_TARGET_DIR)/LiberationMono-Bold.ttf: $(LIBERATION_DIR)/.unpacked $(INSTALL) -m0644 $(LIBERATION_DIR)/*.ttf $(LIBERATION_TARGET_DIR) touch -c $@ -liberation: uclibc $(LIBERATION_TARGET_DIR)/LiberationMono-Bold.ttf +liberation: $(LIBERATION_TARGET_DIR)/LiberationMono-Bold.ttf liberation-clean: rm -rf $(LIBERATION_TARGET_DIR) diff --git a/package/libevent/libevent.mk b/package/libevent/libevent.mk index 049a2abe4..51cbd18b7 100644 --- a/package/libevent/libevent.mk +++ b/package/libevent/libevent.mk @@ -51,7 +51,7 @@ ifneq ($(BR2_HAVE_MANPAGES),y) rm -fr $(TARGET_DIR)/usr/share/man endif -libevent: uclibc $(TARGET_DIR)/$(LIBEVENT_TARGET_BINARY) +libevent: $(TARGET_DIR)/$(LIBEVENT_TARGET_BINARY) libevent-clean: rm -f $(TARGET_DIR)/$(LIBEVENT_TARGET_BINARY)* diff --git a/package/libgcrypt/libgcrypt.mk b/package/libgcrypt/libgcrypt.mk index 9df5bdede..d658be0d6 100644 --- a/package/libgcrypt/libgcrypt.mk +++ b/package/libgcrypt/libgcrypt.mk @@ -62,7 +62,7 @@ ifneq ($(BR2_HAVE_INFOPAGES),y) rm -rf $(STAGING_DIR)/usr/share/info endif -libgcrypt: uclibc libgpg-error $(TARGET_DIR)/$(LIBGCRYPT_TARGET_LIBRARY) +libgcrypt: libgpg-error $(TARGET_DIR)/$(LIBGCRYPT_TARGET_LIBRARY) libgcrypt-source: $(DL_DIR)/$(LIBGCRYPT_SOURCE) diff --git a/package/libglib12/libglib12.mk b/package/libglib12/libglib12.mk index 5fb30c1db..12eea6f84 100644 --- a/package/libglib12/libglib12.mk +++ b/package/libglib12/libglib12.mk @@ -78,7 +78,7 @@ libglib12-source: $(DL_DIR)/$(LIBGLIB12_SOURCE) libglib12-unpacked: $(LIBGLIB12_DIR)/.unpacked -libglib12: uclibc $(TARGET_DIR)/lib/libglib-1.2.so.0.0.10 +libglib12: $(TARGET_DIR)/lib/libglib-1.2.so.0.0.10 libglib12-clean: rm -f $(TARGET_DIR)/lib/$(LIBGLIB12_BINARY) diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index b2738b012..c16465bae 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -51,7 +51,7 @@ LIBGLIB2_CONF_ENV = \ LIBGLIB2_CONF_OPT = --enable-shared \ --enable-static -LIBGLIB2_DEPENDENCIES = uclibc gettext libintl host-pkgconfig host-libglib2 +LIBGLIB2_DEPENDENCIES = gettext libintl host-pkgconfig host-libglib2 ifneq ($(BR2_ENABLE_LOCALE),y) LIBGLIB2_DEPENDENCIES+=libiconv diff --git a/package/libgpg-error/libgpg-error.mk b/package/libgpg-error/libgpg-error.mk index ede4fc444..efd5f92cf 100644 --- a/package/libgpg-error/libgpg-error.mk +++ b/package/libgpg-error/libgpg-error.mk @@ -54,7 +54,7 @@ $(STAGING_DIR)/$(LIBGPG_ERROR_TARGET_LIBRARY): $(LIBGPG_ERROR_DIR)/$(LIBGPG_ERRO $(TARGET_DIR)/$(LIBGPG_ERROR_TARGET_LIBRARY): $(STAGING_DIR)/$(LIBGPG_ERROR_TARGET_LIBRARY) cp -dpf $<* $(TARGET_DIR)/$(LIBGPG_ERROR_DESTDIR) -libgpg-error: uclibc $(TARGET_DIR)/$(LIBGPG_ERROR_TARGET_LIBRARY) +libgpg-error: $(TARGET_DIR)/$(LIBGPG_ERROR_TARGET_LIBRARY) libgpg-error-source: $(DL_DIR)/$(LIBGPG_ERROR_SOURCE) diff --git a/package/libgtk12/libgtk12.mk b/package/libgtk12/libgtk12.mk index bb121f01d..a7fd1c0ba 100644 --- a/package/libgtk12/libgtk12.mk +++ b/package/libgtk12/libgtk12.mk @@ -86,7 +86,7 @@ $(TARGET_DIR)/lib/libgtk-1.2.so.0.9.1: $(STAGING_DIR)/lib/$(LIBGTK12_BINARY) $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libgdk-1.2.so.0.9.1 touch -c $(TARGET_DIR)/lib/libgtk-1.2.so.0.9.1 -libgtk12: uclibc libglib12 xserver_xorg-server $(TARGET_DIR)/lib/libgtk-1.2.so.0.9.1 +libgtk12: libglib12 xserver_xorg-server $(TARGET_DIR)/lib/libgtk-1.2.so.0.9.1 libgtk12-clean: rm -f $(TARGET_DIR)/lib/libgtk* $(TARGET_DIR)/lib/libgdk* diff --git a/package/libiconv/libiconv.mk b/package/libiconv/libiconv.mk index 71a21aaa0..cc40cd4b6 100644 --- a/package/libiconv/libiconv.mk +++ b/package/libiconv/libiconv.mk @@ -12,8 +12,6 @@ LIBICONV_INSTALL_TARGET = YES LIBICONV_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install -LIBICONV_DEPENDENCIES = uclibc - $(eval $(call AUTOTARGETS,package,libiconv)) $(LIBICONV_HOOK_POST_INSTALL): diff --git a/package/libidn/libidn.mk b/package/libidn/libidn.mk index d656f657c..50d9bebbf 100644 --- a/package/libidn/libidn.mk +++ b/package/libidn/libidn.mk @@ -9,6 +9,6 @@ LIBIDN_SITE = http://ftp.gnu.org/gnu/libidn/ LIBIDN_INSTALL_STAGING = YES LIBIDN_INSTALL_TARGET = YES LIBIDN_CONF_OPT = --enable-shared -LIBIDN_DEPENDENCIES = uclibc host-pkgconfig gettext $(if $(BR2_PACKAGE_LIBICONV),libiconv) +LIBIDN_DEPENDENCIES = host-pkgconfig gettext $(if $(BR2_PACKAGE_LIBICONV),libiconv) $(eval $(call AUTOTARGETS,package,libidn)) diff --git a/package/liblockfile/liblockfile.mk b/package/liblockfile/liblockfile.mk index fe1d740b9..b32e2ceae 100644 --- a/package/liblockfile/liblockfile.mk +++ b/package/liblockfile/liblockfile.mk @@ -51,7 +51,7 @@ $(TARGET_DIR)/usr/lib/$(LIBLOCKFILE_BINARY): $(STAGING_DIR)/lib/$(LIBLOCKFILE_BI $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) \ $(TARGET_DIR)/usr/lib/$(LIBLOCKFILE_BINARY) -liblockfile: uclibc $(TARGET_DIR)/usr/lib/$(LIBLOCKFILE_BINARY) +liblockfile: $(TARGET_DIR)/usr/lib/$(LIBLOCKFILE_BINARY) liblockfile-clean: rm -f $(TARGET_DIR)/usr/lib/liblockfile.so* diff --git a/package/liboil/liboil.mk b/package/liboil/liboil.mk index 2700b22e2..bdbbd1e76 100644 --- a/package/liboil/liboil.mk +++ b/package/liboil/liboil.mk @@ -36,7 +36,7 @@ ifeq ($(BR2_VFP_FLOAT),y) LIBOIL_CONF_OPT+=--enable-vfp endif -LIBOIL_DEPENDENCIES = uclibc $(LIBOIL_GLIB_DEP) +LIBOIL_DEPENDENCIES = $(LIBOIL_GLIB_DEP) $(eval $(call AUTOTARGETS,package,liboil)) diff --git a/package/libosip2/libosip2.mk b/package/libosip2/libosip2.mk index c8582fc44..8cbf51afb 100644 --- a/package/libosip2/libosip2.mk +++ b/package/libosip2/libosip2.mk @@ -62,7 +62,7 @@ $(TARGET_DIR)/usr/lib/libosipparser2.so: $(STAGING_DIR)/usr/lib/libosip2.so cp -dpf $(STAGING_DIR)/usr/lib/libosipparser2.so* $(TARGET_DIR)/usr/lib/ $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libosipparser2.so* -libosip2: uclibc $(TARGET_DIR)/usr/lib/libosip2.so $(TARGET_DIR)/usr/lib/libosipparser2.so +libosip2: $(TARGET_DIR)/usr/lib/libosip2.so $(TARGET_DIR)/usr/lib/libosipparser2.so libosip2-source: $(DL_DIR)/$(LIBOSIP2_SOURCE) diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk index 3932d09d3..81d6ee387 100644 --- a/package/libpcap/libpcap.mk +++ b/package/libpcap/libpcap.mk @@ -65,7 +65,7 @@ $(LIBPCAP_DIR)/libpcap.a: $(LIBPCAP_DIR)/.configured $(STAGING_DIR)/usr/lib/libpcap.a: $(LIBPCAP_DIR)/libpcap.a $(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBPCAP_DIR) install -libpcap: uclibc zlib $(STAGING_DIR)/usr/lib/libpcap.a +libpcap: zlib $(STAGING_DIR)/usr/lib/libpcap.a libpcap-clean: rm -f $(addprefix $(STAGING_DIR)/usr/,include/pcap*.h \ diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk index b1cb2209d..f49a9a50f 100644 --- a/package/libpng/libpng.mk +++ b/package/libpng/libpng.mk @@ -16,7 +16,7 @@ LIBPNG_CONF_ENV = \ ac_cv_func_calloc_0_nonnull=yes \ ac_cv_func_realloc_0_nonnull=yes LIBPNG_CONF_OPT = --without-libpng-compat -LIBPNG_DEPENDENCIES = uclibc host-pkgconfig zlib +LIBPNG_DEPENDENCIES = host-pkgconfig zlib $(eval $(call AUTOTARGETS,package,libpng)) diff --git a/package/libraw1394/libraw1394.mk b/package/libraw1394/libraw1394.mk index e41d2916b..b1249f185 100644 --- a/package/libraw1394/libraw1394.mk +++ b/package/libraw1394/libraw1394.mk @@ -49,7 +49,7 @@ $(STAGING_DIR)/usr/lib/libraw1394.so: $(LIBRAW1394_DIR)/.compiled $(TARGET_DIR)/usr/lib/libraw1394.so: $(STAGING_DIR)/usr/lib/libraw1394.so cp -dpf $(STAGING_DIR)/usr/lib/libraw1394.so* $(TARGET_DIR)/usr/lib/ -libraw1394: uclibc $(TARGET_DIR)/usr/lib/libraw1394.so +libraw1394: $(TARGET_DIR)/usr/lib/libraw1394.so libraw1394-source: $(DL_DIR)/$(LIBRAW1394_SOURCE) diff --git a/package/libsoup/libsoup.mk b/package/libsoup/libsoup.mk index b4eaa5a2e..e6a5f0af0 100644 --- a/package/libsoup/libsoup.mk +++ b/package/libsoup/libsoup.mk @@ -27,6 +27,6 @@ LIBSOUP_CONF_OPT = \ --without-gnome \ --disable-gtk-doc --without-html-dir -LIBSOUP_DEPENDENCIES = uclibc gettext libintl host-pkgconfig host-libglib2 libglib2 libxml2 +LIBSOUP_DEPENDENCIES = gettext libintl host-pkgconfig host-libglib2 libglib2 libxml2 $(eval $(call AUTOTARGETS,package,libsoup)) diff --git a/package/libsysfs/libsysfs.mk b/package/libsysfs/libsysfs.mk index d02e8b78e..046745ee7 100644 --- a/package/libsysfs/libsysfs.mk +++ b/package/libsysfs/libsysfs.mk @@ -64,7 +64,7 @@ $(TARGET_DIR)/usr/lib/libsysfs.so: $(STAGING_DIR)/usr/lib/libsysfs.so cp -dpf $(STAGING_DIR)/usr/lib/libsysfs.so* $(TARGET_DIR)/usr/lib/ -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libsysfs.so -libsysfs: uclibc $(TARGET_DIR)/usr/lib/libsysfs.so +libsysfs: $(TARGET_DIR)/usr/lib/libsysfs.so libsysfs-clean: -$(MAKE) -C $(LIBSYSFS_DIR) clean diff --git a/package/libtool/libtool.mk b/package/libtool/libtool.mk index 1f56fdd3b..9136ed578 100644 --- a/package/libtool/libtool.mk +++ b/package/libtool/libtool.mk @@ -11,8 +11,6 @@ ifeq ($(BR2_ENABLE_DEBUG),y) # install-exec doesn't install aclocal stuff LIBTOOL_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install endif -LIBTOOL_DEPENDENCIES = uclibc - $(eval $(call AUTOTARGETS,package,libtool)) # libtool for the host diff --git a/package/libungif/libungif.mk b/package/libungif/libungif.mk index 38d7f768f..df5a8603c 100644 --- a/package/libungif/libungif.mk +++ b/package/libungif/libungif.mk @@ -51,7 +51,7 @@ $(TARGET_DIR)/$(LIBUNGIF_TARGET_BINARY): $(STAGING_DIR)/usr/lib/libungif.a cp -dpf $(STAGING_DIR)/$(LIBUNGIF_TARGET_BINARY)* $(TARGET_DIR)/usr/lib/ -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(LIBUNGIF_TARGET_BINARY)* -libungif: uclibc $(TARGET_DIR)/$(LIBUNGIF_TARGET_BINARY) +libungif: $(TARGET_DIR)/$(LIBUNGIF_TARGET_BINARY) libungif-clean: rm -f $(TARGET_DIR)/$(LIBUNGIF_TARGET_BINARY)* diff --git a/package/libusb/libusb.mk b/package/libusb/libusb.mk index d61313310..ce1d231be 100644 --- a/package/libusb/libusb.mk +++ b/package/libusb/libusb.mk @@ -58,7 +58,7 @@ $(TARGET_DIR)/$(LIBUSB_BINARY): $(STAGING_DIR)/usr/lib/libusb.so cp -dpf $(STAGING_DIR)/usr/lib/libusb*.so* $(TARGET_DIR)/usr/lib/ $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libusb*.so* -libusb: uclibc host-pkgconfig $(TARGET_DIR)/$(LIBUSB_BINARY) +libusb: host-pkgconfig $(TARGET_DIR)/$(LIBUSB_BINARY) libusb-clean: rm -f $(STAGING_DIR)/bin/libusb-config diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk index e9c8752db..e71cdbb25 100644 --- a/package/libxml2/libxml2.mk +++ b/package/libxml2/libxml2.mk @@ -18,8 +18,6 @@ LIBXML2_CONF_OPT = --with-gnu-ld --enable-shared \ --without-debugging --without-python \ --without-threads -LIBXML2_DEPENDENCIES = uclibc - $(eval $(call AUTOTARGETS,package,libxml2)) $(LIBXML2_HOOK_POST_INSTALL): diff --git a/package/libxslt/libxslt.mk b/package/libxslt/libxslt.mk index 35659d355..247880092 100644 --- a/package/libxslt/libxslt.mk +++ b/package/libxslt/libxslt.mk @@ -23,7 +23,7 @@ LIBXSLT_CONF_OPT = --with-gnu-ld --enable-shared \ --without-threads \ --with-libxml-prefix=$(STAGING_DIR)/usr/ -LIBXSLT_DEPENDENCIES = uclibc $(LIBXSLT_DEPENDENCIES_EXTRA) +LIBXSLT_DEPENDENCIES = $(LIBXSLT_DEPENDENCIES_EXTRA) $(eval $(call AUTOTARGETS,package,libxslt)) diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index e842c60ce..4ec740356 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -8,7 +8,7 @@ LIGHTTPD_VERSION = 1.4.23 LIGHTTPD_SOURCE = lighttpd-$(LIGHTTPD_VERSION).tar.bz2 LIGHTTPD_SITE = http://www.lighttpd.net/download LIGHTTPD_LIBTOOL_PATCH = NO -LIGHTTPD_DEPENDENCIES = uclibc +LIGHTTPD_DEPENDENCIES = ifneq ($(BR2_LARGEFILE),y) LIGHTTPD_LFS:=$(DISABLE_LARGEFILE) --disable-lfs diff --git a/package/links/links.mk b/package/links/links.mk index cea6cd664..d616731e9 100644 --- a/package/links/links.mk +++ b/package/links/links.mk @@ -54,7 +54,7 @@ links-clean: links-dirclean: rm -rf $(LINKS_DIR) -links: uclibc $(TARGET_DIR)/usr/bin/links +links: $(TARGET_DIR)/usr/bin/links ############################################################# # diff --git a/package/linux-fusion/linux-fusion.mk b/package/linux-fusion/linux-fusion.mk index 38d77da39..6a1c12af0 100644 --- a/package/linux-fusion/linux-fusion.mk +++ b/package/linux-fusion/linux-fusion.mk @@ -10,10 +10,6 @@ LINUX_FUSION_AUTORECONF = NO LINUX_FUSION_INSTALL_STAGING = YES LINUX_FUSION_INSTALL_TARGET = YES -LINUX_FUSION_CONF_OPT = - -LINUX_FUSION_DEPENDENCIES = uclibc - # BR2_LINUX26_VERSION is not really dependable # LINUX26_VERSION is not yet set. # Retrieve REAL kernel version from file. @@ -62,7 +58,7 @@ linux-fusion-source: $(DL_DIR)/$(LINUX_FUSION_SOURCE) linux-fusion-unpacked: $(LINUX_FUSION_DIR)/.unpacked -linux-fusion: uclibc linux26 $(LINUX_FUSION_DIR)/.install +linux-fusion: linux26 $(LINUX_FUSION_DIR)/.install linux-fusion-clean: -$(MAKE) -C $(LINUX_FUSION_DIR) clean diff --git a/package/lm-sensors/lm-sensors.mk b/package/lm-sensors/lm-sensors.mk index 9e9a0909f..1844f7598 100644 --- a/package/lm-sensors/lm-sensors.mk +++ b/package/lm-sensors/lm-sensors.mk @@ -40,7 +40,7 @@ lm-sensors-source: $(DL_DIR)/$(LM_SENSORS_SOURCE) $(LM_SENSORS_PATCH_FILE) lm-sensors-unpacked: $(LM_SENSORS_DIR)/.unpacked -lm-sensors: uclibc $(TARGET_DIR)/$(LM_SENSORS_TARGET_BINARY) +lm-sensors: $(TARGET_DIR)/$(LM_SENSORS_TARGET_BINARY) lm-sensors-clean: -$(MAKE) -C $(LM_SENSORS_DIR) clean diff --git a/package/lockfile-progs/lockfile-progs.mk b/package/lockfile-progs/lockfile-progs.mk index e1f4c1700..6494f8119 100644 --- a/package/lockfile-progs/lockfile-progs.mk +++ b/package/lockfile-progs/lockfile-progs.mk @@ -26,7 +26,7 @@ $(TARGET_DIR)/$(LOCKFILE_PROGS_BINARY): $(LOCKFILE_PROGS_DIR)/.unpacked cp -a $(LOCKFILE_PROGS_DIR)/bin/lockfile* $(TARGET_DIR)/usr/bin $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(LOCKFILE_PROGS_BINARY) -lockfile-progs: uclibc liblockfile $(TARGET_DIR)/$(LOCKFILE_PROGS_BINARY) +lockfile-progs: liblockfile $(TARGET_DIR)/$(LOCKFILE_PROGS_BINARY) lockfile-progs-clean: -rm -f $(TARGET_DIR)/usr/bin/lockfile-* diff --git a/package/lrzsz/lrzsz.mk b/package/lrzsz/lrzsz.mk index 03c8a40ca..885c43de2 100644 --- a/package/lrzsz/lrzsz.mk +++ b/package/lrzsz/lrzsz.mk @@ -68,7 +68,7 @@ $(TARGET_DIR)/usr/bin/rz: $(LRZSZ_DIR)/src/lrz cp $(LRZSZ_DIR)/src/lrz $(TARGET_DIR)/usr/bin/rz cp $(LRZSZ_DIR)/src/lsz $(TARGET_DIR)/usr/bin/sz -lrzsz: uclibc $(TARGET_DIR)/usr/bin/rz +lrzsz: $(TARGET_DIR)/usr/bin/rz lrzsz-clean: rm -f $(TARGET_DIR)/usr/bin/rz diff --git a/package/lsof/lsof.mk b/package/lsof/lsof.mk index c998d8b06..8deff15f1 100644 --- a/package/lsof/lsof.mk +++ b/package/lsof/lsof.mk @@ -51,7 +51,7 @@ $(TARGET_DIR)/$(LSOF_TARGET_BINARY): $(LSOF_DIR)/lsof_$(LSOF_VERSION)_src/$(LSOF cp $(LSOF_DIR)/lsof_$(LSOF_VERSION)_src/$(LSOF_BINARY) $@ $(STRIPCMD) $@ -lsof: uclibc $(TARGET_DIR)/$(LSOF_TARGET_BINARY) +lsof: $(TARGET_DIR)/$(LSOF_TARGET_BINARY) lsof-clean: -rm -f $(TARGET_DIR)/$(LSOF_TARGET_BINARY) diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk index 7cb51c211..355be02f4 100644 --- a/package/ltp-testsuite/ltp-testsuite.mk +++ b/package/ltp-testsuite/ltp-testsuite.mk @@ -51,7 +51,7 @@ $(LTP_TESTSUITE_DIR)/.installed: $(LTP_TESTSUITE_DIR)/.compiled > $(PROJECT_BUILD_DIR)/.fakeroot.ltp touch $@ -ltp-testsuite: uclibc host-fakeroot $(LTP_TESTSUITE_DIR)/.installed +ltp-testsuite: host-fakeroot $(LTP_TESTSUITE_DIR)/.installed ltp-testsuite-clean: -$(MAKE) -C $(LTP_TESTSUITE_DIR) clean diff --git a/package/ltrace/ltrace.mk b/package/ltrace/ltrace.mk index ab7913778..4d0405355 100644 --- a/package/ltrace/ltrace.mk +++ b/package/ltrace/ltrace.mk @@ -65,7 +65,7 @@ ifeq ($(BR2_HAVE_MANPAGES),y) endif $(STRIPCMD) $(STRIP_STRIP_ALL) $@ -ltrace: uclibc libelf $(TARGET_DIR)/$(LTRACE_TARGET_BINARY) +ltrace: libelf $(TARGET_DIR)/$(LTRACE_TARGET_BINARY) ltrace-source: $(DL_DIR)/$(LTRACE_SOURCE) $(LTRACE_PATCH_FILE) diff --git a/package/lua/lua.mk b/package/lua/lua.mk index 4b646b219..f80f28b04 100644 --- a/package/lua/lua.mk +++ b/package/lua/lua.mk @@ -57,7 +57,7 @@ lua-bins: $(TARGET_DIR)/usr/bin/lua $(TARGET_DIR)/usr/bin/luac lua-libs: $(TARGET_DIR)/usr/lib/liblua.a -lua: uclibc readline ncurses lua-bins lua-libs +lua: readline ncurses lua-bins lua-libs lua-source: $(DL_DIR)/$(LUA_SOURCE) diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk index 3727e3636..0e526e1f8 100644 --- a/package/lvm2/lvm2.mk +++ b/package/lvm2/lvm2.mk @@ -97,9 +97,9 @@ $(LVM2_TARGET_LIBS): $(LVM2_DIR)/.built ifeq ($(BR2_PACKAGE_LVM2_DMSETUP_ONLY),y) -lvm2: uclibc $(LVM2_TARGET_DMSETUP_SBINS) $(LVM2_TARGET_LIBS) +lvm2: $(LVM2_TARGET_DMSETUP_SBINS) $(LVM2_TARGET_LIBS) else -lvm2: uclibc $(LVM2_TARGET_SBINS) $(LVM2_TARGET_DMSETUP_SBINS) $(LVM2_TARGET_LIBS) +lvm2: $(LVM2_TARGET_SBINS) $(LVM2_TARGET_DMSETUP_SBINS) $(LVM2_TARGET_LIBS) endif diff --git a/package/lzma/lzma.mk b/package/lzma/lzma.mk index e691ec42b..89faf285b 100644 --- a/package/lzma/lzma.mk +++ b/package/lzma/lzma.mk @@ -115,7 +115,7 @@ $(TARGET_DIR)/$(LZMA_TARGET_BINARY): $(LZMA_TARGET_DIR)/src/lzma/lzma #lzma-headers: $(TARGET_DIR)/$(LZMA_TARGET_BINARY) -lzma-target: uclibc $(TARGET_DIR)/$(LZMA_TARGET_BINARY) +lzma-target: $(TARGET_DIR)/$(LZMA_TARGET_BINARY) lzma-source: $(DL_DIR)/$(LZMA_SOURCE) diff --git a/package/lzo/lzo.mk b/package/lzo/lzo.mk index 1593b8368..4c5b458c7 100644 --- a/package/lzo/lzo.mk +++ b/package/lzo/lzo.mk @@ -10,8 +10,6 @@ LZO_AUTORECONF = NO LZO_INSTALL_STAGING = YES LZO_INSTALL_TARGET = YES LZO_INSTALL_STAGING_OPT = CC="$(TARGET_CC)" DESTDIR=$(STAGING_DIR) install -LZO_CONF_ENV = -LZO_DEPENDENCIES = uclibc $(eval $(call AUTOTARGETS,package,lzo)) diff --git a/package/m4/m4.mk b/package/m4/m4.mk index e034e7a9c..c878a6788 100644 --- a/package/m4/m4.mk +++ b/package/m4/m4.mk @@ -17,8 +17,6 @@ ifneq ($(BR2_USE_WCHAR),y) M4_CONF_ENV += gt_cv_c_wchar_t=no gl_cv_absolute_wchar_h=__fpending.h endif -M4_DEPENDENCIES = uclibc - $(eval $(call AUTOTARGETS,package,m4)) # m4 for the host diff --git a/package/make/make.mk b/package/make/make.mk index 268f3b6e1..786b4311f 100644 --- a/package/make/make.mk +++ b/package/make/make.mk @@ -56,7 +56,7 @@ $(TARGET_DIR)/$(GNUMAKE_TARGET_BINARY): $(GNUMAKE_DIR)/$(GNUMAKE_BINARY) rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \ $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc -make: uclibc $(if $(BR2_PACKAGE_GETTEXT),gettext) $(TARGET_DIR)/$(GNUMAKE_TARGET_BINARY) +make: $(if $(BR2_PACKAGE_GETTEXT),gettext) $(TARGET_DIR)/$(GNUMAKE_TARGET_BINARY) make-clean: $(MAKE) DESTDIR=$(TARGET_DIR) -C $(GNUMAKE_DIR) uninstall diff --git a/package/matchbox/matchbox.mk b/package/matchbox/matchbox.mk index a3ff222f6..a12ab34cf 100644 --- a/package/matchbox/matchbox.mk +++ b/package/matchbox/matchbox.mk @@ -609,13 +609,13 @@ $(TARGET_DIR)/usr/bin/$(MATCHBOX_KB_BIN): $(STAGING_DIR)/usr/bin/$(MATCHBOX_KB_B cp -af $(STAGING_DIR)/usr/share/matchbox/matchbox-keyboard $(TARGET_DIR)/usr/share/matchbox/ cp -dpf ./package/matchbox/mb-applet-kbd-wrapper.sh $(TARGET_DIR)/usr/bin/ -matchbox: uclibc host-pkgconfig expat $(MATCHBOX_WM_DEPS) $(MATCHBOX_SNOTIFY_DEPS) $(MATCHBOX_LIB_DEPS) $(TARGET_DIR)/usr/lib/libmb.so $(TARGET_DIR)/usr/bin/$(MATCHBOX_WM_BIN) +matchbox: host-pkgconfig expat $(MATCHBOX_WM_DEPS) $(MATCHBOX_SNOTIFY_DEPS) $(MATCHBOX_LIB_DEPS) $(TARGET_DIR)/usr/lib/libmb.so $(TARGET_DIR)/usr/bin/$(MATCHBOX_WM_BIN) -matchbox-panel: uclibc matchbox $(TARGET_DIR)/usr/bin/$(MATCHBOX_PL_BIN) $(TARGET_DIR)/usr/bin/matchbox-session $(MATCHBOX_PANEL_DEPS) +matchbox-panel: matchbox $(TARGET_DIR)/usr/bin/$(MATCHBOX_PL_BIN) $(TARGET_DIR)/usr/bin/matchbox-session $(MATCHBOX_PANEL_DEPS) -matchbox-desktop: uclibc matchbox $(TARGET_DIR)/usr/bin/$(MATCHBOX_DP_BIN) +matchbox-desktop: matchbox $(TARGET_DIR)/usr/bin/$(MATCHBOX_DP_BIN) -matchbox-keyboard: uclibc matchbox xlib_libXtst $(MATCHBOX_KB_DEPS) $(TARGET_DIR)/usr/lib/$(MATCHBOX_FK_BIN).so $(TARGET_DIR)/usr/bin/$(MATCHBOX_KB_BIN) +matchbox-keyboard: matchbox xlib_libXtst $(MATCHBOX_KB_DEPS) $(TARGET_DIR)/usr/lib/$(MATCHBOX_FK_BIN).so $(TARGET_DIR)/usr/bin/$(MATCHBOX_KB_BIN) matchbox-clean: rm -f $(TARGET_DIR)/usr/lib/libmb.* diff --git a/package/mdadm/mdadm.mk b/package/mdadm/mdadm.mk index 1e330275c..225d438d3 100644 --- a/package/mdadm/mdadm.mk +++ b/package/mdadm/mdadm.mk @@ -46,7 +46,7 @@ mdadm-source: $(DL_DIR)/$(MDADM_SOURCE) $(MDADM_PATCH_FILE) mdadm-unpacked: $(MDADM_DIR)/.unpacked -mdadm: uclibc $(TARGET_DIR)/$(MDADM_TARGET_BINARY) +mdadm: $(TARGET_DIR)/$(MDADM_TARGET_BINARY) mdadm-clean: $(MAKE) DESTDIR=$(TARGET_DIR) -C $(MDADM_DIR) uninstall diff --git a/package/mdnsresponder/mdnsresponder.mk b/package/mdnsresponder/mdnsresponder.mk index 952f600ce..bb836ab37 100644 --- a/package/mdnsresponder/mdnsresponder.mk +++ b/package/mdnsresponder/mdnsresponder.mk @@ -60,7 +60,7 @@ $(TARGET_DIR)/usr/bin/mDNSClientPosix: $(STAGING_DIR)/usr/lib/libdns_sd.so $(INSTALL) -m 755 -D $(MDNSRESPONDER_DIR)/mDNSPosix/build/prod/mDNSClientPosix $(TARGET_DIR)/usr/bin/ -mdnsresponder: uclibc $(TARGET_DIR)/usr/sbin/mdnsd $(MDNSRESPONDER_INSTDEPS) +mdnsresponder: $(TARGET_DIR)/usr/sbin/mdnsd $(MDNSRESPONDER_INSTDEPS) mdnsresponder-source: $(DL_DIR)/$(MDNSRESPONDER_SOURCE) diff --git a/package/memtester/memtester.mk b/package/memtester/memtester.mk index e10f965dc..ed8470bb6 100644 --- a/package/memtester/memtester.mk +++ b/package/memtester/memtester.mk @@ -28,7 +28,7 @@ $(MEMTESTER_DIR)/$(MEMTESTER_BINARY): $(MEMTESTER_DIR)/.unpacked $(TARGET_DIR)/$(MEMTESTER_TARGET_BINARY): $(MEMTESTER_DIR)/$(MEMTESTER_BINARY) $(INSTALL) -m 0755 -D $(MEMTESTER_DIR)/$(MEMTESTER_BINARY) $(TARGET_DIR)/$(MEMTESTER_TARGET_BINARY) -memtester: uclibc $(TARGET_DIR)/$(MEMTESTER_TARGET_BINARY) +memtester: $(TARGET_DIR)/$(MEMTESTER_TARGET_BINARY) memtester-clean: rm -f $(TARGET_DIR)/$(MEMTESTER_TARGET_BINARY) diff --git a/package/metacity/metacity.mk b/package/metacity/metacity.mk index 6861165e4..44cde5468 100644 --- a/package/metacity/metacity.mk +++ b/package/metacity/metacity.mk @@ -16,7 +16,7 @@ METACITY_CONF_OPT = --x-includes=$(STAGING_DIR)/usr/include/X11 \ --disable-dependency-tracking \ --disable-sm --disable-startup-notification -METACITY_DEPENDENCIES = uclibc libgtk2 xserver_xorg-server +METACITY_DEPENDENCIES = libgtk2 xserver_xorg-server $(eval $(call AUTOTARGETS,package,metacity)) diff --git a/package/microcom/microcom.mk b/package/microcom/microcom.mk index 13430785d..d171be9aa 100644 --- a/package/microcom/microcom.mk +++ b/package/microcom/microcom.mk @@ -66,7 +66,7 @@ microcom-clean: microcom-dirclean: rm -rf $(MICROCOM_DIR) -microcom: uclibc $(TARGET_DIR)/usr/bin/microcom +microcom: $(TARGET_DIR)/usr/bin/microcom ############################################################# # diff --git a/package/microperl/microperl.mk b/package/microperl/microperl.mk index f2a958b7a..ca80f39ed 100644 --- a/package/microperl/microperl.mk +++ b/package/microperl/microperl.mk @@ -87,7 +87,7 @@ ifneq ($(BR2_STRIP_none),y) endif (cd $(TARGET_DIR)/usr/bin; rm -f perl; ln -s microperl perl;) -microperl: uclibc $(TARGET_DIR)/usr/bin/microperl +microperl: $(TARGET_DIR)/usr/bin/microperl microperl-source: $(DL_DIR)/$(MICROPERL_SOURCE) diff --git a/package/microwin/microwin.mk b/package/microwin/microwin.mk index 710ab8360..f1deca202 100644 --- a/package/microwin/microwin.mk +++ b/package/microwin/microwin.mk @@ -43,7 +43,7 @@ $(MICROWIN_BINARY): $(MICROWIN_DIR)/.configured $(MICROWIN_TARGET_BINARY): $(MICROWIN_BINARY) $(MAKE) INSTALL_PREFIX=$(TARGET_DIR)/usr INSTALL_OWNER1= INSTALL_OWNER2= CC=$(TARGET_CC) -C $(MICROWIN_DIR)/src CONFIG=$(MICROWIN_CONFIG) install -microwin: uclibc $(MICROWIN_TARGET_BINARY) +microwin: $(MICROWIN_TARGET_BINARY) microwin-clean: -$(MAKE) -C $(MICROWIN_DIR)/src clean diff --git a/package/midori/midori.mk b/package/midori/midori.mk index 6861d4c29..a82c5b4f1 100644 --- a/package/midori/midori.mk +++ b/package/midori/midori.mk @@ -11,6 +11,6 @@ MIDORI_AUTORECONF = YES MIDORI_INSTALL_STAGING = NO MIDORI_INSTALL_TARGET = YES -MIDORI_DEPENDENCIES = uclibc host-pkgconfig webkit libsexy xserver_xorg-server +MIDORI_DEPENDENCIES = host-pkgconfig webkit libsexy xserver_xorg-server $(eval $(call AUTOTARGETS,package,midori)) diff --git a/package/mii-diag/mii-diag.mk b/package/mii-diag/mii-diag.mk index a5357ec47..ca31a107d 100644 --- a/package/mii-diag/mii-diag.mk +++ b/package/mii-diag/mii-diag.mk @@ -41,7 +41,7 @@ $(TARGET_DIR)/$(MIIDIAG_BINARY): $(MIIDIAG_DIR)/mii-diag $(STRIPCMD) $@ touch $@ -mii-diag: uclibc $(TARGET_DIR)/$(MIIDIAG_BINARY) +mii-diag: $(TARGET_DIR)/$(MIIDIAG_BINARY) mii-diag-source: $(DL_DIR)/$(MIIDIAG_SOURCE) $(MIIDIAG_PATCH) diff --git a/package/module-init-tools/module-init-tools.mk b/package/module-init-tools/module-init-tools.mk index b135f6a4c..ff316cf18 100644 --- a/package/module-init-tools/module-init-tools.mk +++ b/package/module-init-tools/module-init-tools.mk @@ -60,7 +60,7 @@ endif rm -f $(TARGET_DIR)/sbin/insmod.static touch -c $(MODULE_INIT_TOOLS_TARGET_BINARY) -module-init-tools: uclibc $(MODULE_INIT_TOOLS_TARGET_BINARY) +module-init-tools: $(MODULE_INIT_TOOLS_TARGET_BINARY) module-init-tools-clean: $(MAKE) prefix=$(TARGET_DIR)/usr -C $(MODULE_INIT_TOOLS_DIR) uninstall diff --git a/package/modutils/modutils.mk b/package/modutils/modutils.mk index ceffacce0..dca94f45a 100644 --- a/package/modutils/modutils.mk +++ b/package/modutils/modutils.mk @@ -61,7 +61,7 @@ $(TARGET_DIR)/sbin/rmmod: $(STAGING_DIR)/$(MODUTILS_TARGET_BINARY) ln -s insmod $(TARGET_DIR)/sbin/modprobe ln -s insmod $(TARGET_DIR)/sbin/rmmod -modutils: uclibc $(TARGET_DIR)/sbin/rmmod +modutils: $(TARGET_DIR)/sbin/rmmod modutils-source: $(DL_DIR)/$(MODUTILS_SOURCE) @@ -120,7 +120,7 @@ $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-depmod: $(MODUTILS_DIR2)/$(MODUTILS_BINARY cp $(MODUTILS_DIR2)/$(MODUTILS_BINARY) $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-depmod touch -c $@ -cross-depmod: uclibc $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-depmod +cross-depmod: $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-depmod cross-depmod-source: $(DL_DIR)/$(MODUTILS_SOURCE) diff --git a/package/mpatrol/mpatrol.mk b/package/mpatrol/mpatrol.mk index 4e9aa00f2..dd348a1e0 100644 --- a/package/mpatrol/mpatrol.mk +++ b/package/mpatrol/mpatrol.mk @@ -67,7 +67,7 @@ $(TARGET_DIR)/$(MPATROL_TARGET_BINARY): $(MPATROL_BUILD_DIR)/$(MPATROL_BINARY) cp -dpf tools/*.h $(STAGING_DIR)/usr/include/mpatrol) touch $(TARGET_DIR)/$(MPATROL_TARGET_BINARY) -mpatrol: uclibc $(MPATROL_SYMBOL_DEPS) $(TARGET_DIR)/$(MPATROL_TARGET_BINARY) +mpatrol: $(MPATROL_SYMBOL_DEPS) $(TARGET_DIR)/$(MPATROL_TARGET_BINARY) mpatrol-clean: (cd $(TARGET_DIR)/usr/lib; rm -f libmpatrol* libmpalloc*) diff --git a/package/mpfr/mpfr.mk b/package/mpfr/mpfr.mk index 70f64b490..b2787ec07 100644 --- a/package/mpfr/mpfr.mk +++ b/package/mpfr/mpfr.mk @@ -73,8 +73,8 @@ endif libmpfr-source: $(DL_DIR)/$(MPFR_SOURCE) $(MPFR_PATCH_SOURCE) -libmpfr: uclibc $(TARGET_DIR)/usr/lib/libmpfr$(LIBTGTEXT) -stage-libmpfr: uclibc $(STAGING_DIR)/usr/lib/$(MPFR_BINARY) +libmpfr: $(TARGET_DIR)/usr/lib/libmpfr$(LIBTGTEXT) +stage-libmpfr: $(STAGING_DIR)/usr/lib/$(MPFR_BINARY) libmpfr-clean: rm -f $(TARGET_DIR)/usr/lib/libmpfr.* \ diff --git a/package/mrouted/mrouted.mk b/package/mrouted/mrouted.mk index ffb1f4f66..a3d9c140c 100644 --- a/package/mrouted/mrouted.mk +++ b/package/mrouted/mrouted.mk @@ -32,7 +32,7 @@ $(MROUTED_DIR)/$(MROUTED_BINARY): $(MROUTED_DIR)/.unpacked $(TARGET_DIR)/$(MROUTED_TARGET_BINARY): $(MROUTED_DIR)/$(MROUTED_BINARY) cp -a $(MROUTED_DIR)/$(MROUTED_BINARY) $(TARGET_DIR)/$(MROUTED_TARGET_BINARY) -mrouted: uclibc $(TARGET_DIR)/$(MROUTED_TARGET_BINARY) +mrouted: $(TARGET_DIR)/$(MROUTED_TARGET_BINARY) mrouted-source: $(DL_DIR)/$(MROUTED_SOURCE) $(DL_DIR)/$(MROUTED_PATCH) diff --git a/package/multimedia/alsa-lib/alsa-lib.mk b/package/multimedia/alsa-lib/alsa-lib.mk index ee9aa926d..5db0393ff 100644 --- a/package/multimedia/alsa-lib/alsa-lib.mk +++ b/package/multimedia/alsa-lib/alsa-lib.mk @@ -11,8 +11,6 @@ ALSA_LIB_INSTALL_TARGET = YES ALSA_LIB_CFLAGS=$(TARGET_CFLAGS) -ALSA_LIB_DEPENDENCIES = uclibc - ALSA_LIB_CONF_OPT = --enable-shared \ --enable-static \ --without-versioned @@ -30,7 +28,7 @@ endif ifeq ($(BR2_PACKAGE_ALSA_LIB_PYTHON),y) ALSA_LIB_CONF_OPT += --with-pythonlibs=-lpython$(PYTHON_VERSION_MAJOR) ALSA_LIB_CFLAGS+=-I$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) -ALSA_LIB_DEPENDENCIES += libpython +ALSA_LIB_DEPENDENCIES = libpython else ALSA_LIB_CONF_OPT += --disable-python endif diff --git a/package/multimedia/alsa-utils/alsa-utils.mk b/package/multimedia/alsa-utils/alsa-utils.mk index 9f0b5d12d..61fc9b8d4 100644 --- a/package/multimedia/alsa-utils/alsa-utils.mk +++ b/package/multimedia/alsa-utils/alsa-utils.mk @@ -72,7 +72,7 @@ $(TARGET_DIR)/$(ALSA_UTILS_TARGET_BINARY): $(ALSA_UTILS_DIR)/$(ALSA_UTILS_BINARY fi touch -c $@ -alsa-utils: uclibc alsa-lib ncurses $(if $(BR2_PACKAGE_LIBINTL),libintl) $(if $(BR2_PACKAGE_LIBICONV),libiconv) $(TARGET_DIR)/$(ALSA_UTILS_TARGET_BINARY) +alsa-utils: alsa-lib ncurses $(if $(BR2_PACKAGE_LIBINTL),libintl) $(if $(BR2_PACKAGE_LIBICONV),libiconv) $(TARGET_DIR)/$(ALSA_UTILS_TARGET_BINARY) alsa-utils-unpacked: $(ALSA_UTILS_DIR)/.unpacked diff --git a/package/multimedia/asterisk/asterisk.mk b/package/multimedia/asterisk/asterisk.mk index 9d50f2433..24d5cc53f 100644 --- a/package/multimedia/asterisk/asterisk.mk +++ b/package/multimedia/asterisk/asterisk.mk @@ -61,7 +61,7 @@ endif rm -f $(TARGET_DIR)/usr/sbin/astgenkey touch -c $@ -asterisk: uclibc ncurses zlib openssl mpg123 $(TARGET_DIR)/$(ASTERISK_TARGET_BINARY) +asterisk: ncurses zlib openssl mpg123 $(TARGET_DIR)/$(ASTERISK_TARGET_BINARY) asterisk-source: $(DL_DIR)/$(ASTERISK_SOURCE) diff --git a/package/multimedia/aumix/aumix.mk b/package/multimedia/aumix/aumix.mk index d6f5fbd38..789aafe8f 100644 --- a/package/multimedia/aumix/aumix.mk +++ b/package/multimedia/aumix/aumix.mk @@ -44,7 +44,7 @@ $(AUMIX_DIR)/src/aumix: $(AUMIX_DIR)/.configured $(TARGET_DIR)/usr/bin/aumix: $(AUMIX_DIR)/src/aumix $(MAKE) -C $(AUMIX_DIR) DESTDIR=$(TARGET_DIR) install -aumix: uclibc ncurses $(TARGET_DIR)/usr/bin/aumix +aumix: ncurses $(TARGET_DIR)/usr/bin/aumix aumix-source: $(DL_DIR)/$(AUMIX_SOURCE) diff --git a/package/multimedia/festival/festival/festival.mk b/package/multimedia/festival/festival/festival.mk index 1762fcfa7..1c4fa7ea8 100644 --- a/package/multimedia/festival/festival/festival.mk +++ b/package/multimedia/festival/festival/festival.mk @@ -15,7 +15,7 @@ FESTIVAL_CONF_OPT = --prefix=/usr --libdir=/usr/share/festival/lib FESTIVAL_MAKE_OPT = CC=$(TARGET_CC) CXX=$(TARGET_CXX) -FESTIVAL_DEPENDENCIES = uclibc alsa-lib speech-tools +FESTIVAL_DEPENDENCIES = alsa-lib speech-tools $(eval $(call AUTOTARGETS,package/multimedia/festival,festival)) diff --git a/package/multimedia/festival/speech-tools/speech-tools.mk b/package/multimedia/festival/speech-tools/speech-tools.mk index c757bf8ff..fa345e3c6 100644 --- a/package/multimedia/festival/speech-tools/speech-tools.mk +++ b/package/multimedia/festival/speech-tools/speech-tools.mk @@ -14,7 +14,7 @@ SPEECH_TOOLS_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) STRIP=$(TARGET_STRIP) in SPEECH_TOOLS_CONF_OPT = SPEECH_TOOLS_MAKE_OPT = CC=$(TARGET_CC) CXX=$(TARGET_CXX) -SPEECH_TOOLS_DEPENDENCIES = uclibc ncurses +SPEECH_TOOLS_DEPENDENCIES = ncurses $(eval $(call AUTOTARGETS,package/multimedia/festival,speech-tools)) diff --git a/package/multimedia/libid3tag/libid3tag.mk b/package/multimedia/libid3tag/libid3tag.mk index 0308f0229..2661e0d47 100644 --- a/package/multimedia/libid3tag/libid3tag.mk +++ b/package/multimedia/libid3tag/libid3tag.mk @@ -46,7 +46,7 @@ $(TARGET_DIR)/$(LIBID3TAG_TARGET_BIN): $(STAGING_DIR)/$(LIBID3TAG_TARGET_BIN) cp -dpf $(STAGING_DIR)/usr/lib/libid3tag.so* $(TARGET_DIR)/usr/lib/ -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libid3tag.so* -libid3tag: uclibc zlib $(TARGET_DIR)/$(LIBID3TAG_TARGET_BIN) +libid3tag: zlib $(TARGET_DIR)/$(LIBID3TAG_TARGET_BIN) libid3tag-source: $(DL_DIR)/$(LIBID3TAG_SOURCE) diff --git a/package/multimedia/libmad/libmad.mk b/package/multimedia/libmad/libmad.mk index 4d9200dc0..f8663ce4a 100644 --- a/package/multimedia/libmad/libmad.mk +++ b/package/multimedia/libmad/libmad.mk @@ -57,7 +57,7 @@ $(TARGET_DIR)/usr/lib/libmad.a: $(STAGING_DIR)/usr/lib/libmad.so.0 cp -dpf $(STAGING_DIR)/usr/lib/libmad.so $(TARGET_DIR)/usr/lib/ cp -dpf $(STAGING_DIR)/usr/lib/libmad.a $(TARGET_DIR)/usr/lib/ -libmad: uclibc $(TARGET_DIR)/usr/lib/libmad.so.0 +libmad: $(TARGET_DIR)/usr/lib/libmad.so.0 libmad-headers: $(TARGET_DIR)/usr/lib/libmad.a diff --git a/package/multimedia/libmms/libmms.mk b/package/multimedia/libmms/libmms.mk index a866fadd6..2cf89d575 100644 --- a/package/multimedia/libmms/libmms.mk +++ b/package/multimedia/libmms/libmms.mk @@ -12,6 +12,6 @@ LIBMMS_LIBTOOL_PATCH = NO LIBMMS_INSTALL_STAGING = YES LIBMMS_INSTALL_TARGET = YES -LIBMMS_DEPENDENCIES = uclibc host-pkgconfig libglib2 +LIBMMS_DEPENDENCIES = host-pkgconfig libglib2 $(eval $(call AUTOTARGETS,package/multimedia,libmms)) diff --git a/package/multimedia/libogg/libogg.mk b/package/multimedia/libogg/libogg.mk index 6c88da10e..1608c383c 100644 --- a/package/multimedia/libogg/libogg.mk +++ b/package/multimedia/libogg/libogg.mk @@ -10,6 +10,6 @@ LIBOGG_AUTORECONF = NO LIBOGG_INSTALL_STAGING = YES LIBOGG_INSTALL_TARGET = YES -LIBOGG_DEPENDENCIES = uclibc host-pkgconfig +LIBOGG_DEPENDENCIES = host-pkgconfig $(eval $(call AUTOTARGETS,package/multimedia,libogg)) diff --git a/package/multimedia/libsndfile/libsndfile.mk b/package/multimedia/libsndfile/libsndfile.mk index cac30cc90..acc0d1c65 100644 --- a/package/multimedia/libsndfile/libsndfile.mk +++ b/package/multimedia/libsndfile/libsndfile.mk @@ -8,6 +8,5 @@ LIBSNDFILE_SOURCE:=libsndfile-$(LIBSNDFILE_VERSION).tar.gz LIBSNDFILE_SITE:=http://www.mega-nerd.com/libsndfile LIBSNDFILE_LIBTOOL_PATCH:=NO LIBSNDFILE_INSTALL_STAGING:=YES -LIBSNDFILE_DEPENDENCIES:=uclibc $(eval $(call AUTOTARGETS,package/multimedia,libsndfile)) diff --git a/package/multimedia/libvorbis/libvorbis.mk b/package/multimedia/libvorbis/libvorbis.mk index a8817268f..a84fa845f 100644 --- a/package/multimedia/libvorbis/libvorbis.mk +++ b/package/multimedia/libvorbis/libvorbis.mk @@ -15,7 +15,7 @@ LIBVORBIS_INSTALL_TARGET = YES LIBVORBIS_CONF_OPT = --disable-oggtest -LIBVORBIS_DEPENDENCIES = uclibc host-pkgconfig libogg +LIBVORBIS_DEPENDENCIES = host-pkgconfig libogg $(eval $(call AUTOTARGETS,package/multimedia,libvorbis)) @@ -83,7 +83,7 @@ $(TARGET_DIR)/usr/lib/tremor.a: $(TARGET_DIR)/usr/lib/tremor.so cp -dpf $(TREMOR_DIR)/lib/tremor.a $(TARGET_DIR)/usr/lib/ touch $@ -tremor libvorbis: uclibc host-pkgconfig host-autoconf host-automake libogg $(TARGET_DIR)/usr/lib/tremor.so +tremor libvorbis: host-pkgconfig host-autoconf host-automake libogg $(TARGET_DIR)/usr/lib/tremor.so tremor-source libvorbis-source: $(DL_DIR)/$(TREMOR_SOURCE) diff --git a/package/multimedia/madplay/madplay.mk b/package/multimedia/madplay/madplay.mk index d8219b727..ca46c824b 100644 --- a/package/multimedia/madplay/madplay.mk +++ b/package/multimedia/madplay/madplay.mk @@ -52,7 +52,7 @@ $(TARGET_DIR)/$(MADPLAY_TARGET_BIN): $(MADPLAY_DIR)/$(MADPLAY_BIN) $(INSTALL) -D $(MADPLAY_DIR)/$(MADPLAY_BIN) $(TARGET_DIR)/$(MADPLAY_TARGET_BIN) $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(MADPLAY_TARGET_BIN) -madplay: uclibc $(MADPLAY_ALSA_DEP) libmad libid3tag $(TARGET_DIR)/$(MADPLAY_TARGET_BIN) +madplay: $(MADPLAY_ALSA_DEP) libmad libid3tag $(TARGET_DIR)/$(MADPLAY_TARGET_BIN) madplay-clean: rm -f $(TARGET_DIR)/$(MADPLAY_TARGET_BIN) diff --git a/package/multimedia/mpg123/mpg123.mk b/package/multimedia/mpg123/mpg123.mk index 286f43b80..9e9f0d5f3 100644 --- a/package/multimedia/mpg123/mpg123.mk +++ b/package/multimedia/mpg123/mpg123.mk @@ -53,7 +53,7 @@ $(TARGET_DIR)/$(MPG123_TARGET_BIN): $(MPG123_DIR)/$(MPG123_BIN) $(INSTALL) -D $(MPG123_DIR)/$(MPG123_BIN) $(TARGET_DIR)/$(MPG123_TARGET_BIN) $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(MPG123_TARGET_BIN) -mpg123: uclibc $(MPG123_ALSA_DEP) $(TARGET_DIR)/$(MPG123_TARGET_BIN) +mpg123: $(MPG123_ALSA_DEP) $(TARGET_DIR)/$(MPG123_TARGET_BIN) mpg123-unpacked: $(MPG123_DIR)/.unpacked diff --git a/package/multimedia/mplayer/mplayer.mk b/package/multimedia/mplayer/mplayer.mk index dd0d0abec..3d56ee007 100644 --- a/package/multimedia/mplayer/mplayer.mk +++ b/package/multimedia/mplayer/mplayer.mk @@ -76,7 +76,7 @@ $(TARGET_DIR)/$(MPLAYER_TARGET_BINARY): $(MPLAYER_DIR)/$(MPLAYER_BINARY) -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(MPLAYER_TARGET_BINARY) touch -c $@ -mplayer: uclibc $(if $(BR2_PACKAGE_LIBMAD),libmad) $(if $(BR2_PACKAGE_ALSA_LIB),alsa-lib) $(TARGET_DIR)/$(MPLAYER_TARGET_BINARY) +mplayer: $(if $(BR2_PACKAGE_LIBMAD),libmad) $(if $(BR2_PACKAGE_ALSA_LIB),alsa-lib) $(TARGET_DIR)/$(MPLAYER_TARGET_BINARY) mplayer-source: $(DL_DIR)/$(MPLAYER_SOURCE) diff --git a/package/multimedia/taglib/taglib.mk b/package/multimedia/taglib/taglib.mk index 3187f85c0..2620b971a 100644 --- a/package/multimedia/taglib/taglib.mk +++ b/package/multimedia/taglib/taglib.mk @@ -9,8 +9,6 @@ TAGLIB_SITE = http://developer.kde.org/~wheeler/files/src TAGLIB_LIBTOOL_PATCH = NO TAGLIB_INSTALL_STAGING = YES -TAGLIB_DEPENDENCIES = uclibc - TAGLIB_CONF_ENV = \ DO_NOT_COMPILE='bindings tests examples' \ ac_cv_header_cppunit_extensions_HelperMacros_h=no \ diff --git a/package/multimedia/vlc/vlc.mk b/package/multimedia/vlc/vlc.mk index b448e9414..ade429787 100644 --- a/package/multimedia/vlc/vlc.mk +++ b/package/multimedia/vlc/vlc.mk @@ -10,9 +10,5 @@ VLC_AUTORECONF = NO VLC_INSTALL_STAGING = NO VLC_INSTALL_TARGET = YES -VLC_CONF_OPT = - -VLC_DEPENDENCIES = uclibc - $(eval $(call AUTOTARGETS,package/multimedia,vlc)) diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk index 3318149f8..4a3da5d99 100644 --- a/package/mutt/mutt.mk +++ b/package/mutt/mutt.mk @@ -58,7 +58,7 @@ mutt-source: $(DL_DIR)/$(MUTT_SOURCE) $(DL_DIR)/$(MUTT_PATCH) mutt-unpacked: $(MUTT_DIR)/.unpacked -mutt: uclibc ncurses $(TARGET_DIR)/$(MUTT_TARGET_BINARY) +mutt: ncurses $(TARGET_DIR)/$(MUTT_TARGET_BINARY) mutt-clean: -$(MAKE) -C $(MUTT_DIR) clean diff --git a/package/nbd/nbd.mk b/package/nbd/nbd.mk index c480149ff..6ef108a81 100644 --- a/package/nbd/nbd.mk +++ b/package/nbd/nbd.mk @@ -37,7 +37,7 @@ $(TARGET_DIR)/sbin/nbd-client: $(NBD_DIR)/nbd-client cp $< $@ $(STRIPCMD) $@ -nbd: uclibc libglib2 $(TARGET_DIR)/sbin/nbd-client +nbd: libglib2 $(TARGET_DIR)/sbin/nbd-client nbd-source: $(DL_DIR)/$(NBD_SOURCE) diff --git a/package/netcat/netcat.mk b/package/netcat/netcat.mk index 33d8dcd93..31f6b716c 100644 --- a/package/netcat/netcat.mk +++ b/package/netcat/netcat.mk @@ -11,6 +11,4 @@ NETCAT_AUTORECONF:=NO NETCAT_INSTALL_STAGING:=NO NETCAT_INSTALL_TARGET:=YES -NETCAT_DEPENDENCIES = uclibc - $(eval $(call AUTOTARGETS,package,netcat)) diff --git a/package/netkitbase/netkitbase.mk b/package/netkitbase/netkitbase.mk index 575724c70..adb52a3f9 100644 --- a/package/netkitbase/netkitbase.mk +++ b/package/netkitbase/netkitbase.mk @@ -47,7 +47,7 @@ $(TARGET_DIR)/$(NETKITBASE_TARGET_BINARY): $(NETKITBASE_DIR)/$(NETKITBASE_BINARY fi touch -c $(TARGET_DIR)/$(NETKITBASE_TARGET_BINARY) -netkitbase: uclibc $(TARGET_DIR)/$(NETKITBASE_TARGET_BINARY) +netkitbase: $(TARGET_DIR)/$(NETKITBASE_TARGET_BINARY) netkitbase-clean: #$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(NETKITBASE_DIR) uninstall diff --git a/package/netkittelnet/netkittelnet.mk b/package/netkittelnet/netkittelnet.mk index 629d32049..33142cae9 100644 --- a/package/netkittelnet/netkittelnet.mk +++ b/package/netkittelnet/netkittelnet.mk @@ -48,7 +48,7 @@ $(TARGET_DIR)/$(NETKITTELNET_TARGET_BINARY): $(NETKITTELNET_DIR)/$(NETKITTELNET_ #rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \ # $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc -netkittelnet: uclibc netkitbase $(TARGET_DIR)/$(NETKITTELNET_TARGET_BINARY) +netkittelnet: netkitbase $(TARGET_DIR)/$(NETKITTELNET_TARGET_BINARY) netkittelnet-clean: #$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(NETKITTELNET_DIR) uninstall diff --git a/package/netplug/netplug.mk b/package/netplug/netplug.mk index 99d40f55b..33da90cb7 100644 --- a/package/netplug/netplug.mk +++ b/package/netplug/netplug.mk @@ -32,7 +32,7 @@ $(TARGET_DIR)/$(NETPLUG_TARGET_BINARY): $(NETPLUG_DIR)/$(NETPLUG_BINARY) $(INSTALL) -m 755 -D $(NETPLUG_DIR)/$(NETPLUG_BINARY) $(TARGET_DIR)/$(NETPLUG_TARGET_BINARY) touch -c $(TARGET_DIR)/$(NETPLUG_TARGET_BINARY) -netplug: uclibc $(TARGET_DIR)/$(NETPLUG_TARGET_BINARY) +netplug: $(TARGET_DIR)/$(NETPLUG_TARGET_BINARY) netplug-clean: rm -f $(TARGET_DIR)/$(NETPLUG_TARGET_BINARY) diff --git a/package/netstat-nat/netstat-nat.mk b/package/netstat-nat/netstat-nat.mk index 4847283f7..a3d4309f2 100644 --- a/package/netstat-nat/netstat-nat.mk +++ b/package/netstat-nat/netstat-nat.mk @@ -7,6 +7,5 @@ NETSTAT_NAT_VERSION = 1.4.9 NETSTAT_NAT_SOURCE = netstat-nat-$(NETSTAT_NAT_VERSION).tar.gz NETSTAT_NAT_SITE = http://tweegy.nl/download -NETSTAT_NAT_DEPENDENCIES = uclibc $(eval $(call AUTOTARGETS,package,netstat-nat)) diff --git a/package/newt/newt.mk b/package/newt/newt.mk index f754090cf..f0faff5af 100644 --- a/package/newt/newt.mk +++ b/package/newt/newt.mk @@ -58,7 +58,7 @@ $(TARGET_DIR)/usr/lib/libnewt.so.$(NEWT_VERSION): $(STAGING_DIR)/usr/lib/libnewt -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libnewt.so* touch -c $@ -newt: uclibc slang $(TARGET_DIR)/usr/lib/libnewt.so.$(NEWT_VERSION) +newt: slang $(TARGET_DIR)/usr/lib/libnewt.so.$(NEWT_VERSION) newt-source: $(DL_DIR)/$(NEWT_SOURCE) diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk index f463de110..e47bf3765 100644 --- a/package/nfs-utils/nfs-utils.mk +++ b/package/nfs-utils/nfs-utils.mk @@ -73,7 +73,7 @@ $(PROJECT_BUILD_DIR)/.fakeroot.nfs-utils: $(NFS_UTILS_DIR)/$(NFS_UTILS_BINARY) $(TARGET_DIR)/$(NFS_UTILS_TARGET_BINARY): $(PROJECT_BUILD_DIR)/.fakeroot.nfs-utils touch -c $@ -nfs-utils: uclibc host-fakeroot $(TARGET_DIR)/$(NFS_UTILS_TARGET_BINARY) +nfs-utils: host-fakeroot $(TARGET_DIR)/$(NFS_UTILS_TARGET_BINARY) nfs-utils-clean: rm -f $(TARGET_DIR)/etc/init.d/S60nfs diff --git a/package/ng-spice-rework/ng-spice-rework.mk b/package/ng-spice-rework/ng-spice-rework.mk index 61b6940db..45236479d 100644 --- a/package/ng-spice-rework/ng-spice-rework.mk +++ b/package/ng-spice-rework/ng-spice-rework.mk @@ -13,7 +13,5 @@ NG_SPICE_REWORK_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install NG_SPICE_REWORK_CONF_OPT = CFLAGS="-I$(STAGING_DIR)/usr/include" -NG-SPICE-REWORK_DEPENDENCIES = uclibc - $(eval $(call AUTOTARGETS,package,ng-spice-rework)) diff --git a/package/ntp/ntp.mk b/package/ntp/ntp.mk index 0b051e9a8..1365fb8f6 100644 --- a/package/ntp/ntp.mk +++ b/package/ntp/ntp.mk @@ -72,7 +72,7 @@ endif install -m 644 package/ntp/ntpd.etc.default $(TARGET_DIR)/etc/default/ntpd ; \ fi -ntp: uclibc $(TARGET_DIR)/$(NTP_TARGET_BINARY) +ntp: $(TARGET_DIR)/$(NTP_TARGET_BINARY) ntp-clean: rm -f $(TARGET_DIR)/usr/sbin/ntpd $(TARGET_DIR)/usr/bin/sntp \ diff --git a/package/olsr/olsr.mk b/package/olsr/olsr.mk index fffc7c119..91076539a 100644 --- a/package/olsr/olsr.mk +++ b/package/olsr/olsr.mk @@ -41,7 +41,7 @@ $(TARGET_DIR)/$(OLSR_TARGET_BINARY): $(OLSR_DIR)/$(OLSR_BINARY) -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(OLSR_TARGET_PLUGIN)/olsrd_*.so* $(STRIPCMD) $(STRIP_STRIP_ALL) $@ -olsr: uclibc $(TARGET_DIR)/$(OLSR_TARGET_BINARY) +olsr: $(TARGET_DIR)/$(OLSR_TARGET_BINARY) olsr-clean: rm -f $(TARGET_DIR)/$(OLSR_TARGET_BINARY) \ diff --git a/package/openmotif/openmotif.mk b/package/openmotif/openmotif.mk index bba952bda..e97dc47bf 100644 --- a/package/openmotif/openmotif.mk +++ b/package/openmotif/openmotif.mk @@ -75,7 +75,7 @@ $(OPENMOTIF_DIR)/.done: $(OPENMOTIF_HOST_DIR)/.done $(MAKE) -C $(OPENMOTIF_DIR) install DESTDIR=$(TARGET_DIR) touch $(OPENMOTIF_DIR)/.done -openmotif: uclibc $(OPENMOTIF_DIR)/.done +openmotif: $(OPENMOTIF_DIR)/.done openmotif-clean: rm -f $(TARGET_DIR)/bin/openmotif diff --git a/package/openntpd/openntpd.mk b/package/openntpd/openntpd.mk index da03ca0f6..9bb3d51ff 100644 --- a/package/openntpd/openntpd.mk +++ b/package/openntpd/openntpd.mk @@ -58,7 +58,7 @@ ifneq ($(BR2_HAVE_MANPAGES),y) rm -Rf $(TARGET_DIR)/usr/share/man endif -ntpd: uclibc $(TARGET_DIR)/$(OPENNTPD_TARGET_BINARY) +ntpd: $(TARGET_DIR)/$(OPENNTPD_TARGET_BINARY) ntpd-source: $(DL_DIR)/$(OPENNTPD_SOURCE) diff --git a/package/openswan/openswan.mk b/package/openswan/openswan.mk index 5585e555f..8fcaeec2e 100644 --- a/package/openswan/openswan.mk +++ b/package/openswan/openswan.mk @@ -47,7 +47,7 @@ $(TARGET_DIR)/$(OPENSWAN_TARGET_BINARY): $(OPENSWAN_DIR)/$(OPENSWAN_BINARY) rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \ $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc -openswan: uclibc libgmp kernel-headers $(TARGET_DIR)/$(OPENSWAN_TARGET_BINARY) +openswan: libgmp kernel-headers $(TARGET_DIR)/$(OPENSWAN_TARGET_BINARY) openswan-clean: $(MAKE) DESTDIR=$(TARGET_DIR) -C $(OPENSWAN_DIR) uninstall diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index 56dc03dd1..bfacc4185 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -7,7 +7,7 @@ OPENVPN_VERSION = 2.0.9 OPENVPN_SOURCE = openvpn-$(OPENVPN_VERSION).tar.gz OPENVPN_SITE = http://openvpn.net/release -OPENVPN_DEPENDENCIES = lzo openssl uclibc +OPENVPN_DEPENDENCIES = lzo openssl OPENVPN_CONF_OPT = --enable-small diff --git a/package/pango/pango.mk b/package/pango/pango.mk index 2bcebf3b7..b66baf212 100644 --- a/package/pango/pango.mk +++ b/package/pango/pango.mk @@ -43,7 +43,7 @@ PANGO_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \ PANGO_CONF_OPT = --enable-shared --enable-static \ --enable-explicit-deps=no --disable-debug -PANGO_DEPENDENCIES = uclibc gettext libintl host-pkgconfig libglib2 cairo +PANGO_DEPENDENCIES = gettext libintl host-pkgconfig libglib2 cairo ifeq ($(BR2_PACKAGE_XORG7),y) PANGO_CONF_OPT += --with-x \ diff --git a/package/patch/patch.mk b/package/patch/patch.mk index b333b080a..397dde926 100644 --- a/package/patch/patch.mk +++ b/package/patch/patch.mk @@ -52,7 +52,7 @@ $(TARGET_DIR)/$(GNUPATCH_TARGET_BINARY): $(GNUPATCH_DIR)/$(GNUPATCH_BINARY) rm -f $(TARGET_DIR)/$(GNUPATCH_TARGET_BINARY) cp -a $(GNUPATCH_DIR)/$(GNUPATCH_BINARY) $(TARGET_DIR)/$(GNUPATCH_TARGET_BINARY) -patch: uclibc $(TARGET_DIR)/$(GNUPATCH_TARGET_BINARY) +patch: $(TARGET_DIR)/$(GNUPATCH_TARGET_BINARY) patch-clean: rm -f $(TARGET_DIR)/$(GNUPATCH_TARGET_BINARY) diff --git a/package/pciutils/pciutils.mk b/package/pciutils/pciutils.mk index 976afbf17..7b19c5b10 100644 --- a/package/pciutils/pciutils.mk +++ b/package/pciutils/pciutils.mk @@ -59,7 +59,7 @@ $(TARGET_DIR)/sbin/setpci: $(PCIUTILS_DIR)/.compiled $(TARGET_DIR)/usr/share/misc/$(PCIIDS_FILE): $(PCIUTILS_DIR)/.unpacked $(INSTALL) -D $(PCIUTILS_DIR)/$(PCIIDS_FILE) $@ -pciutils: uclibc $(if $(BR2_PACKAGE_ZLIB),zlib) $(TARGET_DIR)/sbin/setpci $(TARGET_DIR)/sbin/lspci $(TARGET_DIR)/usr/share/misc/$(PCIIDS_FILE) +pciutils: $(if $(BR2_PACKAGE_ZLIB),zlib) $(TARGET_DIR)/sbin/setpci $(TARGET_DIR)/sbin/lspci $(TARGET_DIR)/usr/share/misc/$(PCIIDS_FILE) pciutils-source: $(DL_DIR)/$(PCIUTILS_SOURCE) $(DL_DIR)/$(PCIIDS_SOURCE) diff --git a/package/pcmanfm/pcmanfm.mk b/package/pcmanfm/pcmanfm.mk index 4c8b59518..217893baa 100644 --- a/package/pcmanfm/pcmanfm.mk +++ b/package/pcmanfm/pcmanfm.mk @@ -12,7 +12,7 @@ PCMANFM_INSTALL_TARGET = YES PCMANFM_CONF_OPT = --disable-hal -PCMANFM_DEPENDENCIES = uclibc host-pkgconfig libgtk2 gamin startup-notification +PCMANFM_DEPENDENCIES = host-pkgconfig libgtk2 gamin startup-notification $(eval $(call AUTOTARGETS,package,pcmanfm)) diff --git a/package/pcmcia/pcmcia.mk b/package/pcmcia/pcmcia.mk index 281f0ba8a..7cea886a8 100644 --- a/package/pcmcia/pcmcia.mk +++ b/package/pcmcia/pcmcia.mk @@ -95,7 +95,7 @@ $(PCMCIA_DIR)/.modules.dep: $(BUSYBOX_DIR)/.configured $(TARGET_DIR)/lib/modules > $(TARGET_DIR)/lib/modules/$(LINUX26_VERSION)/modules.dep touch $(PCMCIA_DIR)/.modules.dep -pcmcia: uclibc linux26 $(TARGET_DIR)/sbin/cardmgr $(PCMCIA_DIR)/.modules.dep +pcmcia: linux26 $(TARGET_DIR)/sbin/cardmgr $(PCMCIA_DIR)/.modules.dep pcmcia-clean: rm -f $(TARGET_DIR)/sbin/cardmgr diff --git a/package/pcre/pcre.mk b/package/pcre/pcre.mk index dd473b491..647399ea0 100644 --- a/package/pcre/pcre.mk +++ b/package/pcre/pcre.mk @@ -14,8 +14,6 @@ ifneq ($(BR2_INSTALL_LIBSTDCPP),y) PCRE_CONF_OPT = --disable-cpp endif -PCRE_DEPENDENCIES = uclibc - $(eval $(call AUTOTARGETS,package,pcre)) $(PCRE_HOOK_POST_INSTALL): $(PCRE_TARGET_INSTALL_TARGET) diff --git a/package/php/php.mk b/package/php/php.mk index eb801a7c3..1f4c7d129 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -11,7 +11,7 @@ PHP_INSTALL_STAGING = YES PHP_INSTALL_STAGING_OPT = INSTALL_ROOT=$(STAGING_DIR) install PHP_INSTALL_TARGET_OPT = INSTALL_ROOT=$(TARGET_DIR) install PHP_LIBTOOL_PATCH = NO -PHP_DEPENDENCIES = uclibc +PHP_DEPENDENCIES = PHP_CONF_OPT = $(DISABLE_IPV6) \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ diff --git a/package/pkg-config/pkg-config.mk b/package/pkg-config/pkg-config.mk index 5b88bf922..853e05db7 100644 --- a/package/pkg-config/pkg-config.mk +++ b/package/pkg-config/pkg-config.mk @@ -11,7 +11,7 @@ ifeq ($(BR2_ENABLE_DEBUG),y) # install-exec doesn't install aclocal stuff PKG_CONFIG_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install endif -PKG_CONFIG_DEPENDENCIES = uclibc libglib2 +PKG_CONFIG_DEPENDENCIES = libglib2 PKG_CONFIG_CONF_OPT = --with-installed-glib diff --git a/package/popt/popt.mk b/package/popt/popt.mk index 4c5702834..ed8cddd54 100644 --- a/package/popt/popt.mk +++ b/package/popt/popt.mk @@ -17,6 +17,4 @@ POPT_CONF_ENV += am_cv_lib_iconv=yes POPT_CONF_OPT += --with-libiconv-prefix=$(STAGING_DIR)/usr endif -POPT_DEPENDENCIES:=uclibc - $(eval $(call AUTOTARGETS,package,popt)) diff --git a/package/portage/portage.mk b/package/portage/portage.mk index a4d6b9d89..3661e9bcc 100644 --- a/package/portage/portage.mk +++ b/package/portage/portage.mk @@ -131,8 +131,8 @@ $(TARGET_DIR)/$(PORTAGE_TARGET_BINARY): $(PORTAGE_DIR)/.compiled $(TARGET_DIR)/$(SANDBOX_TARGET_BINARY): $(SANDBOX_DIR)/.compiled touch $(TARGET_DIR)/$(SANDBOX_TARGET_BINARY) -sandbox: uclibc $(TARGET_DIR)/$(SANDBOX_TARGET_BINARY) -portage: sandbox python uclibc $(TARGET_DIR)/$(PORTAGE_TARGET_BINARY) +sandbox: $(TARGET_DIR)/$(SANDBOX_TARGET_BINARY) +portage: sandbox python $(TARGET_DIR)/$(PORTAGE_TARGET_BINARY) portage-clean: (cd $(TARGET_DIR)/etc; \ diff --git a/package/portmap/portmap.mk b/package/portmap/portmap.mk index 94d9c022d..789a9ed3a 100644 --- a/package/portmap/portmap.mk +++ b/package/portmap/portmap.mk @@ -28,7 +28,7 @@ $(TARGET_DIR)/$(PORTMAP_TARGET_BINARY): $(PORTMAP_DIR)/$(PORTMAP_BINARY) $(INSTALL) -D $(PORTMAP_DIR)/$(PORTMAP_BINARY) $(TARGET_DIR)/$(PORTMAP_TARGET_BINARY) $(INSTALL) -m 0755 package/portmap/S13portmap $(TARGET_DIR)/etc/init.d -portmap: uclibc $(TARGET_DIR)/$(PORTMAP_TARGET_BINARY) +portmap: $(TARGET_DIR)/$(PORTMAP_TARGET_BINARY) portmap-clean: rm -f $(TARGET_DIR)/$(PORTMAP_TARGET_BINARY) diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk index 0c25cd098..2fb7d9659 100644 --- a/package/pppd/pppd.mk +++ b/package/pppd/pppd.mk @@ -71,7 +71,7 @@ endif rm -rf $(TARGET_DIR)/usr/share/doc rm -rf $(TARGET_DIR)/usr/include/pppd -pppd: uclibc $(TARGET_DIR)/$(PPPD_TARGET_BINARY) +pppd: $(TARGET_DIR)/$(PPPD_TARGET_BINARY) pppd-clean: rm -f $(TARGET_DIR)/usr/sbin/pppd diff --git a/package/pptp-linux/pptp-linux.mk b/package/pptp-linux/pptp-linux.mk index 5b1b1f321..2a6daef44 100644 --- a/package/pptp-linux/pptp-linux.mk +++ b/package/pptp-linux/pptp-linux.mk @@ -57,7 +57,7 @@ ifeq ($(BR2_HAVE_MANPAGES),y) endif $(STRIPCMD) $(STRIP_STRIP_ALL) $@ -pptp-linux: uclibc $(TARGET_DIR)/$(PPTP_LINUX_TARGET_BINARY) +pptp-linux: $(TARGET_DIR)/$(PPTP_LINUX_TARGET_BINARY) pptp-linux-source: $(DL_DIR)/$(PPTP_LINUX_SOURCE) $(PPTP_LINUX_PATCH_FILE) diff --git a/package/procps/procps.mk b/package/procps/procps.mk index 86ca30e48..3add243f6 100644 --- a/package/procps/procps.mk +++ b/package/procps/procps.mk @@ -27,7 +27,7 @@ $(TARGET_DIR)/$(PROCPS_TARGET_BINARY): $(PROCPS_DIR)/$(PROCPS_BINARY) ldconfig='/bin/true' install rm -Rf $(TARGET_DIR)/usr/share/man -procps: uclibc ncurses $(TARGET_DIR)/$(PROCPS_TARGET_BINARY) +procps: ncurses $(TARGET_DIR)/$(PROCPS_TARGET_BINARY) procps-source: $(DL_DIR)/$(PROCPS_SOURCE) diff --git a/package/proftpd/proftpd.mk b/package/proftpd/proftpd.mk index 3773a621d..8c8a696e4 100644 --- a/package/proftpd/proftpd.mk +++ b/package/proftpd/proftpd.mk @@ -64,7 +64,7 @@ $(TARGET_DIR)/$(PROFTPD_TARGET_BINARY): $(PROFTPD_DIR)/$(PROFTPD_BINARY) fi $(INSTALL) -m 0755 package/proftpd/S50proftpd $(TARGET_DIR)/etc/init.d -proftpd: uclibc $(TARGET_DIR)/$(PROFTPD_TARGET_BINARY) +proftpd: $(TARGET_DIR)/$(PROFTPD_TARGET_BINARY) proftpd-clean: rm -f $(TARGET_DIR)/$(PROFTPD_TARGET_BINARY) diff --git a/package/psmisc/psmisc.mk b/package/psmisc/psmisc.mk index e0f82c904..90a5186dd 100644 --- a/package/psmisc/psmisc.mk +++ b/package/psmisc/psmisc.mk @@ -12,7 +12,7 @@ PSMISC_INSTALL_TARGET:=YES PSMISC_CONF_ENV:=ac_cv_func_malloc_0_nonnull=yes \ ac_cv_func_realloc_0_nonnull=yes PSMISC_CONF_OPT:= $(DISABLE_IPV6) -PSMISC_DEPENDENCIES:=uclibc ncurses +PSMISC_DEPENDENCIES:=ncurses ifeq ($(BR2_ENABLE_LOCALE),y) # psmisc gets confused and forgets to link with libintl diff --git a/package/python/python.mk b/package/python/python.mk index 6c85b1f88..cd1ccece3 100644 --- a/package/python/python.mk +++ b/package/python/python.mk @@ -167,7 +167,7 @@ ifneq ($(BR2_PACKAGE_PYTHON_TKINTER),y) rm -rf $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/lib-tk endif -python: uclibc $(PYTHON_DEPS) $(TARGET_DIR)/$(PYTHON_TARGET_BINARY) +python: $(PYTHON_DEPS) $(TARGET_DIR)/$(PYTHON_TARGET_BINARY) python-clean: -$(MAKE) -C $(PYTHON_DIR) distclean diff --git a/package/qt/qt.mk b/package/qt/qt.mk index ea59b0764..1f373ac1e 100644 --- a/package/qt/qt.mk +++ b/package/qt/qt.mk @@ -555,7 +555,7 @@ ifeq ($(BR2_PACKAGE_QT_SHARED),y) -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libQt*.so.* endif -qt: uclibc $(QT_DEP_LIBS) $(TARGET_DIR)/usr/lib/libQtCore.so.4 +qt: $(QT_DEP_LIBS) $(TARGET_DIR)/usr/lib/libQtCore.so.4 qt-clean: -$(MAKE) -C $(QT_TARGET_DIR) clean diff --git a/package/quagga/quagga.mk b/package/quagga/quagga.mk index 8ffc1567b..a39ebac15 100644 --- a/package/quagga/quagga.mk +++ b/package/quagga/quagga.mk @@ -166,7 +166,7 @@ ifneq ($(BR2_HAVE_INFOPAGES),y) rm -rf $(TARGET_DIR)/usr/info endif -quagga: uclibc $(TARGET_DIR)/usr/sbin/$(QUAGGA_TARGET_BINARY) +quagga: $(TARGET_DIR)/usr/sbin/$(QUAGGA_TARGET_BINARY) quagga-clean: -$(MAKE) DESTDIR=$(TARGET_DIR) -C $(QUAGGA_DIR) uninstall diff --git a/package/radvd/radvd.mk b/package/radvd/radvd.mk index 268c26d00..07b7224bc 100644 --- a/package/radvd/radvd.mk +++ b/package/radvd/radvd.mk @@ -9,7 +9,7 @@ RADVD_SITE:=http://www.litech.org/radvd/dist/ RADVD_AUTORECONF:=no RADVD_INSTALL_STAGING:=no RADVD_INSTALL_TARGET:=YES -RADVD_DEPENDENCIES:=uclibc flex +RADVD_DEPENDENCIES:=flex RADVD_MAKE:=$(MAKE1) RADVD_CONF_OPT:= --program-prefix='' diff --git a/package/rdesktop/rdesktop.mk b/package/rdesktop/rdesktop.mk index e94fd77ed..61216992c 100644 --- a/package/rdesktop/rdesktop.mk +++ b/package/rdesktop/rdesktop.mk @@ -38,7 +38,7 @@ $(RDESKTOP_DIR)/rdesktop: $(RDESKTOP_DIR)/.configured $(TARGET_DIR)/usr/bin/rdesktop: $(RDESKTOP_DIR)/rdesktop cp $^ $@ -rdesktop: uclibc openssl xserver_xorg-server $(TARGET_DIR)/usr/bin/rdesktop +rdesktop: openssl xserver_xorg-server $(TARGET_DIR)/usr/bin/rdesktop rdesktop-source: $(DL_DIR)/$(RDESKTOP_SOURCE) diff --git a/package/rp-pppoe/rp-pppoe.mk b/package/rp-pppoe/rp-pppoe.mk index 2ca463e56..ad840f52f 100644 --- a/package/rp-pppoe/rp-pppoe.mk +++ b/package/rp-pppoe/rp-pppoe.mk @@ -59,7 +59,7 @@ ifeq ($(BR2_HAVE_MANPAGES),y) endif $(STRIPCMD) $(STRIP_STRIP_ALL) $@ -rp-pppoe: uclibc $(TARGET_DIR)/$(RP_PPPOE_TARGET_BINARY) +rp-pppoe: $(TARGET_DIR)/$(RP_PPPOE_TARGET_BINARY) rp-pppoe-source: $(DL_DIR)/$(RP_PPPOE_SOURCE) $(RP_PPPOE_PATCH_FILE) diff --git a/package/rsync/rsync.mk b/package/rsync/rsync.mk index bf789df67..e24a38c74 100644 --- a/package/rsync/rsync.mk +++ b/package/rsync/rsync.mk @@ -20,6 +20,4 @@ RSYNC_INSTALL_TARGET_OPT:=DESTDIR=$(TARGET_DIR) INSTALLCMD='./install-sh -c' \ endif RSYNC_CONF_OPT:=--with-included-popt -RSYNC_DEPENDENCIES:=uclibc - $(eval $(call AUTOTARGETS,package,rsync)) diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk index 3bfd54202..e5ee3a2cd 100644 --- a/package/ruby/ruby.mk +++ b/package/ruby/ruby.mk @@ -55,7 +55,7 @@ $(TARGET_DIR)/$(RUBY_TARGET_BINARY): $(RUBY_DIR)/$(RUBY_BINARY) $(MAKE) DESTDIR=$(TARGET_DIR) -C $(RUBY_DIR) install rm -rf $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc -ruby: uclibc $(TARGET_DIR)/$(RUBY_TARGET_BINARY) +ruby: $(TARGET_DIR)/$(RUBY_TARGET_BINARY) ruby-clean: $(MAKE) DESTDIR=$(TARGET_DIR) -C $(RUBY_DIR) uninstall diff --git a/package/sdl/sdl.mk b/package/sdl/sdl.mk index 2cdead2cd..b3b33cc02 100644 --- a/package/sdl/sdl.mk +++ b/package/sdl/sdl.mk @@ -96,7 +96,7 @@ $(TARGET_DIR)/usr/lib/libSDL.so: $(STAGING_DIR)/usr/lib/libSDL.so cp -dpf $(STAGING_DIR)/usr/lib/libSDL*.so* $(TARGET_DIR)/usr/lib/ -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libSDL.so -SDL sdl: uclibc $(TARGET_DIR)/usr/lib/libSDL.so +SDL sdl: $(TARGET_DIR)/usr/lib/libSDL.so sdl-unpacked: $(SDL_DIR)/.unpacked diff --git a/package/sdl_image/sdl_image.mk b/package/sdl_image/sdl_image.mk index 382c0b18e..127a2922b 100644 --- a/package/sdl_image/sdl_image.mk +++ b/package/sdl_image/sdl_image.mk @@ -27,7 +27,7 @@ SDL_IMAGE_CONF_OPT:=--with-sdl-prefix=$(STAGING_DIR)/usr \ --enable-xpm=$(if $(BR2_PACKAGE_SDL_IMAGE_XPM),yes,no) \ --enable-xv=$(if $(BR2_PACKAGE_SDL_IMAGE_XV),yes,no) \ -SDL_IMAGE_DEPENDENCIES:=uclibc sdl \ +SDL_IMAGE_DEPENDENCIES:=sdl \ $(if $(BR2_PACKAGE_SDL_IMAGE_JPEG),jpeg) \ $(if $(BR2_PACKAGE_SDL_IMAGE_PNG),libpng) \ $(if $(BR2_PACKAGE_SDL_IMAGE_TIFF),tiff) diff --git a/package/sdl_mixer/sdl_mixer.mk b/package/sdl_mixer/sdl_mixer.mk index ab8b59181..e8a28a86b 100644 --- a/package/sdl_mixer/sdl_mixer.mk +++ b/package/sdl_mixer/sdl_mixer.mk @@ -48,7 +48,7 @@ $(TARGET_DIR)/usr/lib/libSDL_mixer.so: $(STAGING_DIR)/usr/lib/libSDL_mixer.so cp -dpf $(STAGING_DIR)/usr/lib/libSDL_mixer*.so* $(TARGET_DIR)/usr/lib/ -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libSDL_mixer*.so* -sdl_mixer: sdl uclibc $(TARGET_DIR)/usr/lib/libSDL_mixer.so +sdl_mixer: sdl $(TARGET_DIR)/usr/lib/libSDL_mixer.so sdl_mixer-clean: rm -f $(TARGET_DIR)/usr/lib/libSDL_mixer*.so* diff --git a/package/sdl_ttf/sdl_ttf.mk b/package/sdl_ttf/sdl_ttf.mk index 45d63ca51..7d2b61aab 100644 --- a/package/sdl_ttf/sdl_ttf.mk +++ b/package/sdl_ttf/sdl_ttf.mk @@ -60,7 +60,7 @@ $(TARGET_DIR)/usr/lib/libSDL_ttf.so: $(STAGING_DIR)/usr/lib/libSDL_ttf.so cp -dpf $(STAGING_DIR)/usr/lib/libSDL_ttf*.so* $(TARGET_DIR)/usr/lib/ -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libSDL_ttf.so -sdl_ttf: uclibc sdl $(TARGET_DIR)/usr/lib/libSDL_ttf.so +sdl_ttf: sdl $(TARGET_DIR)/usr/lib/libSDL_ttf.so sdl_ttf-clean: $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(SDL_TTF_DIR) uninstall diff --git a/package/sed/sed.mk b/package/sed/sed.mk index 07f4b32c6..4d5313bf2 100644 --- a/package/sed/sed.mk +++ b/package/sed/sed.mk @@ -159,7 +159,7 @@ ifneq ($(BR2_HAVE_MANPAGES),y) rm -rf $(TARGET_DIR)/usr/share/man endif -sed: uclibc sed-target_binary +sed: sed-target_binary sed-clean: $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(SED_DIR2) uninstall diff --git a/package/setserial/setserial.mk b/package/setserial/setserial.mk index 73ef6015e..127505907 100644 --- a/package/setserial/setserial.mk +++ b/package/setserial/setserial.mk @@ -61,7 +61,7 @@ $(TARGET_DIR)/$(SETSERIAL_TARGET_BINARY): $(SETSERIAL_DIR)/$(SETSERIAL_BINARY) install -c $(SETSERIAL_DIR)/$(SETSERIAL_BINARY) $(TARGET_DIR)/$(SETSERIAL_TARGET_BINARY) $(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/$(SETSERIAL_TARGET_BINARY) -setserial: uclibc $(TARGET_DIR)/$(SETSERIAL_TARGET_BINARY) +setserial: $(TARGET_DIR)/$(SETSERIAL_TARGET_BINARY) setserial-source: $(DL_DIR)/$(SETSERIAL_SOURCE) $(SETSERIAL_PATCH) diff --git a/package/sfdisk/sfdisk.mk b/package/sfdisk/sfdisk.mk index e91d06a5c..87a3f047c 100644 --- a/package/sfdisk/sfdisk.mk +++ b/package/sfdisk/sfdisk.mk @@ -29,7 +29,7 @@ $(TARGET_DIR)/sbin/sfdisk: $(SFDISK_DIR)/sfdisk cp $(SFDISK_DIR)/sfdisk $(TARGET_DIR)/sbin/sfdisk touch -c $(TARGET_DIR)/sbin/sfdisk -sfdisk: uclibc $(TARGET_DIR)/sbin/sfdisk +sfdisk: $(TARGET_DIR)/sbin/sfdisk sfdisk-source: $(DL_DIR)/$(SFDISK_SOURCE) diff --git a/package/shared-mime-info/shared-mime-info.mk b/package/shared-mime-info/shared-mime-info.mk index f219a647d..578be4b39 100644 --- a/package/shared-mime-info/shared-mime-info.mk +++ b/package/shared-mime-info/shared-mime-info.mk @@ -12,7 +12,7 @@ SHARED_MIME_INFO_INSTALL_TARGET = NO SHARED_MIME_INFO_AUTORECONF = NO SHARED_MIME_INFO_CONF_ENV = XMLLINT=$(HOST_DIR)/usr/bin/xmllint -SHARED_MIME_INFO_DEPENDENCIES = uclibc host-pkgconfig host-libglib2 host-libxml2 +SHARED_MIME_INFO_DEPENDENCIES = host-pkgconfig host-libglib2 host-libxml2 SHARED_MIME_INFO_CONF_OPT = --disable-update-mimedb diff --git a/package/slang/slang.mk b/package/slang/slang.mk index 876cea255..42ca9ab53 100644 --- a/package/slang/slang.mk +++ b/package/slang/slang.mk @@ -30,7 +30,7 @@ $(TARGET_DIR)/usr/lib/libslang.so.1: $(STAGING_DIR)/usr/lib/libslang.so.1 cp -dpf $(STAGING_DIR)/usr/lib/libslang.so* $(TARGET_DIR)/usr/lib/ -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libslang.so* -slang: uclibc $(STAGING_DIR)/usr/lib/libslang.so.1 $(TARGET_DIR)/usr/lib/libslang.so.1 +slang: $(STAGING_DIR)/usr/lib/libslang.so.1 $(TARGET_DIR)/usr/lib/libslang.so.1 slang-source: $(DL_DIR)/$(SLANG_SOURCE) diff --git a/package/smartmontools/smartmontools.mk b/package/smartmontools/smartmontools.mk index bf2b1fe12..3c38266d6 100644 --- a/package/smartmontools/smartmontools.mk +++ b/package/smartmontools/smartmontools.mk @@ -59,7 +59,7 @@ $(TARGET_DIR)/$(SMARTMONTOOLS_TARGET_BINARY): $(SMARTMONTOOLS_DIR)/$(SMARTMONTOO $(TARGET_DIR)/$(SMARTMONTOOLS_TARGET_BINARY2): $(SMARTMONTOOLS_DIR)/$(SMARTMONTOOLS_BINARY) cp $(SMARTMONTOOLS_DIR)/$(SMARTMONTOOLS_BINARY2) $(TARGET_DIR)/usr/sbin/ -smartmontools: uclibc $(TARGET_DIR)/$(SMARTMONTOOLS_TARGET_BINARY) +smartmontools: $(TARGET_DIR)/$(SMARTMONTOOLS_TARGET_BINARY) smartmontools-clean: $(MAKE) DESTDIR=$(TARGET_DIR) -C $(SMARTMONTOOLS_DIR) uninstall diff --git a/package/socat/socat.mk b/package/socat/socat.mk index d45b30660..6276a6a02 100644 --- a/package/socat/socat.mk +++ b/package/socat/socat.mk @@ -86,7 +86,7 @@ $(TARGET_DIR)/usr/bin/socat: $(SOCAT_WORKDIR)/socat $(MAKE) -C $(SOCAT_WORKDIR) install prefix=$(TARGET_DIR)/usr DESTDIR=$(TARGET_DIR) touch $@ -socat: uclibc $(TARGET_DIR)/usr/bin/socat +socat: $(TARGET_DIR)/usr/bin/socat socat-source: $(DL_DIR)/$(SOCAT_SOURCE) diff --git a/package/startup-notification/startup-notification.mk b/package/startup-notification/startup-notification.mk index 6526f21f5..62f067ac6 100644 --- a/package/startup-notification/startup-notification.mk +++ b/package/startup-notification/startup-notification.mk @@ -12,7 +12,5 @@ STARTUP_NOTIFICATION_INSTALL_TARGET = YES STARTUP_NOTIFICATION_CONF_ENV = lf_cv_sane_realloc=yes -STARTUP_NOTIFICATION_DEPENDENCIES = uclibc - $(eval $(call AUTOTARGETS,package,startup-notification)) diff --git a/package/strace/strace.mk b/package/strace/strace.mk index d27afaa3c..3d5087941 100644 --- a/package/strace/strace.mk +++ b/package/strace/strace.mk @@ -10,8 +10,6 @@ STRACE_AUTORECONF:=NO STRACE_INSTALL_STAGING:=NO STRACE_INSTALL_TARGET:=YES -STRACE_DEPENDENCIES:=uclibc - STRACE_CONF_ENV:= ac_cv_header_linux_if_packet_h=yes \ ac_cv_header_linux_netlink_h=yes \ $(if $(BR2_LARGEFILE),ac_cv_type_stat64=yes,ac_cv_type_stat64=no) diff --git a/package/stunnel/stunnel.mk b/package/stunnel/stunnel.mk index 1af0e6be3..205fc1b04 100644 --- a/package/stunnel/stunnel.mk +++ b/package/stunnel/stunnel.mk @@ -62,7 +62,7 @@ ifeq ($(BR2_CROSS_TOOLCHAIN_TARGET_UTILS),y) $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/target_utils/stunnel endif -stunnel: uclibc $(TARGET_DIR)/usr/bin/stunnel +stunnel: $(TARGET_DIR)/usr/bin/stunnel stunnel-clean: -$(MAKE) -C $(STUNNEL_DIR) clean diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk index 0138373ca..d9ba74991 100644 --- a/package/sudo/sudo.mk +++ b/package/sudo/sudo.mk @@ -74,7 +74,7 @@ $(TARGET_DIR)/usr/bin/sudo: $(SUDO_DIR)/sudo $(INSTALL) -m 0440 -D $(SUDO_DIR)/sudoers $(TARGET_DIR)/etc/sudoers touch -c $(TARGET_DIR)/usr/bin/sudo -sudo: uclibc $(TARGET_DIR)/usr/bin/sudo +sudo: $(TARGET_DIR)/usr/bin/sudo sudo-unpacked: $(SUDO_DIR)/.unpacked diff --git a/package/sylpheed/sylpheed.mk b/package/sylpheed/sylpheed.mk index c4cb53d77..19985237d 100644 --- a/package/sylpheed/sylpheed.mk +++ b/package/sylpheed/sylpheed.mk @@ -13,7 +13,7 @@ SYLPHEED_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install SYLPHEED_CONF_OPT = --disable-gtkspell --program-prefix="" -SYLPHEED_DEPENDENCIES = uclibc host-pkgconfig +SYLPHEED_DEPENDENCIES = host-pkgconfig $(eval $(call AUTOTARGETS,package,sylpheed)) diff --git a/package/synergy/synergy.mk b/package/synergy/synergy.mk index 763e57b0c..f29835173 100644 --- a/package/synergy/synergy.mk +++ b/package/synergy/synergy.mk @@ -14,6 +14,6 @@ SYNERGY_INSTALL_TARGET = YES SYNERGY_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \ --build=$(GNU_HOST_NAME) --prefix=/usr --sysconfdir=/etc -SYNERGY_DEPENDENCIES = uclibc xserver_xorg-server +SYNERGY_DEPENDENCIES = xserver_xorg-server $(eval $(call AUTOTARGETS,package,synergy)) diff --git a/package/sysklogd/sysklogd.mk b/package/sysklogd/sysklogd.mk index 515d9fbd9..7333dfd5b 100644 --- a/package/sysklogd/sysklogd.mk +++ b/package/sysklogd/sysklogd.mk @@ -39,7 +39,7 @@ $(TARGET_DIR)/$(SYSKLOGD_TARGET_BINARY): $(SYSKLOGD_DIR)/$(SYSKLOGD_BINARY) $(INSTALL) -m 0644 -D package/sysklogd/syslog.conf $(TARGET_DIR)/etc/syslog.conf; \ fi -sysklogd: uclibc $(TARGET_DIR)/$(SYSKLOGD_TARGET_BINARY) +sysklogd: $(TARGET_DIR)/$(SYSKLOGD_TARGET_BINARY) sysklogd-clean: rm -f $(TARGET_DIR)/$(SYSKLOGD_SYSLOGD_TARGET_BINARY) diff --git a/package/sysvinit/sysvinit.mk b/package/sysvinit/sysvinit.mk index c3ded2dcb..6309e3e19 100644 --- a/package/sysvinit/sysvinit.mk +++ b/package/sysvinit/sysvinit.mk @@ -28,7 +28,7 @@ $(TARGET_DIR)/$(SYSVINIT_TARGET_BINARY): $(SYSVINIT_DIR)/$(SYSVINIT_BINARY) install -D $(SYSVINIT_DIR)/src/$$x $(TARGET_DIR)/sbin/$$x || exit 1; \ done -sysvinit: uclibc ncurses $(TARGET_DIR)/$(SYSVINIT_TARGET_BINARY) +sysvinit: ncurses $(TARGET_DIR)/$(SYSVINIT_TARGET_BINARY) sysvinit-source: $(DL_DIR)/$(SYSVINIT_SOURCE) diff --git a/package/tar/tar.mk b/package/tar/tar.mk index 6480481ef..55d9ead9a 100644 --- a/package/tar/tar.mk +++ b/package/tar/tar.mk @@ -65,7 +65,7 @@ tar-target_binary: $(GNUTAR_DIR)/$(GNUTAR_BINARY) $(TARGET_DIR)/$(GNUTAR_TARGET_BINARY); \ fi -tar: uclibc tar-target_binary +tar: tar-target_binary tar-clean: $(MAKE) DESTDIR=$(TARGET_DIR) -C $(GNUTAR_DIR) uninstall diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk index d5278aa66..a8fcb583c 100644 --- a/package/tcl/tcl.mk +++ b/package/tcl/tcl.mk @@ -47,7 +47,7 @@ $(TARGET_DIR)/usr/lib/libtcl8.4.so: $(TCL_DIR)/unix/libtcl8.4.so rm -f $(TARGET_DIR)/usr/bin/tclsh8.4; \ fi -tcl: uclibc $(TARGET_DIR)/usr/lib/libtcl8.4.so +tcl: $(TARGET_DIR)/usr/lib/libtcl8.4.so tcl-source: $(DL_DIR)/$(TCL_SOURCE) diff --git a/package/tcpdump/dhcpdump.mk b/package/tcpdump/dhcpdump.mk index bb798bd5a..850bef2c9 100644 --- a/package/tcpdump/dhcpdump.mk +++ b/package/tcpdump/dhcpdump.mk @@ -44,7 +44,7 @@ $(DHCPDUMP_DIR)/dhcpdump: $(DHCPDUMP_DIR)/.configured $(TARGET_DIR)/usr/sbin/dhcpdump: $(DHCPDUMP_DIR)/dhcpdump cp -af $< $@ -dhcpdump: uclibc zlib libpcap $(TARGET_DIR)/usr/sbin/dhcpdump +dhcpdump: zlib libpcap $(TARGET_DIR)/usr/sbin/dhcpdump dhcpdump-clean: rm -f $(TARGET_DIR)/usr/sbin/dhcpdump diff --git a/package/tcpdump/tcpdump.mk b/package/tcpdump/tcpdump.mk index 8ced860bf..63082f082 100644 --- a/package/tcpdump/tcpdump.mk +++ b/package/tcpdump/tcpdump.mk @@ -60,7 +60,7 @@ $(TARGET_DIR)/usr/sbin/tcpdump: $(TCPDUMP_DIR)/tcpdump cp -f $< $@ $(STRIPCMD) $@ -tcpdump: uclibc zlib libpcap $(TARGET_DIR)/usr/sbin/tcpdump +tcpdump: zlib libpcap $(TARGET_DIR)/usr/sbin/tcpdump tcpdump-clean: rm -f $(TARGET_DIR)/usr/sbin/tcpdump diff --git a/package/tftpd/tftpd.mk b/package/tftpd/tftpd.mk index 621961c4f..927fab64f 100644 --- a/package/tftpd/tftpd.mk +++ b/package/tftpd/tftpd.mk @@ -61,7 +61,7 @@ $(TARGET_DIR)/$(TFTP_HPA_TARGET_BINARY): $(TFTP_HPA_DIR)/$(TFTP_HPA_BINARY) $(INSTALL) -m 0755 package/tftpd/S80tftpd-hpa $(TARGET_DIR)/etc/init.d; \ fi -tftpd: uclibc $(TARGET_DIR)/$(TFTP_HPA_TARGET_BINARY) +tftpd: $(TARGET_DIR)/$(TFTP_HPA_TARGET_BINARY) tftpd-clean: rm -f $(TARGET_DIR)/etc/init.d/S80tftpd-hpa diff --git a/package/thttpd/thttpd.mk b/package/thttpd/thttpd.mk index 2d71703df..63f33a0b9 100644 --- a/package/thttpd/thttpd.mk +++ b/package/thttpd/thttpd.mk @@ -57,7 +57,7 @@ $(TARGET_DIR)/$(THTTPD_TARGET_BINARY): $(THTTPD_DIR)/$(THTTPD_BINARY) echo "pidfile=/var/run/thttpd.pid" >> $(TARGET_DIR)$(THTTPD_WEB_DIR)/thttpd_config echo "thttpd test page" > $(TARGET_DIR)$(THTTPD_WEB_DIR)/data/index.html -thttpd: uclibc $(TARGET_DIR)/$(THTTPD_TARGET_BINARY) +thttpd: $(TARGET_DIR)/$(THTTPD_TARGET_BINARY) thttpd-clean: rm -f $(TARGET_DIR)/$(THTTPD_TARGET_BINARY) diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index 38e17482c..9ec06a8ee 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -15,7 +15,7 @@ TIFF_CONF_OPT = \ --disable-cxx \ --without-x \ -TIFF_DEPENDENCIES = uclibc host-pkgconfig zlib jpeg +TIFF_DEPENDENCIES = host-pkgconfig zlib jpeg $(eval $(call AUTOTARGETS,package,tiff)) diff --git a/package/tinyhttpd/tinyhttpd.mk b/package/tinyhttpd/tinyhttpd.mk index 90274a7df..eac416b97 100644 --- a/package/tinyhttpd/tinyhttpd.mk +++ b/package/tinyhttpd/tinyhttpd.mk @@ -35,7 +35,7 @@ $(TARGET_DIR)/$(TINYHTTPD_TARGET_BINARY): $(TINYHTTPD_DIR)/$(TINYHTTPD_BINARY) $(INSTALL) -m 0755 package/tinyhttpd/S85tinyhttpd $(TARGET_DIR)/etc/init.d mkdir -p $(TARGET_DIR)/var/www -tinyhttpd: uclibc $(TARGET_DIR)/$(TINYHTTPD_TARGET_BINARY) +tinyhttpd: $(TARGET_DIR)/$(TINYHTTPD_TARGET_BINARY) tinyhttpd-clean: -$(MAKE) -C $(TINYHTTPD_DIR) clean diff --git a/package/tn5250/tn5250.mk b/package/tn5250/tn5250.mk index 218421052..124c03b8a 100644 --- a/package/tn5250/tn5250.mk +++ b/package/tn5250/tn5250.mk @@ -42,7 +42,7 @@ $(TN5250_DIR)/src/tn5250: $(TN5250_DIR)/.configured $(TARGET_DIR)/usr/bin/tn5250: $(TN5250_DIR)/src/tn5250 install -c $(TN5250_DIR)/src/tn5250 $(TARGET_DIR)/usr/bin/tn5250 -tn5250: uclibc slang $(TARGET_DIR)/usr/bin/tn5250 +tn5250: slang $(TARGET_DIR)/usr/bin/tn5250 tn5250-source: $(DL_DIR)/$(TN5250_SOURCE) diff --git a/package/torsmo/torsmo.mk b/package/torsmo/torsmo.mk index 93a3dc145..f9aa71dfb 100644 --- a/package/torsmo/torsmo.mk +++ b/package/torsmo/torsmo.mk @@ -12,7 +12,5 @@ TORSMO_INSTALL_TARGET = YES TORSMO_CONF_OPT = --x-includes="-I$(STAGING_DIR)/usr/include/X11" --x-libraries="-I$(STAGING_DIR)/usr/lib" --with-x -TORSMO_DEPENDENCIES = uclibc - $(eval $(call AUTOTARGETS,package,torsmo)) diff --git a/package/tslib/tslib.mk b/package/tslib/tslib.mk index 99296db0b..edde0b66f 100644 --- a/package/tslib/tslib.mk +++ b/package/tslib/tslib.mk @@ -17,6 +17,4 @@ TSLIB_CONF_OPT = \ --prefix=/usr \ --sysconfdir=/etc -TSLIB_DEPENDENCIES = uclibc - $(eval $(call AUTOTARGETS,package,tslib)) diff --git a/package/udev/udev.mk b/package/udev/udev.mk index c4c5e36cf..ace9ae4f2 100644 --- a/package/udev/udev.mk +++ b/package/udev/udev.mk @@ -61,7 +61,7 @@ endif ##################################################################### .PHONY: udev-source udev udev-clean udev-dirclean -udev: uclibc $(TARGET_DIR)/$(UDEV_TARGET_BINARY) +udev: $(TARGET_DIR)/$(UDEV_TARGET_BINARY) udev-source: $(DL_DIR)/$(UDEV_SOURCE) diff --git a/package/udhcp/udhcp.mk b/package/udhcp/udhcp.mk index 1af010087..0a50ca44f 100644 --- a/package/udhcp/udhcp.mk +++ b/package/udhcp/udhcp.mk @@ -56,7 +56,7 @@ $(TARGET_DIR)/sbin/udhcpc: $(UDHCP_DIR)/udhcpc cp $(UDHCP_DIR)/samples/simple.script $(TARGET_DIR)/usr/share/udhcpc/default.script chmod a+x $(TARGET_DIR)/sbin/udhcpc $(TARGET_DIR)/usr/share/udhcpc/default.script -udhcp: uclibc $(TARGET_DIR)/sbin/udhcpc +udhcp: $(TARGET_DIR)/sbin/udhcpc udhcp-clean: rm -f $(TARGET_DIR)/sbin/udhcpc diff --git a/package/udpcast/udpcast.mk b/package/udpcast/udpcast.mk index 4981f51f6..5ae0f89d7 100644 --- a/package/udpcast/udpcast.mk +++ b/package/udpcast/udpcast.mk @@ -78,7 +78,7 @@ ifneq ($(BR2_HAVE_MANPAGES),y) $(addsuffix .1,$(UDPCAST_BINARIES))) endif -udpcast: uclibc $(UDPCAST_PROGS) +udpcast: $(UDPCAST_PROGS) udpcast-clean: rm -f $(UDPCAST_INSTALL_FILES) diff --git a/package/usbmount/usbmount.mk b/package/usbmount/usbmount.mk index 726abd22a..0e1c72c31 100644 --- a/package/usbmount/usbmount.mk +++ b/package/usbmount/usbmount.mk @@ -28,7 +28,7 @@ $(TARGET_DIR)/$(USBMOUNT_TARGET_BINARY): $(USBMOUNT_DIR)/.unpacked fi touch -c $@ -usbmount: uclibc $(TARGET_DIR)/$(USBMOUNT_TARGET_BINARY) +usbmount: $(TARGET_DIR)/$(USBMOUNT_TARGET_BINARY) usbmount-clean: rm -f $(TARGET_DIR)/$(USBMOUNT_TARGET_BINARY) diff --git a/package/usbutils/usbutils.mk b/package/usbutils/usbutils.mk index 39393b562..5b40db2c0 100644 --- a/package/usbutils/usbutils.mk +++ b/package/usbutils/usbutils.mk @@ -41,7 +41,7 @@ $(TARGET_DIR)/$(USBUTILS_TARGET_BINARY): $(USBUTILS_DIR)/$(USBUTILS_BINARY) $(MAKE) -C $(USBUTILS_DIR) DESTDIR=$(TARGET_DIR) install rm -rf $(TARGET_DIR)/usr/man -usbutils: uclibc libusb $(TARGET_DIR)/$(USBUTILS_TARGET_BINARY) +usbutils: libusb $(TARGET_DIR)/$(USBUTILS_TARGET_BINARY) usbutils-clean: rm -f $(TARGET_DIR)/$(USBUTILS_TARGET_BINARY) diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 8f38a3cc4..a167bb2d5 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -75,7 +75,7 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y) UTIL-LINUX_DEPENDENCIES := busybox $(UTIL-LINUX_DEPENDENCIES) endif -util-linux: uclibc $(UTIL-LINUX_DEPENDENCIES) $(UTIL-LINUX_TARGET_BINARY) +util-linux: $(UTIL-LINUX_DEPENDENCIES) $(UTIL-LINUX_TARGET_BINARY) util-linux-source: $(DL_DIR)/$(UTIL-LINUX_SOURCE) diff --git a/package/vpnc/vpnc.mk b/package/vpnc/vpnc.mk index a94208f99..5d0f87abd 100644 --- a/package/vpnc/vpnc.mk +++ b/package/vpnc/vpnc.mk @@ -42,7 +42,7 @@ $(VPNC_TARGET_BINARY): $(VPNC_BINARY) -C $(VPNC_DIR) install $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(VPNC_TARGET_BINARY) -vpnc: uclibc libgcrypt $(VPNC_TARGET_BINARY) +vpnc: libgcrypt $(VPNC_TARGET_BINARY) vpnc-source: $(DL_DIR)/$(VPNC_SOURCE) diff --git a/package/vsftpd/vsftpd.mk b/package/vsftpd/vsftpd.mk index f845aeddc..ed35d5f92 100644 --- a/package/vsftpd/vsftpd.mk +++ b/package/vsftpd/vsftpd.mk @@ -52,9 +52,9 @@ $(TARGET_DIR)/$(VSFTPD_TARGET_BINARY): $(VSFTPD_DIR)/$(VSFTPD_BINARY) $(INSTALL) -D -m 0755 package/vsftpd/vsftpd-init $(TARGET_DIR)/etc/init.d/S70vsftpd ifeq ($(BR2_PACKAGE_OPENSSL),y) -vsftpd: uclibc openssl $(TARGET_DIR)/$(VSFTPD_TARGET_BINARY) +vsftpd: openssl $(TARGET_DIR)/$(VSFTPD_TARGET_BINARY) else -vsftpd: uclibc $(TARGET_DIR)/$(VSFTPD_TARGET_BINARY) +vsftpd: $(TARGET_DIR)/$(VSFTPD_TARGET_BINARY) endif vsftpd-clean: diff --git a/package/vtun/vtun.mk b/package/vtun/vtun.mk index 596e8599a..914f07387 100644 --- a/package/vtun/vtun.mk +++ b/package/vtun/vtun.mk @@ -63,7 +63,7 @@ $(TARGET_DIR)/$(VTUN_TARGET_BINARY): $(VTUN_DIR)/$(VTUN_BINARY) rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \ $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc -vtun: uclibc zlib lzo openssl $(TARGET_DIR)/$(VTUN_TARGET_BINARY) +vtun: zlib lzo openssl $(TARGET_DIR)/$(VTUN_TARGET_BINARY) vtun-unpacked: $(VTUN_DIR)/.unpacked diff --git a/package/wget/wget.mk b/package/wget/wget.mk index 080d370ed..76d30f644 100644 --- a/package/wget/wget.mk +++ b/package/wget/wget.mk @@ -42,7 +42,7 @@ $(WGET_DIR)/$(WGET_BINARY): $(WGET_DIR)/.configured $(TARGET_DIR)/$(WGET_TARGET_BINARY): $(WGET_DIR)/$(WGET_BINARY) install -D $(WGET_DIR)/$(WGET_BINARY) $(TARGET_DIR)/$(WGET_TARGET_BINARY) -wget: uclibc $(TARGET_DIR)/$(WGET_TARGET_BINARY) +wget: $(TARGET_DIR)/$(WGET_TARGET_BINARY) wget-clean: rm -f $(TARGET_DIR)/$(WGET_TARGET_BINARY) diff --git a/package/which/which.mk b/package/which/which.mk index da6dfeabd..0eb9d588b 100644 --- a/package/which/which.mk +++ b/package/which/which.mk @@ -10,8 +10,6 @@ WHICH_AUTORECONF:=NO WHICH_INSTALL_STAGING:=NO WHICH_INSTALL_TARGET:=YES -WHICH_DEPENDENCIES:=uclibc - $(eval $(call AUTOTARGETS,package,which)) $(WHICH_HOOK_POST_INSTALL): $(WHICH_TARGET_INSTALL_TARGET) diff --git a/package/wipe/wipe.mk b/package/wipe/wipe.mk index b3f92b13a..1f222c653 100644 --- a/package/wipe/wipe.mk +++ b/package/wipe/wipe.mk @@ -38,7 +38,7 @@ $(WIPE_DIR)/$(WIPE_BINARY): $(WIPE_DIR)/.configured $(TARGET_DIR)/$(WIPE_TARGET_BINARY): $(WIPE_DIR)/$(WIPE_BINARY) cp -a $(WIPE_DIR)/$(WIPE_BINARY) $(TARGET_DIR)/$(WIPE_TARGET_BINARY) -wipe: uclibc $(TARGET_DIR)/$(WIPE_TARGET_BINARY) +wipe: $(TARGET_DIR)/$(WIPE_TARGET_BINARY) wipe-clean: #$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(WIPE_DIR) uninstall diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk index eaa6ab42e..d553bc767 100644 --- a/package/wpa_supplicant/wpa_supplicant.mk +++ b/package/wpa_supplicant/wpa_supplicant.mk @@ -9,7 +9,7 @@ WPA_SUPPLICANT_SOURCE = wpa_supplicant-$(WPA_SUPPLICANT_VERSION).tar.gz WPA_SUPPLICANT_SITE = http://hostap.epitest.fi/releases WPA_SUPPLICANT_LIBTOOL_PATCH = NO WPA_SUPPLICANT_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install -WPA_SUPPLICANT_DEPENDENCIES = uclibc +WPA_SUPPLICANT_DEPENDENCIES = WPA_SUPPLICANT_CONFIG = $(WPA_SUPPLICANT_DIR)/wpa_supplicant/.config WPA_SUPPLICANT_SUBDIR = wpa_supplicant WPA_SUPPLICANT_TARGET_BINS = wpa_cli wpa_supplicant wpa_passphrase diff --git a/package/x11r7/pthread-stubs/pthread-stubs.mk b/package/x11r7/pthread-stubs/pthread-stubs.mk index aa7b8a868..b62084b17 100644 --- a/package/x11r7/pthread-stubs/pthread-stubs.mk +++ b/package/x11r7/pthread-stubs/pthread-stubs.mk @@ -7,7 +7,6 @@ PTHREAD_STUBS_VERSION = 0.1 PTHREAD_STUBS_SOURCE = libpthread-stubs-$(PTHREAD_STUBS_VERSION).tar.bz2 PTHREAD_STUBS_SITE = http://xcb.freedesktop.org/dist/ -PTHREAD_STUBS_DEPENDENCIES = uclibc PTHREAD_STUBS_INSTALL_STAGING = YES $(eval $(call AUTOTARGETS,package/x11r7,pthread-stubs)) diff --git a/package/x11r7/xfont_font-util/xfont_font-util.mk b/package/x11r7/xfont_font-util/xfont_font-util.mk index 8d13568a5..c321d00a8 100644 --- a/package/x11r7/xfont_font-util/xfont_font-util.mk +++ b/package/x11r7/xfont_font-util/xfont_font-util.mk @@ -59,7 +59,7 @@ $(XFONT_FONT_UTIL_DIR)/.hacked: $(XFONT_FONT_UTIL_DIR)/.installed ( package/x11r7/xfont_font-util/post-install.sh $(STAGING_DIR) ) touch $@ -xfont_font-util: uclibc host-pkgconfig $(XFONT_FONT_UTIL_DIR)/.hacked +xfont_font-util: host-pkgconfig $(XFONT_FONT_UTIL_DIR)/.hacked xfont_font-util-unpacked: $(XFONT_FONT_UTIL_DIR)/.unpacked diff --git a/package/x11r7/xkeyboard-config/xkeyboard-config.mk b/package/x11r7/xkeyboard-config/xkeyboard-config.mk index d6e296f0e..7128d7ea5 100644 --- a/package/x11r7/xkeyboard-config/xkeyboard-config.mk +++ b/package/x11r7/xkeyboard-config/xkeyboard-config.mk @@ -13,7 +13,5 @@ XKEYBOARD_CONFIG_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install XKEYBOARD_CONFIG_CONF_OPT = GMSGFMT=/usr/bin/msgfmt -XKEYBOARD_CONFIG_DEPENDENCIES = uclibc - $(eval $(call AUTOTARGETS,package/x11r7,xkeyboard-config)) diff --git a/package/x11vnc/x11vnc.mk b/package/x11vnc/x11vnc.mk index c83da2def..0c9877efc 100644 --- a/package/x11vnc/x11vnc.mk +++ b/package/x11vnc/x11vnc.mk @@ -15,6 +15,4 @@ X11VNC_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \ --includedir=/usr/include \ --without-avahi -X11VNC_DEPENDENCIES = uclibc - $(eval $(call AUTOTARGETS,package,x11vnc)) diff --git a/package/xerces/xerces.mk b/package/xerces/xerces.mk index 9687c3359..9f77be6f7 100644 --- a/package/xerces/xerces.mk +++ b/package/xerces/xerces.mk @@ -87,7 +87,7 @@ $(TARGET_DIR)/usr/lib/$(LIBXERCES_BINARY): $(STAGING_DIR)/usr/lib/$(LIBXERCES_BI cp -a $(STAGING_DIR)/usr/lib/$(LIBXERCES_BINARY)* $(TARGET_DIR)/usr/lib $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/$(LIBXERCES_BINARY) -xerces: uclibc $(TARGET_DIR)/usr/lib/$(LIBXERCES_BINARY) +xerces: $(TARGET_DIR)/usr/lib/$(LIBXERCES_BINARY) xerces-bin: $(XERCES_DIR)/usr/lib/$(LIBXERCES_BINARY) diff --git a/package/xfsprogs/xfsprogs.mk b/package/xfsprogs/xfsprogs.mk index f3e0acfa3..a4fa392de 100644 --- a/package/xfsprogs/xfsprogs.mk +++ b/package/xfsprogs/xfsprogs.mk @@ -78,7 +78,7 @@ $(TARGET_DIR)/$(XFSPROGS_TARGET_BINARY): $(XFSPROGS_DIR)/$(XFSPROGS_BINARY) rm -rf $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc touch -c $(TARGET_DIR)/$(XFSPROGS_TARGET_BINARY) -xfsprogs: uclibc e2fsprogs libtool-cross $(TARGET_DIR)/$(XFSPROGS_TARGET_BINARY) +xfsprogs: e2fsprogs libtool-cross $(TARGET_DIR)/$(XFSPROGS_TARGET_BINARY) xfsprogs-clean: rm -f $(TARGET_DIR)/bin/xfs_* $(TARGET_DIR)/sbin/xfs_* $(TARGET_DIR)/sbin/*.xfs diff --git a/package/xpdf/xpdf.mk b/package/xpdf/xpdf.mk index ab60b2be5..6bbfed631 100644 --- a/package/xpdf/xpdf.mk +++ b/package/xpdf/xpdf.mk @@ -25,7 +25,7 @@ ifeq ($(BR2_PACKAGE_XORG7),y) CXXFLAGS="-I$(STAGING_DIR)/usr/include/freetype2" endif -XPDF_DEPENDENCIES = uclibc freetype +XPDF_DEPENDENCIES = freetype $(eval $(call AUTOTARGETS,package,xpdf)) diff --git a/package/xstroke/xstroke.mk b/package/xstroke/xstroke.mk index 55be07918..c484959d4 100644 --- a/package/xstroke/xstroke.mk +++ b/package/xstroke/xstroke.mk @@ -11,7 +11,5 @@ XSTROKE_INSTALL_STAGING = NO XSTROKE_INSTALL_TARGET = YES XSTROKE_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install -XSTROKE_DEPENDENCIES = uclibc - $(eval $(call AUTOTARGETS,package,xstroke)) diff --git a/package/xvkbd/xvkbd.mk b/package/xvkbd/xvkbd.mk index d28780969..8f0202181 100644 --- a/package/xvkbd/xvkbd.mk +++ b/package/xvkbd/xvkbd.mk @@ -15,7 +15,7 @@ XVKBD_MAKE_OPT = CC=$(TARGET_CC) CXX=$(TARGET_CXX) LD=$(TARGET_CC) \ XVKBD_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install -XVKBD_DEPENDENCIES = uclibc xserver_xorg-server +XVKBD_DEPENDENCIES = xserver_xorg-server $(eval $(call AUTOTARGETS,package,xvkbd)) diff --git a/package/zlib/zlib.mk b/package/zlib/zlib.mk index c4da8d1ba..41d063274 100644 --- a/package/zlib/zlib.mk +++ b/package/zlib/zlib.mk @@ -70,7 +70,7 @@ $(TARGET_DIR)/usr/lib/libz.a: $(STAGING_DIR)/usr/lib/libz.a zlib-headers: $(TARGET_DIR)/usr/lib/libz.a -zlib: uclibc $(ZLIB_TARGET) +zlib: $(ZLIB_TARGET) zlib-source: $(DL_DIR)/$(ZLIB_SOURCE) -- cgit v1.2.3