From: Nick Bowler Date: Thu, 30 Apr 2015 03:51:44 +0000 (-0400) Subject: Fix bootstrapping with recent bits. X-Git-Url: https://git.draconx.ca/gitweb/upkg.git/commitdiff_plain/f65f3bf537e517fb5231ff894e198eeb89d727ed Fix bootstrapping with recent bits. I can no longer bootstrap this package on my systems for a few reasons: - Libtool has changed how nonrecursive libltdl is integrated - The version of Gnulib in use does not bootstrap with dash - The dxcommon scripts use Perl modules that I no longer install. Do the necessary dance to fix all those issues, and resolve all the resulting fallout. --- diff --git a/.gitignore b/.gitignore index dd4c212..15c133e 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,5 @@ Makefile.in /snippet /upkg /test-suite.log +/test-driver +/exported.sh diff --git a/Makefile.am b/Makefile.am index 1fc339f..eb23a83 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,7 +5,7 @@ # There is NO WARRANTY, to the extent permitted by law. AUTOMAKE_OPTIONS = parallel-tests color-tests -ACLOCAL_AMFLAGS = -I m4 +ACLOCAL_AMFLAGS = -I m4 -I common/m4 MAINTAINERCLEANFILES = MOSTLYCLEANFILES = CLEANFILES = diff --git a/bootstrap b/bootstrap index 4304be0..d7e5087 100755 --- a/bootstrap +++ b/bootstrap @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright © 2011-2012 Nick Bowler +# Copyright © 2011-2012, 2015 Nick Bowler # # Simple script to get started from a fresh git checkout. # @@ -36,9 +36,18 @@ fi $PERL common/scripts/fix-gnulib.pl -o lib/gnulib.mk -i lib/gnulib.mk.in \ || die "Failed to fixup Gnulib makefile fragment." +# Frustratingly, libtoolize has changed the name of its nonrecursive ltdl +# makefile output, which broke all packages depending on previous documented +# behaviour. Work around the issue by renaming the output. +rm -f libltdl/ltdl.mk $LIBTOOLIZE -f || die "Failed to run libtoolize." +test ! -f libltdl/Makefile.inc || mv -f libltdl/Makefile.inc libltdl/ltdl.mk.in +test ! -f libltdl/ltdl.mk || mv -f libltdl/ltdl.mk libltdl/ltdl.mk.in -$PERL common/scripts/fix-ltdl.pl -o libltdl/ltdl.mk -i libltdl/Makefile.inc \ +$PERL common/scripts/fix-ltdl.pl -o libltdl/ltdl.mk -i libltdl/ltdl.mk.in \ || die "Failed to fixup libltdl makefile fragment." +# Punt some automake-generated files so that Gentoo's wrapper script doesn't +# try to detect the automake version in use. +rm -f Makefile.in aclocal.m4 LIBTOOLIZE=true $AUTORECONF -fis diff --git a/common b/common index ff3807b..483b5af 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit ff3807b3c1ad23f6a8811241665a00a0c9e957f4 +Subproject commit 483b5af7a619117ae6ec3435bb8689e764e928a0 diff --git a/configure.ac b/configure.ac index 43dc62a..21069aa 100644 --- a/configure.ac +++ b/configure.ac @@ -10,7 +10,7 @@ AC_CONFIG_SRCDIR([src/libupkg.c]) AC_CONFIG_HEADER([config.h]) AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects]) +AM_INIT_AUTOMAKE([-Wall -Wno-portability foreign subdir-objects]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AC_PROG_CC_C99 diff --git a/gnulib b/gnulib index aa3de1a..233419c 160000 --- a/gnulib +++ b/gnulib @@ -1 +1 @@ -Subproject commit aa3de1af836fb58f4d28214154afc804e85e49f9 +Subproject commit 233419c39c6d13d84439b95766328a238ffb6518 diff --git a/m4/.gitignore b/m4/.gitignore index d191dec..d89469b 100644 --- a/m4/.gitignore +++ b/m4/.gitignore @@ -1,15 +1,17 @@ 00gnulib.m4 -argz.m4 copysignf.m4 exponentd.m4 exponentf.m4 exponentl.m4 extensions.m4 +extern-inline.m4 float_h.m4 fpieee.m4 getopt.m4 +gnulib-cache.m4~ gnulib-common.m4 gnulib-comp.m4 +gnulib-comp.m4~ gnulib-tool.m4 include_next.m4 isnand.m4 @@ -18,6 +20,7 @@ isnanl.m4 ldexp.m4 ldexpf.m4 libtool.m4 +ltargz.m4 ltdl.m4 ltoptions.m4 ltsugar.m4 diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4 index da9334c..39ed0f6 100644 --- a/m4/gnulib-cache.m4 +++ b/m4/gnulib-cache.m4 @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2012 Free Software Foundation, Inc. +# Copyright (C) 2002-2013 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -49,5 +49,5 @@ gl_CONDITIONAL_DEPENDENCIES gl_LIBTOOL gl_MACRO_PREFIX([gl]) gl_PO_DOMAIN([]) -gl_WITNESS_C_DOMAIN([]) +gl_WITNESS_C_MACRO([]) gl_VC_FILES([false]) diff --git a/src/uobject/uobject.c b/src/uobject/uobject.c index 9c5bfa1..c3cc246 100644 --- a/src/uobject/uobject.c +++ b/src/uobject/uobject.c @@ -1,6 +1,6 @@ /* * upkg: tool for manipulating Unreal Tournament packages. - * Copyright © 2009-2011 Nick Bowler + * Copyright © 2009-2012, 2015 Nick Bowler * * 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 @@ -16,6 +16,7 @@ * along with this program. If not, see . */ +#include #include #include #include diff --git a/tests/.gitignore b/tests/.gitignore index 397b4a7..7e563b8 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -1 +1,2 @@ *.log +*.trs