Skip to content

Commit

Permalink
package: Remove unnecessary dependencies on uclibc.
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Peter Korsgaard <[email protected]>
  • Loading branch information
willnewton authored and jacmet committed Sep 3, 2009
1 parent ee609f2 commit 422ce65
Show file tree
Hide file tree
Showing 271 changed files with 249 additions and 341 deletions.
2 changes: 1 addition & 1 deletion package/alsamixergui/alsamixergui.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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))

2 changes: 1 addition & 1 deletion package/argus/argus.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion package/at/at.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion package/autoconf/autoconf.mk
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ endif

AUTOCONF_CONF_ENV = EMACS="no"

AUTOCONF_DEPENDENCIES = uclibc microperl
AUTOCONF_DEPENDENCIES = microperl

$(eval $(call AUTOTARGETS,package,autoconf))

Expand Down
2 changes: 1 addition & 1 deletion package/automake/automake.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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))

Expand Down
2 changes: 1 addition & 1 deletion package/axel/axel.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions package/bash/bash.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion package/berkeleydb/berkeleydb.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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)

#############################################################
#
Expand Down
1 change: 0 additions & 1 deletion package/bind/bind.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion package/bison/bison.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion package/blackbox/blackbox.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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))
2 changes: 1 addition & 1 deletion package/bmon/bmon.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion package/boa/boa.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
1 change: 0 additions & 1 deletion package/bridge-utils/bridge.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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))

Expand Down
2 changes: 1 addition & 1 deletion package/bsdiff/bsdiff.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion package/busybox/busybox.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion package/busybox/initramfs.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion package/bzip2/bzip2.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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.* \
Expand Down
2 changes: 1 addition & 1 deletion package/cairo/cairo.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions package/coreutils/coreutils.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion package/cups/cups.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion package/cvs/cvs.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion package/dash/dash.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion package/database/mysql_client/mysql_client.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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 = \
Expand Down
1 change: 0 additions & 1 deletion package/database/sqlite/sqlite.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion package/dbus-glib/dbus-glib.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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))

Expand Down
2 changes: 1 addition & 1 deletion package/dbus-python/dbus-python.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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))
2 changes: 1 addition & 1 deletion package/dbus/dbus.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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="" \
Expand Down
2 changes: 1 addition & 1 deletion package/devmem2/devmem2.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
6 changes: 3 additions & 3 deletions package/dhcp/dhcp.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion package/dialog/dialog.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion package/diffutils/diffutils.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion package/dillo/dillo.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion package/directfb/directfb.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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))
2 changes: 1 addition & 1 deletion package/distcc/distcc.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion package/dmalloc/dmalloc.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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*
Expand Down
2 changes: 0 additions & 2 deletions package/dnsmasq/dnsmasq.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion package/docker/docker.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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))

Expand Down
2 changes: 1 addition & 1 deletion package/dosfstools/dosfstools.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion package/dropbear/dropbear.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion package/dummy/dummy.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions package/e2fsprogs/e2fsprogs.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion package/editors/nano/nano.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading

0 comments on commit 422ce65

Please sign in to comment.