tags 623402 + pending thanks Dear maintainer,
I've prepared an NMU for cpio (versioned as 2.11+dfsg-1.1) and uploaded it to DELAYED/10. Please feel free to tell me if I should delay it longer. Regards, Stephen
diff -Nru cpio-2.11+dfsg/debian/changelog cpio-2.11+dfsg/debian/changelog --- cpio-2.11+dfsg/debian/changelog 2013-06-01 04:09:20.000000000 +0200 +++ cpio-2.11+dfsg/debian/changelog 2014-03-22 23:25:42.000000000 +0100 @@ -1,3 +1,12 @@ +cpio (2.11+dfsg-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Build using mingw-w64 instead of mingw32. Closes: #623402. + * Clean up autom4te.cache and config.guess/config.sub to allow building + twice in a row. + + -- Stephen Kitt <sk...@debian.org> Sat, 22 Mar 2014 23:23:25 +0100 + cpio (2.11+dfsg-1) unstable; urgency=low * Standards Version is 3.9.4 diff -Nru cpio-2.11+dfsg/debian/control cpio-2.11+dfsg/debian/control --- cpio-2.11+dfsg/debian/control 2013-06-01 03:02:23.000000000 +0200 +++ cpio-2.11+dfsg/debian/control 2014-03-22 21:37:42.000000000 +0100 @@ -4,7 +4,7 @@ Maintainer: Ruben Molina <rmol...@udea.edu.co> Uploaders: Anibal Monsalve Salazar <ani...@debian.org> Build-Depends: texinfo, gettext, autotools-dev -Build-Depends-Indep: mingw32 +Build-Depends-Indep: mingw-w64 Standards-Version: 3.9.4 Homepage: http://www.gnu.org/software/cpio/ Vcs-Git: git://git.debian.org/git/private/schizo/cpio diff -Nru cpio-2.11+dfsg/debian/patches/fix.win32.undef.stat.patch cpio-2.11+dfsg/debian/patches/fix.win32.undef.stat.patch --- cpio-2.11+dfsg/debian/patches/fix.win32.undef.stat.patch 1970-01-01 01:00:00.000000000 +0100 +++ cpio-2.11+dfsg/debian/patches/fix.win32.undef.stat.patch 2014-03-22 23:22:31.000000000 +0100 @@ -0,0 +1,29 @@ +Description: Prevent undefinition of stat +Author: Stephen Kitt <sk...@debian.org> + +MinGW-w64 redefines the stat structure, and the rpl_ redefinitions in +sys/stat.h here play havoc with that. In any case rpl_stat isn't +defined... + +--- a/gnu/sys_stat.in.h ++++ b/gnu/sys_stat.in.h +@@ -574,19 +574,6 @@ + + #if @GNULIB_STAT@ + # if @REPLACE_STAT@ +-/* We can't use the object-like #define stat rpl_stat, because of +- struct stat. This means that rpl_stat will not be used if the user +- does (stat)(a,b). Oh well. */ +-# undef stat +-# ifdef _LARGE_FILES +- /* With _LARGE_FILES defined, AIX (only) defines stat to stat64, +- so we have to replace stat64() instead of stat(). */ +-# define stat stat64 +-# undef stat64 +-# define stat64(name, st) rpl_stat (name, st) +-# else /* !_LARGE_FILES */ +-# define stat(name, st) rpl_stat (name, st) +-# endif /* !_LARGE_FILES */ + _GL_EXTERN_C int stat (const char *name, struct stat *buf) _GL_ARG_NONNULL ((1, 2)); + # endif + #elif defined GNULIB_POSIXCHECK diff -Nru cpio-2.11+dfsg/debian/patches/series cpio-2.11+dfsg/debian/patches/series --- cpio-2.11+dfsg/debian/patches/series 2013-06-01 03:09:39.000000000 +0200 +++ cpio-2.11+dfsg/debian/patches/series 2014-03-22 23:01:46.000000000 +0100 @@ -8,3 +8,4 @@ 627444-invalid-redefinition-of-stat.patch 695717-no-cpio.info.patch glibc-2.16-gnulib-nogets.patch +fix.win32.undef.stat.patch diff -Nru cpio-2.11+dfsg/debian/rules cpio-2.11+dfsg/debian/rules --- cpio-2.11+dfsg/debian/rules 2013-06-01 03:12:17.000000000 +0200 +++ cpio-2.11+dfsg/debian/rules 2014-03-22 23:22:58.000000000 +0100 @@ -39,7 +39,8 @@ obj-win32/Makefile: $(checkdir) mkdir -p obj-win32 - cd obj-win32 && CFLAGS='$(CFLAGS)' ../configure --host i586-mingw32msvc +# static to avoid needing the pthreads DLL + cd obj-win32 && CFLAGS='-static $(CFLAGS)' ../configure --host i686-w64-mingw32 build-arch: build build-indep: build @@ -65,7 +66,8 @@ $(RM) -r obj obj-win32 $(RM) -r *~ debian/tmp debian/tmp-win32 debian/*~ debian/files* $(RM) -f debian/substvars -# $(RM) -rf autom4te.cache + $(RM) -rf autom4te.cache + $(RM) -f build-aux/config.guess build-aux/config.sub binary-indep: checkroot build build-win32 $(checkdir) @@ -77,7 +79,7 @@ debian/tmp-win32/usr/share/win32 # Install files install -m 755 obj-win32/src/cpio.exe debian/tmp-win32/usr/share/win32/ - i586-mingw32msvc-strip debian/tmp-win32/usr/share/win32/cpio.exe + i686-w64-mingw32-strip debian/tmp-win32/usr/share/win32/cpio.exe # Install changelog & copyright install -m 644 debian/changelog \ debian/tmp-win32/usr/share/doc/$(package)-win32/changelog.Debian
signature.asc
Description: Digital signature
