diff --git a/package/gptfdisk/gptfdisk.mk b/package/gptfdisk/gptfdisk.mk index f4a42b57..b353ecf2 100644 --- a/package/gptfdisk/gptfdisk.mk +++ b/package/gptfdisk/gptfdisk.mk @@ -4,27 +4,26 @@ # ################################################################################ -GPTFDISK_VERSION = 1.0.8 +GPTFDISK_VERSION = 1.0.9 GPTFDISK_DIR = gptfdisk-$(GPTFDISK_VERSION) GPTFDISK_SOURCE = gptfdisk-$(GPTFDISK_VERSION).tar.gz GPTFDISK_SITE = https://sourceforge.net/projects/gptfdisk/files/gptfdisk/$(GPTFDISK_VERSION) -$(DL_DIR)/$(GPTFDISK_SOURCE): - $(download) $(GPTFDISK_SITE)/$(GPTFDISK_SOURCE) - GPTFDISK_DEPENDENCIES = popt e2fsprogs ncurses -GPTFDISK_SBINARIES = sgdisk +GPTFDISK_BINARIES = sgdisk + +define GPTFDISK_INSTALL_BINARIES + $(foreach binary,$($(PKG)_BINARIES),\ + rm -f $(TARGET_sbindir)/$(binary); \ + $(INSTALL_EXEC) -D $(PKG_BUILD_DIR)/$(binary) $(TARGET_sbindir)/$(binary)$(sep) \ + ) +endef +GPTFDISK_PRE_FOLLOWUP_HOOKS += GPTFDISK_INSTALL_BINARIES -gptfdisk: $(GPTFDISK_DEPENDENCIES) $(DL_DIR)/$(GPTFDISK_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(PKG_DIR) - $(UNTAR)/$(PKG_SOURCE) - $(call APPLY_PATCHES,$(PKG_PATCHES_DIR)) - $(CHDIR)/$(PKG_DIR); \ +gptfdisk: | $(TARGET_DIR) + $(call PREPARE) + $(CHDIR)/$($(PKG)_DIR); \ $(TARGET_CONFIGURE_ENV) \ - $(MAKE) $($(PKG)_SBINARIES); \ - for sbin in $($(PKG)_SBINARIES); do \ - $(INSTALL_EXEC) -D $$sbin $(TARGET_sbindir)/$$sbin; \ - done - $(REMOVE)/$(PKG_DIR) - $(TOUCH) + $(MAKE) $($(PKG)_SBINARIES) + $(call TARGET_FOLLOWUP) diff --git a/package/gptfdisk/patches/0001-fix-build-w-ncursesw.patch b/package/gptfdisk/patches/0001-fix-build-w-ncursesw.patch new file mode 100644 index 00000000..ea230955 --- /dev/null +++ b/package/gptfdisk/patches/0001-fix-build-w-ncursesw.patch @@ -0,0 +1,13 @@ +diff --git a/gptcurses.cc b/gptcurses.cc +index 8b0ae91..a1de4c0 100644 +--- a/gptcurses.cc ++++ b/gptcurses.cc +@@ -26,7 +26,7 @@ + #if defined (__APPLE__) || (__FreeBSD__) + #include + #else +-#include ++#include + #endif + #include "gptcurses.h" + #include "support.h"