From a11afb9d0dd5d2326acb2de19ea20b49238667d0 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 21 Mar 2012 23:47:54 +0100 Subject: do not update po and pot files in the process of the build as this causes timestamp changes for the mo files which therefore can't be refcounted by dpkg for your M-A: same packages (Closes: #659333, LP: #924628) The commit also enables a top-level 'make update-po' and does all the needed changes to let this work now that update-po might be called in a freshly checkout tree --- buildlib/defaults.mak | 2 +- buildlib/podomain.mak | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'buildlib') diff --git a/buildlib/defaults.mak b/buildlib/defaults.mak index edb089160..c10813e9d 100644 --- a/buildlib/defaults.mak +++ b/buildlib/defaults.mak @@ -121,7 +121,7 @@ MKDIRS := $(BIN) all: dirs binary doc binary: library program maintainer-clean dist-clean distclean pristine sanity: veryclean -headers library clean veryclean program test: +startup headers library clean veryclean program test update-po: veryclean: echo Very Clean done for $(SUBDIR) diff --git a/buildlib/podomain.mak b/buildlib/podomain.mak index 511a5cae2..bb1c77e47 100644 --- a/buildlib/podomain.mak +++ b/buildlib/podomain.mak @@ -14,7 +14,7 @@ MKDIRS += $(PO_DOMAINS)/$(MY_DOMAIN) $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list: SRC := $(addprefix $(SUBDIR)/,$(SOURCE)) $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list: makefile (echo $(SRC) | xargs -n1 echo) > $@ -binary program clean: $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list +startup binary program clean: $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list veryclean: veryclean/$(LOCAL) veryclean/po/$(LOCAL): LIST := $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list -- cgit v1.2.3 From 9179f697ed4796a86f820b516f034fd679e48be4 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 22 Mar 2012 00:16:11 +0100 Subject: the previously used VERSION didn't work everywhere so we are switching to the more standard PACKAGE_VERSION and make it work in every file --- buildlib/config.h.in | 6 +++--- buildlib/environment.mak.in | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'buildlib') diff --git a/buildlib/config.h.in b/buildlib/config.h.in index 4798fe3f5..87918bbec 100644 --- a/buildlib/config.h.in +++ b/buildlib/config.h.in @@ -39,10 +39,10 @@ /* Define the arch name string */ #undef COMMON_ARCH -/* The version number string */ -#undef VERSION - /* The package name string */ #undef PACKAGE +/* The version number string */ +#undef PACKAGE_VERSION + #define APT_8_CLEANER_HEADERS diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in index fdac3e6c3..b8ddb34a2 100644 --- a/buildlib/environment.mak.in +++ b/buildlib/environment.mak.in @@ -2,6 +2,7 @@ # if you want you can edit it, just don't re-run configure. PACKAGE = @PACKAGE@ +PACKAGE_VERSION = @PACKAGE_VERSION@ # C++ compiler options CC = @CC@ -- cgit v1.2.3 From 7efb8c8ef10c1d0b9479c24a6a5b4e96fc0e6286 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 5 Apr 2012 15:18:03 +0200 Subject: detect zlib correctly. We still don't allow to build without it to remain compatible with users accessing it directly, but this prepares for a drop of this strict requirement in the future --- buildlib/config.h.in | 3 +++ 1 file changed, 3 insertions(+) (limited to 'buildlib') diff --git a/buildlib/config.h.in b/buildlib/config.h.in index 87918bbec..43d39d304 100644 --- a/buildlib/config.h.in +++ b/buildlib/config.h.in @@ -19,6 +19,9 @@ /* Define if we have the timegm() function */ #undef HAVE_TIMEGM +/* Define if we have the zlib library for gzip */ +#undef HAVE_ZLIB + /* These two are used by the statvfs shim for glibc2.0 and bsd */ /* Define if we have sys/vfs.h */ #undef HAVE_VFS_H -- cgit v1.2.3 From c4997486bffc76e2581e9072bff05eba0feeb29c Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 5 Apr 2012 20:51:36 +0200 Subject: - add libbz2-dev as new build-dependency - remove the libz-dev alternative from zlib1g-dev build-dependency - do the same for bz2 builtin if available * apt-pkg/contrib/fileutl.cc: - use libz2 library for (de)compression instead of the bzip2 binary as the first is a dependency of dpkg and the later just priority:optional so we gain 'easier' access to bz2-compressed Translation files this way --- buildlib/config.h.in | 3 +++ buildlib/environment.mak.in | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'buildlib') diff --git a/buildlib/config.h.in b/buildlib/config.h.in index 43d39d304..b07d4f77f 100644 --- a/buildlib/config.h.in +++ b/buildlib/config.h.in @@ -22,6 +22,9 @@ /* Define if we have the zlib library for gzip */ #undef HAVE_ZLIB +/* Define if we have the bz2 library for bzip2 */ +#undef HAVE_BZ2 + /* These two are used by the statvfs shim for glibc2.0 and bsd */ /* Define if we have sys/vfs.h */ #undef HAVE_VFS_H diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in index b8ddb34a2..0f0fac095 100644 --- a/buildlib/environment.mak.in +++ b/buildlib/environment.mak.in @@ -55,7 +55,8 @@ INTLLIBS = @INTLLIBS@ # Shim Headerfile control HAVE_C9X = @HAVE_C9X@ HAVE_STATVFS = @HAVE_STATVFS@ -HAVE_TIMEGM = @HAVE_TIMEGM@ +HAVE_ZLIB = @HAVE_ZLIB@ +HAVE_BZ2 = @HAVE_BZ2@ NEED_SOCKLEN_T_DEFINE = @NEED_SOCKLEN_T_DEFINE@ # Shared library things -- cgit v1.2.3