From c5198dc1d0edeb3999741f00a25ec946cd66d6b9 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 25 Oct 2005 09:23:47 +0000 Subject: * added armeb to archtable --- buildlib/archtable | 1 + buildlib/sizetable | 1 + 2 files changed, 2 insertions(+) (limited to 'buildlib') diff --git a/buildlib/archtable b/buildlib/archtable index b01743c02..af1123d02 100644 --- a/buildlib/archtable +++ b/buildlib/archtable @@ -11,6 +11,7 @@ sparc sparc sparc64 sparc alpha.* alpha m68k m68k +armeb.* armeb arm.* arm powerpc powerpc ppc powerpc diff --git a/buildlib/sizetable b/buildlib/sizetable index 911180145..51a136d4a 100644 --- a/buildlib/sizetable +++ b/buildlib/sizetable @@ -12,6 +12,7 @@ # CPU endian sizeof: char, int, short, long i386 little 1 4 2 4 arm little 1 4 2 4 +armeb big 1 4 2 4 alpha little 1 4 2 8 mipsel little 1 4 2 4 sparc big 1 4 2 4 -- cgit v1.2.3 From 670c56e521e3f59be7722f1243399d8289e14626 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 8 Nov 2005 16:19:07 +0000 Subject: * merged the NMU from Franz Pop, fixed armeb problem (#333599) --- buildlib/archtable | 2 +- buildlib/sizetable | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'buildlib') diff --git a/buildlib/archtable b/buildlib/archtable index af1123d02..197529202 100644 --- a/buildlib/archtable +++ b/buildlib/archtable @@ -11,7 +11,7 @@ sparc sparc sparc64 sparc alpha.* alpha m68k m68k -armeb.* armeb +arm.*b armeb arm.* arm powerpc powerpc ppc powerpc diff --git a/buildlib/sizetable b/buildlib/sizetable index 51a136d4a..cf6a3ae2d 100644 --- a/buildlib/sizetable +++ b/buildlib/sizetable @@ -11,6 +11,7 @@ # The format is:- # CPU endian sizeof: char, int, short, long i386 little 1 4 2 4 +armeb big 1 4 2 4 arm little 1 4 2 4 armeb big 1 4 2 4 alpha little 1 4 2 8 -- cgit v1.2.3 From 19326d244793da9135d3ef0d026b5c29a82fc27a Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 8 Nov 2005 16:27:58 +0000 Subject: * removed double armeb entry in buildlib/sizetable --- buildlib/sizetable | 1 - 1 file changed, 1 deletion(-) (limited to 'buildlib') diff --git a/buildlib/sizetable b/buildlib/sizetable index cf6a3ae2d..8b18528cf 100644 --- a/buildlib/sizetable +++ b/buildlib/sizetable @@ -13,7 +13,6 @@ i386 little 1 4 2 4 armeb big 1 4 2 4 arm little 1 4 2 4 -armeb big 1 4 2 4 alpha little 1 4 2 8 mipsel little 1 4 2 4 sparc big 1 4 2 4 -- cgit v1.2.3 From 6f0bde75a27674763fb0542e9acd35bac18c1710 Mon Sep 17 00:00:00 2001 From: Christian Perrier Date: Tue, 10 Jan 2006 13:51:09 +0000 Subject: Patch to allow "make apt-all.pot" work in the baz archive --- buildlib/podomain.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'buildlib') diff --git a/buildlib/podomain.mak b/buildlib/podomain.mak index e1ae0c805..511a5cae2 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: $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list +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 42c458038bf47f535a6e70646a08e918e62e6d24 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 26 Apr 2006 15:58:19 +0200 Subject: * buildlib/defaults.mak: - commented the auto-cpu number detections (make -j) out, causes too much trouble on my SMP system --- buildlib/defaults.mak | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'buildlib') diff --git a/buildlib/defaults.mak b/buildlib/defaults.mak index c3d08d9d4..a171522d5 100644 --- a/buildlib/defaults.mak +++ b/buildlib/defaults.mak @@ -174,11 +174,12 @@ ifeq ($(NUM_PROCS),1) PARALLEL_RUN=no endif -ifndef PARALLEL_RUN - PARALLEL_RUN=yes - .EXPORT: PARALLEL_RUN - # handle recursion - ifneq ($(NUM_PROCS),) - MAKEFLAGS += -j $(NUM_PROCS) - endif -endif +# mvo: commented out, lead to build failures in the arch-build target +#ifndef PARALLEL_RUN +# PARALLEL_RUN=yes +# .EXPORT: PARALLEL_RUN +# # handle recursion +# ifneq ($(NUM_PROCS),) +# MAKEFLAGS += -j $(NUM_PROCS) +# endif +#endif -- cgit v1.2.3 From 21e1008e144c50770997bc00dc1b27826a31064c Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sat, 30 Sep 2006 14:28:00 +0200 Subject: * apt-pkg/deb/dpkgpm.cc: - translate the dpkg progress strings when they are used, not in the struct (thanks to Steinar Gunderson) * debian/changelog: - updated --- buildlib/apti18n.h.in | 2 ++ 1 file changed, 2 insertions(+) (limited to 'buildlib') diff --git a/buildlib/apti18n.h.in b/buildlib/apti18n.h.in index 812457643..a5b91b1ee 100644 --- a/buildlib/apti18n.h.in +++ b/buildlib/apti18n.h.in @@ -14,8 +14,10 @@ # else # define _(x) gettext(x) # endif +# define N_(x) x #else // apt will not use any gettext # define setlocale(a, b) # define _(x) x +# define N_(x) x #endif -- cgit v1.2.3