From 816961484c72b67c0e4a15f51550cda74e088f9b Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 17 Jan 2021 14:41:07 -0800 Subject: [PATCH] gptfdisk: update to 1.0.6 Remove all uclibcxx support. It's buggy and fairly dead upstream. Remove libcxx linker hack attributed to glibc. Signed-off-by: Rosen Penev --- utils/gptfdisk/Makefile | 12 +-- ...ome-extra-flushes-before-getline-cin.patch | 79 ------------------- 2 files changed, 4 insertions(+), 87 deletions(-) delete mode 100644 utils/gptfdisk/patches/050-Add-some-extra-flushes-before-getline-cin.patch diff --git a/utils/gptfdisk/Makefile b/utils/gptfdisk/Makefile index 029baa5ee5..c40b2e5453 100644 --- a/utils/gptfdisk/Makefile +++ b/utils/gptfdisk/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gptfdisk -PKG_VERSION:=1.0.5 +PKG_VERSION:=1.0.6 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/$(PKG_NAME) -PKG_HASH:=0e7d3987cd0488ecaf4b48761bc97f40b1dc089e5ff53c4b37abe30bc67dcb2f +PKG_HASH:=ddc551d643a53f0bd4440345d3ae32c49b04a797e9c01036ea460b6bb4168ca8 PKG_MAINTAINER:=Alif M. Ahmad PKG_LICENSE:=GPL-2.0-or-later @@ -21,7 +21,6 @@ PKG_LICENSE_FILES:=COPYING PKG_BUILD_PARALLEL:=1 -include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/package.mk define Package/gptfdisk/Default @@ -29,7 +28,7 @@ define Package/gptfdisk/Default CATEGORY:=Utilities SUBMENU:=Disc URL:=https://www.rodsbooks.com/gdisk - DEPENDS:=$(CXX_DEPENDS) + DEPENDS:=+libstdcpp endef define Package/gdisk @@ -74,10 +73,7 @@ define Package/fixparts/description endef TARGET_CXXFLAGS += -std=c++11 -ffunction-sections -fdata-sections -fno-rtti -flto -TARGET_LDFLAGS += $(if $(CONFIG_USE_GLIBC),-lm) -Wl,--gc-sections,--as-needed -ifeq ($(CONFIG_USE_UCLIBCXX),y) -TARGET_LDFLAGS += -nodefaultlibs -endif +TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed define Package/gdisk/install $(INSTALL_DIR) $(1)/usr/bin diff --git a/utils/gptfdisk/patches/050-Add-some-extra-flushes-before-getline-cin.patch b/utils/gptfdisk/patches/050-Add-some-extra-flushes-before-getline-cin.patch deleted file mode 100644 index 1ad8332c8d..0000000000 --- a/utils/gptfdisk/patches/050-Add-some-extra-flushes-before-getline-cin.patch +++ /dev/null @@ -1,79 +0,0 @@ -From b33f93bea332211afae037e4b6f379f0876302d1 Mon Sep 17 00:00:00 2001 -From: Rosen Penev -Date: Tue, 8 Oct 2019 20:51:54 -0700 -Subject: [PATCH] Add some extra flushes before getline/cin - -These are not covered by the previous commits. - -Signed-off-by: Rosen Penev ---- - diskio-unix.cc | 2 +- - gptcurses.cc | 4 ++-- - parttypes.cc | 2 +- - support.cc | 2 +- - 4 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/diskio-unix.cc b/diskio-unix.cc -index d9f8b8d..c38fda5 100644 ---- a/diskio-unix.cc -+++ b/diskio-unix.cc -@@ -92,7 +92,7 @@ int DiskIO::OpenForRead(void) { - #if defined(__linux__) && !defined(EFI) - if (isOpen && realFilename.substr(0,4) == "/dev") { - ostringstream modelNameFilename; -- modelNameFilename << "/sys/block" << realFilename.substr(4,512) << "/device/model"; -+ modelNameFilename << "/sys/block" << realFilename.substr(4,512) << "/device/model" << flush; - ifstream modelNameFile(modelNameFilename.str().c_str()); - if (modelNameFile.is_open()) { - getline(modelNameFile, modelName); -diff --git a/gptcurses.cc b/gptcurses.cc -index 4ebfde1..ca6f4ea 100644 ---- a/gptcurses.cc -+++ b/gptcurses.cc -@@ -422,7 +422,7 @@ void GPTDataCurses::Verify(void) { - def_prog_mode(); - endwin(); - GPTData::Verify(); -- cout << "\nPress the key to continue: "; -+ cout << "\nPress the key to continue: " << flush; - cin.get(junk); - reset_prog_mode(); - refresh(); -@@ -820,7 +820,7 @@ void ShowTypes(void) { - def_prog_mode(); - endwin(); - tempType.ShowAllTypes(LINES - 3); -- cout << "\nPress the key to continue: "; -+ cout << "\nPress the key to continue: " << flush; - cin.get(junk); - reset_prog_mode(); - refresh(); -diff --git a/parttypes.cc b/parttypes.cc -index cd225d1..6c2c8c6 100644 ---- a/parttypes.cc -+++ b/parttypes.cc -@@ -530,7 +530,7 @@ void PartType::ShowAllTypes(int maxLines) const { - - cout.unsetf(ios::uppercase); - if (maxLines > 0) { -- cout << "Type search string, or to show all codes: "; -+ cout << "Type search string, or to show all codes: " << flush; - matchString = ToLower(ReadString()); - } // if - while (thisType != NULL) { -diff --git a/support.cc b/support.cc -index 891caad..645ef5d 100644 ---- a/support.cc -+++ b/support.cc -@@ -127,7 +127,7 @@ uint64_t GetSectorNum(uint64_t low, uint64_t high, uint64_t def, uint64_t sSize, - char line[255]; - - do { -- cout << prompt; -+ cout << prompt << flush; - cin.getline(line, 255); - if (!cin.good()) - exit(5); --- -2.17.1 - -- 2.30.2