- multilib support

- build with updated diet-*

Makefile

@@ -47,13 +47,16 @@ DESTDIR =
 
 METHODS ?= full medias network
 BINDIR  ?= /usr/bin
-BINSDIR ?= /usr/lib/propagator/bin
+LIBDIR  ?= /usr/lib
+BINSDIR ?= $(LIBDIR)/propagator/bin
 
 include Makefile.common
 
 STAGE1BINS = $(METHODS:%=stage1-%)
 BINS = init $(STAGE1BINS) gencpio
 
+all: version.h $(BINS)
+
 DEFS =
 ifneq ($(WITH_SHELL),)
 DEFS += -DSPAWN_SHELL
@@ -137,8 +140,6 @@ endif
 endif
 
 
-all: version.h $(BINS) gencpio
-
 init:  $(INITOBJS) $(INIT_LIBC)
 	$(CC) -o $@ $^ $(LDFLAGS_INIT)
 	$(STRIPCMD) $@

Makefile.common

@@ -14,11 +14,9 @@
  #
  #*****************************************************************************
 
-ARCH := $(patsubst i%86,i386,$(shell uname -m))
-ARCH := $(patsubst sparc%,sparc,$(ARCH))
+include /usr/lib/dietlibc/Makefile.rules
 
-DIET_PREFIX = /usr/lib/dietlibc
-DIET_LIBDIR = $(DIET_PREFIX)/lib-$(ARCH)
+DIET_LIBDIR = /usr/lib/dietlibc/lib-$(ARCH)
 
  #- default lib is dietlibc (honoured by main Makefile whenever possible)
 L = DIETLIBC
@@ -38,12 +36,11 @@ endif
 
  #- flags used by all stuff
 ifeq (ppc, $(ARCH))
-CFLAGS = -Os -pipe -Wall -fomit-frame-pointer
+CFLAGS += -Os -pipe -Wall -fomit-frame-pointer
 else
-CFLAGS = -Os -pipe -Wall -Wno-deprecated-declarations -fomit-frame-pointer -D_BSD_SOURCE -D_GNU_SOURCE -D__LIBC_DIETLIBC__
+CFLAGS += -pipe -Wall -Wno-deprecated-declarations -D_BSD_SOURCE -D_GNU_SOURCE
 endif
 
-DIETLIBC_INCLUDES = -I$(DIET_PREFIX)/include
 GLIBC_INCLUDES =
 INCLUDES = -I. $($(L)_INCLUDES)
 
@@ -51,7 +48,8 @@ GCC_LIBDIR=$(shell dirname `gcc -print-libgcc-file-name`)
 LIBGCC_A=$(shell gcc -print-libgcc-file-name)
 
 GLIBC_LDFLAGS_STAGE1 = -static
-DIETLIBC_LDFLAGS_STAGE1 = -nostdlib $(DIET_LIBDIR)/start.o $(LIBGCC_A)
+DIETLIBC_LDFLAGS_STAGE1 = -nostdlib
+# $(LIBGCC_A)
 LDFLAGS_STAGE1 = $($(L)_LDFLAGS_STAGE1)
 
 GLIBC_LIBC =

propagator.spec

@@ -2,7 +2,7 @@
 # $Id$
 
 Name: propagator
-Version: 20050705
+Version: 20050707
 Release: alt1
 
 Summary: 'Early userspace' set of binaries
@@ -11,7 +11,7 @@ Group: System/Kernel and hardware
 
 Source0: %name-%version.tar.bz2
 
-Buildrequires: dietlibc diet-bzlib diet-newt diet-slang mar
+BuildRequires: dietlibc diet-bzlib >= 20050707 diet-newt >= 20050707 diet-slang >= 20050707 mar
 
 %description
 %name is a set of binaries useful in 'early userspace' environment,
@@ -24,13 +24,16 @@ including init and various helpers for hw probing and bootstrapping.
 %__make
 
 %install
-%make_install DESTDIR=%buildroot install
+%make_install DESTDIR=%buildroot LIBDIR=%_libdir install
 
 %files
 %_bindir/gencpio
 %_libdir/%name
 
 %changelog
+* Thu Jul 07 2005 Anton D. Kachalov <mouse@altlinux.org> 20050707-alt1
+- multilib support
+
 * Tue Jul 05 2005 Anton Farygin <rider@altlinux.ru> 20050705-alt1
 - export DNS_SERVER and DNS_SERVER2 for stage2