diff options
Diffstat (limited to 'package/dosfstools/dosfstools.mk')
| -rw-r--r-- | package/dosfstools/dosfstools.mk | 64 |
1 files changed, 24 insertions, 40 deletions
diff --git a/package/dosfstools/dosfstools.mk b/package/dosfstools/dosfstools.mk index b7f7d96b85..28a7b421c2 100644 --- a/package/dosfstools/dosfstools.mk +++ b/package/dosfstools/dosfstools.mk @@ -4,65 +4,49 @@ # ################################################################################ -DOSFSTOOLS_VERSION = 3.0.28 +DOSFSTOOLS_VERSION = 4.0 DOSFSTOOLS_SOURCE = dosfstools-$(DOSFSTOOLS_VERSION).tar.xz DOSFSTOOLS_SITE = https://github.com/dosfstools/dosfstools/releases/download/v$(DOSFSTOOLS_VERSION) DOSFSTOOLS_LICENSE = GPLv3+ DOSFSTOOLS_LICENSE_FILES = COPYING +DOSFSTOOLS_CONF_OPTS = --enable-compat-symlinks --exec-prefix=/ +HOST_DOSFSTOOLS_CONF_OPTS = --enable-compat-symlinks # Avoid target dosfstools dependencies, no host-libiconv HOST_DOSFSTOOLS_DEPENDENCIES = -DOSFSTOOLS_CFLAGS = $(TARGET_CFLAGS) -D_GNU_SOURCE +ifeq ($(BR2_PACKAGE_HAS_UDEV),y) +DOSFSTOOLS_CONF_OPTS += --with-udev +DOSFSTOOLS_DEPENDENCIES += udev +else +DOSFSTOOLS_CONF_OPTS += --without-udev +endif ifneq ($(BR2_ENABLE_LOCALE),y) +DOSFSTOOLS_CONF_OPTS += LIBS="-liconv" DOSFSTOOLS_DEPENDENCIES += libiconv -DOSFSTOOLS_LDLIBS += -liconv endif -define DOSFSTOOLS_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(DOSFSTOOLS_CFLAGS)" LDLIBS="$(DOSFSTOOLS_LDLIBS)" -C $(@D) -endef - -ifeq ($(BR2_PACKAGE_DOSFSTOOLS_FATLABEL),y) -define DOSFSTOOLS_INSTALL_FATLABEL - $(INSTALL) -D -m 755 $(@D)/fatlabel $(TARGET_DIR)/sbin/fatlabel - ln -sf fatlabel $(TARGET_DIR)/sbin/dosfslabel +ifeq ($(BR2_PACKAGE_DOSFSTOOLS_FATLABEL),) +define DOSFSTOOLS_REMOVE_FATLABEL + rm -f $(addprefix $(TARGET_DIR)/sbin/,dosfslabel fatlabel) endef +DOSFSTOOLS_POST_INSTALL_TARGET_HOOKS += DOSFSTOOLS_REMOVE_FATLABEL endif -ifeq ($(BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT),y) -define DOSFSTOOLS_INSTALL_FSCK_FAT - $(INSTALL) -D -m 755 $(@D)/fsck.fat $(TARGET_DIR)/sbin/fsck.fat - ln -fs fsck.fat $(TARGET_DIR)/sbin/dosfsck - ln -fs fsck.fat $(TARGET_DIR)/sbin/fsck.msdos - ln -fs fsck.fat $(TARGET_DIR)/sbin/fsck.vfat +ifeq ($(BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT),) +define DOSFSTOOLS_REMOVE_FSCK_FAT + rm -f $(addprefix $(TARGET_DIR)/sbin/,fsck.fat dosfsck fsck.msdos fsck.vfat) endef +DOSFSTOOLS_POST_INSTALL_TARGET_HOOKS += DOSFSTOOLS_REMOVE_FSCK_FAT endif -ifeq ($(BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT),y) -define DOSFSTOOLS_INSTALL_MKFS_FAT - $(INSTALL) -D -m 755 $(@D)/mkfs.fat $(TARGET_DIR)/sbin/mkfs.fat - ln -fs mkfs.fat $(TARGET_DIR)/sbin/mkdosfs - ln -fs mkfs.fat $(TARGET_DIR)/sbin/mkfs.msdos - ln -fs mkfs.fat $(TARGET_DIR)/sbin/mkfs.vfat +ifeq ($(BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT),) +define DOSFSTOOLS_REMOVE_MKFS_FAT + rm -f $(addprefix $(TARGET_DIR)/sbin/,mkfs.fat mkdosfs mkfs.msdos mkfs.vfat) endef +DOSFSTOOLS_POST_INSTALL_TARGET_HOOKS += DOSFSTOOLS_REMOVE_MKFS_FAT endif -define DOSFSTOOLS_INSTALL_TARGET_CMDS - $(DOSFSTOOLS_INSTALL_FATLABEL) - $(DOSFSTOOLS_INSTALL_FSCK_FAT) - $(DOSFSTOOLS_INSTALL_MKFS_FAT) -endef - -define HOST_DOSFSTOOLS_BUILD_CMDS - $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) -endef - -define HOST_DOSFSTOOLS_INSTALL_CMDS - $(MAKE) -C $(@D) $(HOST_CONFIGURE_OPTS) PREFIX=$(HOST_DIR)/usr install -endef - -$(eval $(generic-package)) -$(eval $(host-generic-package)) +$(eval $(autotools-package)) +$(eval $(host-autotools-package)) |
