Hi Andreas-- On Fri 2016-02-19 12:59:21 -0500, Andreas Metzler wrote: > On 2016-02-17 Daniel Kahn Gillmor <d...@fifthhorseman.net> wrote: > [...] >> The attached set of patches against branch1.6 (also in the >> debian-windows branch of >> https://anonscm.debian.org/git/users/dkg/libgcrypt.git) provides this >> for libgcrypt. > [...] > > Hello, > > this does not build for me on current sid: > /bin/bash ../libtool --mode=compile --tag=RC i686-w64-mingw32-windres > -DHAVE_CONFIG_H -I. -I../../src -I.. -i "versioninfo.rc" -o > "versioninfo.lo" > libtool: compile: i686-w64-mingw32-windres -DHAVE_CONFIG_H -I. -I../../src > -I.. -i versioninfo.rc -o .libs/versioninfo.o > i686-w64-mingw32-windres: versioninfo.rc.in:21: syntax error > Makefile:1240: recipe for target 'versioninfo.lo' failed > make[2]: *** [versioninfo.lo] Error 1
Ugh, it looks like it builds when building from git, but not from a
tarball. This is because we're using autoreconf and upstream's
configure.ac relies on being in a git repo (it selects the revision
number from the number of git commits in the active history).
The attached patch works to build it from a tarball. It is modelled off
the one we're using for libgpg-error, which derives the revision number
From the length of debian/changelog instead of from the count of git
commits.
--dkg
Description: easure revision by length of debian/changelog
Upstream gcrypt's autoreconf step derives the package "revision"
number from the first couple octets of the git commit ID.
.
But Debian doesn't build packages from git, and we autoreconf the
package before building. So we need to figure out a different value
for the package revision.
.
This patch makes the package revision reflect the number of lines in
debian/changelog instead of trying to derive a revision number from
the git ID.
Author: Daniel Kahn Gillmor <d...@fifthhorseman.net>
Last-Update: 2016-02-20
--- a/configure.ac
+++ b/configure.ac
@@ -39,7 +39,7 @@
m4_define(mym4_version,
[mym4_version_major.mym4_version_minor.mym4_version_micro])
m4_define([mym4_revision],
- m4_esyscmd([git rev-parse --short HEAD | tr -d '\n\r']))
+ m4_esyscmd([printf %x $(wc -l < debian/changelog)]))
m4_define([mym4_revision_dec],
m4_esyscmd_s([echo $((0x$(echo ]mym4_revision[|head -c 4)))]))
m4_define([mym4_betastring],
signature.asc
Description: PGP signature
