The check-symfile and check-symsorting rules were not
taking $(srcdir) into account when accessing the symfile
paths.
Signed-off-by: Daniel P. Berrange <berrange@xxxxxxxxxx>
---
build-aux/check-symsorting.pl | 3 +--
libvirt-gconfig/Makefile.am | 4 ++--
libvirt-glib/Makefile.am | 4 ++--
libvirt-gobject/Makefile.am | 4 ++--
4 files changed, 7 insertions(+), 8 deletions(-)
Pushed as a build-breaker fix.
diff --git a/build-aux/check-symsorting.pl b/build-aux/check-symsorting.pl
index 470247c..31b6059 100755
--- a/build-aux/check-symsorting.pl
+++ b/build-aux/check-symsorting.pl
@@ -19,10 +19,9 @@
use strict;
use warnings;
-die "syntax: $0 SRCDIR SYMFILE..." unless int(@ARGV) >= 2;
+die "syntax: $0 SYMFILE..." unless int(@ARGV) >= 1;
my $ret = 0;
-my $srcdir = shift;
my $incomment = 0;
my $name;
foreach my $symfile (@ARGV) {
diff --git a/libvirt-gconfig/Makefile.am b/libvirt-gconfig/Makefile.am
index e32d222..d328ca7 100644
--- a/libvirt-gconfig/Makefile.am
+++ b/libvirt-gconfig/Makefile.am
@@ -224,14 +224,14 @@ libvirt-gconfig-enum-types.c: $(GCONFIG_HEADER_FILES) libvirt-gconfig-enum-types
# rule for libosvirt-gconfig.la. However, checking symbols relies on Linux ELF layout
if WITH_LINUX
check-symfile: libvirt-gconfig.sym libvirt-gconfig-1.0.la
- $(AM_V_GEN)$(PERL) $(top_srcdir)/build-aux/check-symfile.pl libvirt-gconfig.sym \
+ $(AM_V_GEN)$(PERL) $(top_srcdir)/build-aux/check-symfile.pl $(srcdir)/libvirt-gconfig.sym \
.libs/libvirt-gconfig-1.0.so
else ! WITH_LINUX
check-symfile:
endif ! WITH_LINUX
check-symsorting:
$(AM_V_GEN)$(PERL) $(top_srcdir)/build-aux/check-symsorting.pl \
- $(srcdir) libvirt-gconfig.sym
+ $(srcdir)/libvirt-gconfig.sym
check-local: check-symfile check-symsorting
-include $(INTROSPECTION_MAKEFILE)
diff --git a/libvirt-glib/Makefile.am b/libvirt-glib/Makefile.am
index 15b9917..a48cfbb 100644
--- a/libvirt-glib/Makefile.am
+++ b/libvirt-glib/Makefile.am
@@ -41,14 +41,14 @@ libvirt_glib_1_0_la_LDFLAGS = \
# rule for libosvirt-glib.la. However, checking symbols relies on Linux ELF layout
if WITH_LINUX
check-symfile: libvirt-glib.sym libvirt-glib-1.0.la
- $(AM_V_GEN)$(PERL) $(top_srcdir)/build-aux/check-symfile.pl libvirt-glib.sym \
+ $(AM_V_GEN)$(PERL) $(top_srcdir)/build-aux/check-symfile.pl $(srcdir)/libvirt-glib.sym \
.libs/libvirt-glib-1.0.so
else ! WITH_LINUX
check-symfile:
endif ! WITH_LINUX
check-symsorting:
$(AM_V_GEN)$(PERL) $(top_srcdir)/build-aux/check-symsorting.pl \
- $(srcdir) libvirt-glib.sym
+ $(srcdir)/libvirt-glib.sym
check-local: check-symfile check-symsorting
-include $(INTROSPECTION_MAKEFILE)
diff --git a/libvirt-gobject/Makefile.am b/libvirt-gobject/Makefile.am
index b6b2a5d..516c10f 100644
--- a/libvirt-gobject/Makefile.am
+++ b/libvirt-gobject/Makefile.am
@@ -124,14 +124,14 @@ CLEANFILES = $(BUILT_SOURCES)
# rule for libosvirt-gobject.la. However, checking symbols relies on Linux ELF layout
if WITH_LINUX
check-symfile: libvirt-gobject.sym libvirt-gobject-1.0.la
- $(AM_V_GEN)$(PERL) $(top_srcdir)/build-aux/check-symfile.pl libvirt-gobject.sym \
+ $(AM_V_GEN)$(PERL) $(top_srcdir)/build-aux/check-symfile.pl $(srcdir)/libvirt-gobject.sym \
.libs/libvirt-gobject-1.0.so
else ! WITH_LINUX
check-symfile:
endif ! WITH_LINUX
check-symsorting:
$(AM_V_GEN)$(PERL) $(top_srcdir)/build-aux/check-symsorting.pl \
- $(srcdir) libvirt-gobject.sym
+ $(srcdir)/libvirt-gobject.sym
check-local: check-symfile check-symsorting
-include $(INTROSPECTION_MAKEFILE)
--
1.8.5.3
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list