diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2006-04-26 15:58:19 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2006-04-26 15:58:19 +0200 |
| commit | 42c458038bf47f535a6e70646a08e918e62e6d24 (patch) | |
| tree | 3df574cd63b9186acc57237413f80f1d684709f3 | |
| parent | 00cd59d97e0656dcc0c24c3d24c877d9c4ec4402 (diff) | |
| download | apt-42c458038bf47f535a6e70646a08e918e62e6d24.tar.gz | |
* buildlib/defaults.mak:
- commented the auto-cpu number detections (make -j) out, causes too much
trouble on my SMP system
| -rw-r--r-- | buildlib/defaults.mak | 17 | ||||
| -rw-r--r-- | configure.in | 2 |
2 files changed, 10 insertions, 9 deletions
diff --git a/buildlib/defaults.mak b/buildlib/defaults.mak index c3d08d9d..a171522d 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/configure.in b/configure.in index 4c5583a0..2c4bbcb6 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.6.43.4") +AC_DEFINE_UNQUOTED(VERSION,"0.6.44") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) |