[Parted-commits] GNU Parted Official Repository: Changes to 'master'
Jim Meyering
meyering at alioth.debian.org
Wed Jun 3 10:48:37 UTC 2009
README-hacking | 58 ++++++++++++++++++++++++++++++--------------
bootstrap.conf | 4 ++-
debug/clearfat/Makefile.am | 1
libparted/Makefile.am | 18 +++++++------
libparted/tests/Makefile.am | 3 --
parted/Makefile.am | 1
partprobe/Makefile.am | 1
7 files changed, 54 insertions(+), 32 deletions(-)
New commits:
commit 1e0e6fcc28cfec5cfb9ad60f2c2bc79c3ec3a663
Author: Jim Meyering <meyering at redhat.com>
Date: Wed Jun 3 12:28:01 2009 +0200
build: require automake-1.11 via bootstrap.conf, too
* bootstrap.conf (buildreq): s/1.10c/1.11/
diff --git a/bootstrap.conf b/bootstrap.conf
index dcb0499..f7f4baa 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -109,7 +109,7 @@ mkdir -p gnulib-tests
# Build prerequisites
buildreq="\
autoconf 2.61
-automake 1.10c
+automake 1.11
autopoint -
gettext -
git 1.4.4
commit 1682bef690baf3d1cc64aceea359284c1ddacb6f
Author: Jim Meyering <meyering at redhat.com>
Date: Wed Jun 3 12:14:05 2009 +0200
doc: sync README-hacking from coreutils
* README-hacking: update
diff --git a/README-hacking b/README-hacking
index 3eb86aa..81ab7f3 100644
--- a/README-hacking
+++ b/README-hacking
@@ -5,45 +5,63 @@ These requirements do not apply when building from a distribution tarball.
* Requirements
-Only the sources are installed in the GIT repository (to ease the
-maintenance, merges etc.), therefore you will have to get the latest
-stable versions of the maintainer tools we depend upon, including:
+We've opted to keep only the highest-level sources in the GIT repository.
+This eases our maintenance burden, (fewer merges etc.), but imposes more
+requirements on anyone wishing to build from the just-checked-out sources.
+Specific tools and versions will be checked for and listed by the
+bootstrap script shown below, and will include:
- Automake <http://www.gnu.org/software/automake/>
- Autoconf <http://www.gnu.org/software/autoconf/>
- Gettext <http://www.gnu.org/software/gettext/>
+- Git <http://git.or.cz/>
- Gzip <http://www.gnu.org/software/gzip/>
+- Perl <http://www.cpan.org/>
+- Rsync <http://samba.anu.edu.au/rsync/>
- Libtool <http://www.gnu.org/software/libtool/>
- Pkg-config <http://pkg-config.freedesktop.org/>
- Tar <http://www.gnu.org/software/tar/>
- Uuid-devel <http://e2fsprogs.sourceforge.net/>
(Debian: uuid-dev, Red Hat: uuid-devel)
-- Wget <http://www.gnu.org/software/wget/>
+
+Only building the initial full source tree will be a bit painful.
+Later, a plain `git pull && make' should be sufficient.
+
+- Valgrind
Valgrind <http://valgrind.org/> is also highly recommended, if
Valgrind supports your architecture.
-Only building the initial full source tree will be a bit painful.
-Later, a plain `git-pull && make' should be sufficient.
+- XZ utils (successor to LZMA)
+
+This package's build procedure uses XZ to create a compressed
+distribution tarball. Using this feature of Automake requires
+version 1.10a or newer, as well as the xz program itself.
+Make sure you have the latest version of the XZ Utils from
+<http://tukaani.org/lzma/download>.
* First GIT checkout
-Obviously, if you are reading these notes, you did manage to check out
-this package from GIT. The next step is to get other files needed to
-build, which are extracted from other source packages:
+You can get a copy of the source repository like this:
+
+ $ git clone git://git.debian.org/git/parted/parted.git
+ $ cd parted
- $ ./bootstrap
+The next step is to get and check other files needed to build,
+which are extracted from other source packages:
+
+ $ ./bootstrap
And there you are! Just
- $ ./configure
- $ make
- $ make check
+ $ ./configure #[--enable-gcc-warnings]
+ $ make
+ $ make check
At this point, there should be no difference between your local copy,
and the GIT master copy:
- $ git-diff
+ $ git-diff
should output no difference.
@@ -51,12 +69,12 @@ Enjoy!
-----
-Copyright (C) 2002-2007 Free Software Foundation, Inc.
+Copyright (C) 2002-2009 Free Software Foundation, Inc.
-This program is free software; you can redistribute it and/or modify
+This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3, or (at your option)
-any later version.
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -65,3 +83,7 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+Local Variables:
+indent-tabs-mode: nil
+End:
commit 9b067b3ef8c5864313d530c9bc4c6af89a7f5af1
Author: Jim Meyering <meyering at redhat.com>
Date: Wed Jun 3 11:54:32 2009 +0200
build: rename internal library: lib/libparted -> lib/libgnulib
* bootstrap.conf (gnulib_name): Define gnulib_name=libgnulib.
* libparted/Makefile.am (libparted_la_LIBADD): Update sole use.
diff --git a/bootstrap.conf b/bootstrap.conf
index 5b3b03c..dcb0499 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -126,3 +126,5 @@ if test -d .git; then
test -e ChangeLog ||
git log --pretty=medium | fold -s > ChangeLog
fi
+
+gnulib_name=libgnulib
diff --git a/libparted/Makefile.am b/libparted/Makefile.am
index 25259dd..c46cbd1 100644
--- a/libparted/Makefile.am
+++ b/libparted/Makefile.am
@@ -39,7 +39,7 @@ EXTRA_libparted_la_SOURCES = arch/linux.c \
libparted_la_LIBADD = \
fs/libfs.la \
labels/liblabels.la \
- $(top_builddir)/lib/libparted.la \
+ $(top_builddir)/lib/libgnulib.la \
$(OS_LIBS) \
$(DL_LIBS) \
$(DM_LIBS) \
commit 14ebefbce43d1c67181813500a7f6a794c4b9789
Author: Jim Meyering <meyering at redhat.com>
Date: Wed Jun 3 10:29:36 2009 +0200
libparted: link with gnulib
* libparted/Makefile.am (libparted_la_LIBADD): Add
$(top_builddir)/lib/libparted.la to the list.
* partprobe/Makefile.am (partprobe_LDADD): Remove now-unneeded
$(top_builddir)/lib/libparted.la.
* libparted/tests/Makefile.am (LDADD): Remove now-unneeded
$(top_builddir)/lib/libparted.la.
* debug/clearfat/Makefile.am (clearfat_LDADD): Likewise.
* parted/Makefile.am (parted_LDADD): Likewise.
Otavio Salvador reported that linking with the resulting shared
library produced an unresolved reference to last_component.
diff --git a/debug/clearfat/Makefile.am b/debug/clearfat/Makefile.am
index 318fba1..99c9348 100644
--- a/debug/clearfat/Makefile.am
+++ b/debug/clearfat/Makefile.am
@@ -4,7 +4,6 @@ clearfat_SOURCES = clearfat.c
clearfat_LDADD = \
$(top_builddir)/libparted/libparted.la \
- $(top_builddir)/lib/libparted.la \
$(INTLLIBS) $(LIBS) \
$(PARTED_LIBS)
diff --git a/libparted/Makefile.am b/libparted/Makefile.am
index 6f52193..25259dd 100644
--- a/libparted/Makefile.am
+++ b/libparted/Makefile.am
@@ -1,5 +1,5 @@
# This file is part of GNU Parted
-# Copyright (C) 1999, 2000, 2001, 2007 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2007, 2009 Free Software Foundation, Inc.
#
# This file may be modified and/or distributed without restriction.
@@ -36,13 +36,15 @@ EXTRA_libparted_la_SOURCES = arch/linux.c \
arch/gnu.c \
arch/beos.c
-libparted_la_LIBADD = $(OS_LIBS) \
- $(DL_LIBS) \
- $(DM_LIBS) \
- $(SELINUX_LIBS) \
- $(INTLLIBS) \
- fs/libfs.la \
- labels/liblabels.la
+libparted_la_LIBADD = \
+ fs/libfs.la \
+ labels/liblabels.la \
+ $(top_builddir)/lib/libparted.la \
+ $(OS_LIBS) \
+ $(DL_LIBS) \
+ $(DM_LIBS) \
+ $(SELINUX_LIBS) \
+ $(INTLLIBS)
EXTRA_DIST = mbr.s
diff --git a/libparted/tests/Makefile.am b/libparted/tests/Makefile.am
index cde1602..197b02d 100644
--- a/libparted/tests/Makefile.am
+++ b/libparted/tests/Makefile.am
@@ -1,5 +1,5 @@
# This file is part of GNU Parted
-# Copyright (C) 1999-2001, 2007-2008 Free Software Foundation, Inc.
+# Copyright (C) 1999-2001, 2007-2009 Free Software Foundation, Inc.
#
# This file may be modified and/or distributed without restriction.
@@ -9,7 +9,6 @@ bin_PROGRAMS = label disk
LDADD = \
$(top_builddir)/libparted/libparted.la \
- $(top_builddir)/lib/libparted.la \
$(CHECK_LIBS)
AM_CPPFLAGS = \
diff --git a/parted/Makefile.am b/parted/Makefile.am
index cb999b1..8c488dd 100644
--- a/parted/Makefile.am
+++ b/parted/Makefile.am
@@ -17,7 +17,6 @@ parted_CFLAGS = -DBUILDINFO=
parted_LDADD = \
$(top_builddir)/libparted/libparted.la \
- $(top_builddir)/lib/libparted.la \
$(INTLLIBS) $(LIBS) \
$(PARTED_LIBS)
diff --git a/partprobe/Makefile.am b/partprobe/Makefile.am
index ec6371c..9d1a4d5 100644
--- a/partprobe/Makefile.am
+++ b/partprobe/Makefile.am
@@ -6,7 +6,6 @@ partprobe_SOURCES = partprobe.c
partprobe_LDADD = \
$(top_builddir)/libparted/libparted.la \
- $(top_builddir)/lib/libparted.la \
$(INTLLIBS) $(LIBS) \
$(PARTED_LIBS)
More information about the Parted-commits
mailing list