From 1ad75633a68132129d5896b6d6fb299d4d278a4c Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 6 Jun 2020 21:27:59 +0200 Subject: parted: allow to build w/o locale in libc, disable atari label support --- package/parted/Makefile | 2 +- package/parted/patches/patch-lib_config_h_in | 6 +-- .../patches/patch-libparted_fs_xfs_platform_defs_h | 6 +-- .../patches/patch-libparted_labels_Makefile_am | 10 ++++ .../patches/patch-libparted_labels_Makefile_in | 57 ++++++++++++++++++++++ package/parted/patches/patch-libparted_libparted_c | 34 +++++++++++++ 6 files changed, 108 insertions(+), 7 deletions(-) create mode 100644 package/parted/patches/patch-libparted_labels_Makefile_am create mode 100644 package/parted/patches/patch-libparted_labels_Makefile_in create mode 100644 package/parted/patches/patch-libparted_libparted_c diff --git a/package/parted/Makefile b/package/parted/Makefile index 86528d6ae..b78783971 100644 --- a/package/parted/Makefile +++ b/package/parted/Makefile @@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= parted PKG_VERSION:= 3.3 -PKG_RELEASE:= 4 +PKG_RELEASE:= 5 PKG_HASH:= 57e2b4bd87018625c515421d4524f6e3b55175b472302056391c5f7eccb83d44 PKG_DESCR:= partition table editor PKG_SECTION:= sys/fs diff --git a/package/parted/patches/patch-lib_config_h_in b/package/parted/patches/patch-lib_config_h_in index 44c07bbc6..0a83e62dc 100644 --- a/package/parted/patches/patch-lib_config_h_in +++ b/package/parted/patches/patch-lib_config_h_in @@ -1,6 +1,6 @@ ---- parted-3.2.orig/lib/config.h.in 2014-07-28 22:02:54.000000000 -0500 -+++ parted-3.2/lib/config.h.in 2015-01-03 14:02:11.888853421 -0600 -@@ -1471,6 +1471,11 @@ +--- parted-3.3.orig/lib/config.h.in 2019-10-11 01:03:37.000000000 +0200 ++++ parted-3.3/lib/config.h.in 2020-06-06 20:12:43.000000000 +0200 +@@ -1249,6 +1249,11 @@ /* Enable large inode numbers on Mac OS X 10.5. */ #undef _DARWIN_USE_64_BIT_INODE diff --git a/package/parted/patches/patch-libparted_fs_xfs_platform_defs_h b/package/parted/patches/patch-libparted_fs_xfs_platform_defs_h index 9d6fe232d..598f75b2e 100644 --- a/package/parted/patches/patch-libparted_fs_xfs_platform_defs_h +++ b/package/parted/patches/patch-libparted_fs_xfs_platform_defs_h @@ -1,6 +1,6 @@ ---- parted-3.1.orig/libparted/fs/xfs/platform_defs.h 2012-01-12 17:38:40.000000000 +0100 -+++ parted-3.1/libparted/fs/xfs/platform_defs.h 2013-12-25 20:53:13.000000000 +0100 -@@ -51,7 +51,7 @@ +--- parted-3.3.orig/libparted/fs/xfs/platform_defs.h 2019-10-11 00:58:51.000000000 +0200 ++++ parted-3.3/libparted/fs/xfs/platform_defs.h 2020-06-06 20:12:43.000000000 +0200 +@@ -52,7 +52,7 @@ # define constpp char * const * #endif diff --git a/package/parted/patches/patch-libparted_labels_Makefile_am b/package/parted/patches/patch-libparted_labels_Makefile_am new file mode 100644 index 000000000..6c32ef071 --- /dev/null +++ b/package/parted/patches/patch-libparted_labels_Makefile_am @@ -0,0 +1,10 @@ +--- parted-3.3.orig/libparted/labels/Makefile.am 2019-10-11 00:58:51.000000000 +0200 ++++ parted-3.3/libparted/labels/Makefile.am 2020-06-06 20:29:14.000000000 +0200 +@@ -19,7 +19,6 @@ noinst_LTLIBRARIES = liblabels.la + liblabels_la_SOURCES = \ + $(S390_SRCS) \ + aix.c \ +- atari.c \ + bsd.c \ + dos.c \ + dvh.c \ diff --git a/package/parted/patches/patch-libparted_labels_Makefile_in b/package/parted/patches/patch-libparted_labels_Makefile_in new file mode 100644 index 000000000..bfc1f1e24 --- /dev/null +++ b/package/parted/patches/patch-libparted_labels_Makefile_in @@ -0,0 +1,57 @@ +--- parted-3.3.orig/libparted/labels/Makefile.in 2019-10-11 01:03:39.000000000 +0200 ++++ parted-3.3/libparted/labels/Makefile.in 2020-06-06 20:30:12.000000000 +0200 +@@ -206,11 +206,11 @@ LTLIBRARIES = $(noinst_LTLIBRARIES) + am__DEPENDENCIES_1 = + liblabels_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +-am__liblabels_la_SOURCES_DIST = dasd.c fdasd.c vtoc.c aix.c atari.c \ ++am__liblabels_la_SOURCES_DIST = dasd.c fdasd.c vtoc.c aix.c \ + bsd.c dos.c dvh.c dvh.h efi_crc32.c gpt.c loop.c mac.c misc.h \ + pc98.c pt-common.h pt-tools.c pt-tools.h rdb.c sun.c + @COMPILE_FOR_S390_TRUE@am__objects_1 = dasd.lo fdasd.lo vtoc.lo +-am_liblabels_la_OBJECTS = $(am__objects_1) aix.lo atari.lo bsd.lo \ ++am_liblabels_la_OBJECTS = $(am__objects_1) aix.lo bsd.lo \ + dos.lo dvh.lo efi_crc32.lo gpt.lo loop.lo mac.lo pc98.lo \ + pt-tools.lo rdb.lo sun.lo + liblabels_la_OBJECTS = $(am_liblabels_la_OBJECTS) +@@ -233,7 +233,7 @@ am__v_at_1 = + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/lib + depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp + am__maybe_remake_depfiles = depfiles +-am__depfiles_remade = ./$(DEPDIR)/aix.Plo ./$(DEPDIR)/atari.Plo \ ++am__depfiles_remade = ./$(DEPDIR)/aix.Plo \ + ./$(DEPDIR)/bsd.Plo ./$(DEPDIR)/dasd.Plo ./$(DEPDIR)/dos.Plo \ + ./$(DEPDIR)/dvh.Plo ./$(DEPDIR)/efi_crc32.Plo \ + ./$(DEPDIR)/fdasd.Plo ./$(DEPDIR)/gpt.Plo ./$(DEPDIR)/loop.Plo \ +@@ -1416,7 +1416,6 @@ noinst_LTLIBRARIES = liblabels.la + liblabels_la_SOURCES = \ + $(S390_SRCS) \ + aix.c \ +- atari.c \ + bsd.c \ + dos.c \ + dvh.c \ +@@ -1501,7 +1500,6 @@ distclean-compile: + -rm -f *.tab.c + + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aix.Plo@am__quote@ # am--include-marker +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/atari.Plo@am__quote@ # am--include-marker + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsd.Plo@am__quote@ # am--include-marker + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dasd.Plo@am__quote@ # am--include-marker + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dos.Plo@am__quote@ # am--include-marker +@@ -1683,7 +1681,6 @@ clean-am: clean-generic clean-libtool cl + + distclean: distclean-am + -rm -f ./$(DEPDIR)/aix.Plo +- -rm -f ./$(DEPDIR)/atari.Plo + -rm -f ./$(DEPDIR)/bsd.Plo + -rm -f ./$(DEPDIR)/dasd.Plo + -rm -f ./$(DEPDIR)/dos.Plo +@@ -1744,7 +1741,6 @@ installcheck-am: + + maintainer-clean: maintainer-clean-am + -rm -f ./$(DEPDIR)/aix.Plo +- -rm -f ./$(DEPDIR)/atari.Plo + -rm -f ./$(DEPDIR)/bsd.Plo + -rm -f ./$(DEPDIR)/dasd.Plo + -rm -f ./$(DEPDIR)/dos.Plo diff --git a/package/parted/patches/patch-libparted_libparted_c b/package/parted/patches/patch-libparted_libparted_c new file mode 100644 index 000000000..1c5114d0c --- /dev/null +++ b/package/parted/patches/patch-libparted_libparted_c @@ -0,0 +1,34 @@ +--- parted-3.3.orig/libparted/libparted.c 2019-10-11 00:58:51.000000000 +0200 ++++ parted-3.3/libparted/libparted.c 2020-06-06 20:37:57.000000000 +0200 +@@ -75,7 +75,6 @@ extern void ped_disk_pc98_init (); + extern void ped_disk_sun_init (); + extern void ped_disk_amiga_init (); + extern void ped_disk_dasd_init (); +-extern void ped_disk_atari_init (); + + static void + init_disk_types () +@@ -86,7 +85,6 @@ init_disk_types () + #if defined __s390__ || defined __s390x__ + ped_disk_dasd_init(); + #endif +- ped_disk_atari_init (); /* easy false positives, so probe others first */ + ped_disk_sun_init (); + #ifdef ENABLE_PC98 + ped_disk_pc98_init (); +@@ -143,7 +141,6 @@ extern void ped_disk_pc98_done (); + extern void ped_disk_sun_done (); + extern void ped_disk_amiga_done (); + extern void ped_disk_dasd_done (); +-extern void ped_disk_atari_done (); + + static void + done_disk_types () +@@ -163,7 +160,6 @@ done_disk_types () + ped_disk_bsd_done (); + ped_disk_amiga_done (); + ped_disk_aix_done (); +- ped_disk_atari_done (); + } + + static void _init() __attribute__ ((constructor)); -- cgit v1.2.3