Re: Parted 1.6.0-pre3

[Andreas Dilger]

On Mar 04, 2002  08:29 +1100, Andrew Clausen wrote:
> I'm back home in Australia :)  OTOH, uni is starting, but usually
> the first 1-2 months aren't very time-consuming, so I should be
> able to sort out the mess.

Just to add to your fun, here are a whole bunch of patches I made
against -pre2 recently.  (One patch per email, to simplify discussion).

First one - per-partition type configuration.  Some of the uncommon ones
are defaulted to off (you may want to change that, don't know).  Note
also that this only affects the initialization part, and not the actual
build, so until link time the code is still there (the linker sees it
is unreferenced and discards it).  Someone with more autoconf knowledge
than I should probably fix that.

Cheers, Andreas
====================== patch-1.6.0p2-conf.diff ==========================
--- acconfig.h.orig     Mon Dec 31 05:39:38 2001
+++ acconfig.h  Tue Jan 29 10:36:04 2002
@@ -43,7 +43,21 @@
 
 #undef ENABLE_MTRACE
 
+#define ENABLE_BSD
+
+#define ENABLE_DOS
+
+#define ENABLE_GPT
+
+#define ENABLE_LOOP
+
+#undef ENABLE_MAC
+
+#undef ENABLE_MIPS
+
 #undef ENABLE_PC98
+
+#undef ENABLE_SUN
 
 #undef HAVE_CATGETS
 
--- config.h.in.orig    Mon Dec 31 05:43:46 2001
+++ config.h.in Tue Jan 29 13:15:07 2002
@@ -44,8 +44,22 @@
 
 #undef ENABLE_MTRACE
 
+#define ENABLE_BSD
+
+#define ENABLE_DOS
+
+#define ENABLE_GPT
+
+#define ENABLE_LOOP
+
+#undef ENABLE_MAC
+
+#undef ENABLE_MIPS
+
 #undef ENABLE_PC98
 
+#undef ENABLE_SUN
+
 #undef HAVE_CATGETS
 
 #undef HAVE_GETTEXT
--- configure.in.orig   Sat Jan 26 10:37:44 2002
+++ configure.in        Tue Jan 29 13:14:11 2002
@@ -117,12 +117,68 @@
 fi
 AC_SUBST(PARTED_LDFLAGS)
 
+AC_ARG_ENABLE(bsd,
+       [  --enable-bsd          build with bsd support [default=yes]], ,
+       enable_bsd=yes
+)
+if test x$enable_bsd = xyes; then
+       AC_DEFINE(ENABLE_BSD)
+fi
+
+AC_ARG_ENABLE(dos,
+       [  --enable-dos          build with dos support [default=yes]], ,
+       enable_dos=yes
+)
+if test x$enable_dos = xyes; then
+       AC_DEFINE(ENABLE_DOS)
+fi
+
+AC_ARG_ENABLE(gpt,
+       [  --enable-gpt          build with gpt support [default=yes]], ,
+       enable_gpt=yes
+)
+if test x$enable_gpt = xyes; then
+       AC_DEFINE(ENABLE_GPT)
+fi
+
+AC_ARG_ENABLE(loop,
+       [  --enable-loop          build with loop support [default=yes]], ,
+       enable_loop=yes
+)
+if test x$enable_loop = xyes; then
+       AC_DEFINE(ENABLE_LOOP)
+fi
+
+AC_ARG_ENABLE(mac,
+       [  --enable-mac          build with mac support [default=yes]], ,
+       enable_mac=yes
+)
+if test x$enable_mac = xyes; then
+       AC_DEFINE(ENABLE_MAC)
+fi
+
+AC_ARG_ENABLE(mips,
+       [  --enable-mips          build with mips support [default=yes]], ,
+       enable_mips=yes
+)
+if test x$enable_mips = xyes; then
+       AC_DEFINE(ENABLE_MIPS)
+fi
+
 AC_ARG_ENABLE(pc98,
        [  --enable-pc98          build with pc98 support [default=yes]], ,
        enable_pc98=yes
 )
 if test x$enable_pc98 = xyes; then
        AC_DEFINE(ENABLE_PC98)
+fi
+
+AC_ARG_ENABLE(sun,
+       [  --enable-sun          build with sun support [default=yes]], ,
+       enable_sun=yes
+)
+if test x$enable_sun = xyes; then
+       AC_DEFINE(ENABLE_SUN)
 fi
 
 AC_ARG_ENABLE(Werror,
--- libparted/disk_dos.c.orig   Thu Jan 24 05:53:06 2002
+++ libparted/disk_dos.c        Tue Jan 29 10:42:06 2002
@@ -164,16 +164,20 @@
 {
        PedDiskType*    disk_type;
        DosRawTable     part_table;
+#ifdef ENABLE_PC98
        char            possible_pc98_table [PED_SECTOR_SIZE];
        int             pc98_is_zero;
+#endif
        int             i;
 
        PED_ASSERT (dev != NULL, return 0);
 
        if (!ped_device_read (dev, &part_table, 0, 1))
                return 0;
+#ifdef ENABLE_PC98
        if (!ped_device_read (dev, &possible_pc98_table, 1, 1))
                return 0;
+#endif
 
        /* check magic */
        if (PED_LE16_TO_CPU (part_table.magic) != MSDOS_MAGIC)
--- libparted/libparted.c.orig  Wed Jan 16 11:12:33 2002
+++ libparted/libparted.c       Tue Jan 29 10:40:38 2002
@@ -90,17 +90,30 @@
 static void
 init_disk_types ()
 {
+#ifdef ENABLE_LOOP
        ped_disk_loop_init ();  /* must be last in the probe list */
-
+#endif
+#ifdef ENABLE_SUN
        ped_disk_sun_init ();
+#endif
 #ifdef ENABLE_PC98
        ped_disk_pc98_init ();
 #endif
+#ifdef ENABLE_DOS
        ped_disk_msdos_init ();
+#endif
+#ifdef ENABLE_MIPS
        ped_disk_mips_init ();
+#endif
+#ifdef ENABLE_MAC
        ped_disk_mac_init ();
+#endif
+#ifdef ENABLE_GPT
        ped_disk_gpt_init ();
+#endif
+#ifdef ENABLE_BSD
        ped_disk_bsd_init ();
+#endif
 }
 
 #ifdef ENABLE_FS
@@ -141,16 +154,30 @@
 static void
 done_disk_types ()
 {
+#ifdef ENABLE_SUN
        ped_disk_sun_done ();
+#endif
 #ifdef ENABLE_PC98
        ped_disk_pc98_done ();
 #endif
+#ifdef ENABLE_DOS
        ped_disk_msdos_done ();
+#endif
+#ifdef ENABLE_MIPS
        ped_disk_mips_done ();
+#endif
+#ifdef ENABLE_MAC
        ped_disk_mac_done ();
+#endif
+#ifdef ENABLE_LOOP
        ped_disk_loop_done ();
+#endif
+#ifdef ENABLE_GPT
        ped_disk_gpt_done ();
+#endif
+#ifdef ENABLE_BSD
        ped_disk_bsd_done ();
+#endif
 }
 
 static void _init() __attribute__ ((constructor));
--
Andreas Dilger
http://sourceforge.net/projects/ext2resize/
http://www-mddsp.enel.ucalgary.ca/People/adilger/