[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
build fixes
From: |
Jim Meyering |
Subject: |
build fixes |
Date: |
Fri, 13 Jan 2012 23:09:58 +0100 |
I introduced a build failure with a recent warning-avoidance
patch. Unfortunately for me, it doesn't show up if you
build only from a working directory with preexisting generated
dependencies. The LT_INIT patch is similar.
The bug it fixes may have been introduced with the bootstrap
upgrade. I didn't investigate its origin. Preparing the
c-sets to add a new fs-resizing library is taking priority.
>From c286b5779ec484de50a912f2b4128a1788a31cab Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Fri, 13 Jan 2012 19:03:48 +0100
Subject: [PATCH 1/3] build: use LT_INIT, to make bootstrap run libtoolize
* configure.ac: Use LT_INIT, so that bootstrap runs libtoolize,
which creates build-aux/ltmain.sh.
---
configure.ac | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/configure.ac b/configure.ac
index 82ffd4a..1444279 100644
--- a/configure.ac
+++ b/configure.ac
@@ -280,6 +280,7 @@ libraries.)
AM_DISABLE_SHARED
fi
AC_PROG_LIBTOOL
+LT_INIT
AM_GNU_GETTEXT_VERSION([0.18])
AM_GNU_GETTEXT([external])
--
1.7.9.rc0.29.g3f28d
>From 70e6e96d98f7fa4246eaac52fba75c10327ab403 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Fri, 13 Jan 2012 19:10:46 +0100
Subject: [PATCH 2/3] build: don't use -version for convenience libraries
Don't use -release, either. This avoids warnings from libtool.
* libparted/fs/Makefile.am (libfs_la_LDFLAGS): Remove.
---
libparted/fs/Makefile.am | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/libparted/fs/Makefile.am b/libparted/fs/Makefile.am
index 30259f4..6339cfd 100644
--- a/libparted/fs/Makefile.am
+++ b/libparted/fs/Makefile.am
@@ -4,9 +4,7 @@
# This file may be modified and/or distributed without restriction.
partedincludedir = -I$(top_builddir)/include -I$(top_srcdir)/include
-noinst_LTLIBRARIES = libfs.la
-libfs_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
- -release $(LT_RELEASE)
+noinst_LTLIBRARIES = libfs.la
libfs_la_LIBADD = $(UUID_LIBS) \
$(INTLLIBS) \
--
1.7.9.rc0.29.g3f28d
>From f56bc2dfa852c399687c69dded419fa7a1be837b Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Fri, 13 Jan 2012 23:02:21 +0100
Subject: [PATCH 3/3] build: revert the recent "fix" to avoid make warnings
about linux.lo
It avoided the warning, but introduced a real problem
when building from a clean directory.
The real solution will have to wait, since it appears to
depend on a fix in automake.
This reverts commit a3c351c2d1cf2c0000bbc681959695c612bd19a0.
---
libparted/Makefile.am | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/libparted/Makefile.am b/libparted/Makefile.am
index 6aeab5a..f8fbba5 100644
--- a/libparted/Makefile.am
+++ b/libparted/Makefile.am
@@ -44,11 +44,10 @@ libparted_la_SOURCES = debug.c \
$(ARCH_SOURCE)
-EXTRA_DIST = \
- arch/linux.c \
- arch/linux.h \
- arch/gnu.c \
- arch/beos.c
+EXTRA_libparted_la_SOURCES = arch/linux.c \
+ arch/linux.h \
+ arch/gnu.c \
+ arch/beos.c
libparted_la_LIBADD = \
fs/libfs.la \
@@ -61,6 +60,6 @@ libparted_la_LIBADD = \
$(LIB_BLKID) \
$(INTLLIBS)
-EXTRA_DIST += mbr.s
+EXTRA_DIST = mbr.s
INCLUDES = $(partedincludedir) $(INTLINCS)
--
1.7.9.rc0.29.g3f28d
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- build fixes,
Jim Meyering <=