diff options
| author | Michael Vogt <egon@tas> | 2006-12-07 11:45:13 +0100 |
|---|---|---|
| committer | Michael Vogt <egon@tas> | 2006-12-07 11:45:13 +0100 |
| commit | 207825063be51d68768e242f06b26ee6fccd3aaf (patch) | |
| tree | 4c755597279d2574e787460c5d0f3bc34d132a64 /buildlib | |
| parent | 7106240056767caad5a55fe9c542842065cb5829 (diff) | |
| parent | 1c05ebd6da9491d316997a98db1451f7b0526603 (diff) | |
merged with apt--mvo
Diffstat (limited to 'buildlib')
| -rw-r--r-- | buildlib/apti18n.h.in | 2 | ||||
| -rw-r--r-- | buildlib/archtable | 1 | ||||
| -rw-r--r-- | buildlib/defaults.mak | 17 | ||||
| -rw-r--r-- | buildlib/podomain.mak | 2 | ||||
| -rw-r--r-- | buildlib/sizetable | 1 |
5 files changed, 14 insertions, 9 deletions
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 diff --git a/buildlib/archtable b/buildlib/archtable index b01743c02..197529202 100644 --- a/buildlib/archtable +++ b/buildlib/archtable @@ -11,6 +11,7 @@ sparc sparc sparc64 sparc alpha.* alpha m68k m68k +arm.*b armeb arm.* arm powerpc powerpc ppc powerpc 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 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 diff --git a/buildlib/sizetable b/buildlib/sizetable index 911180145..8b18528cf 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 alpha little 1 4 2 8 mipsel little 1 4 2 4 |