From 27336e6ee25eeccf3a0df97a32abad75a47912e03fc7d4ab6a68430ee13d0266 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 8 Dec 2009 11:52:45 +0000 Subject: [PATCH] checked in OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=25 --- util-linux.changes | 5 ----- util-linux.spec | 14 +++++++------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/util-linux.changes b/util-linux.changes index 4e52c46..9373009 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Sun Dec 6 15:07:33 CET 2009 - jengelh@medozas.de - -- enabled parallel build - ------------------------------------------------------------------- Mon Nov 30 17:05:38 CET 2009 - meissner@suse.de diff --git a/util-linux.spec b/util-linux.spec index d230661..caa5b31 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -174,12 +174,12 @@ cd ../which-* # adjtimex build cd adjtimex-%{adjtimex_ver} CFLAGS="$RPM_OPT_FLAGS" ./configure -make %{?jobs:-j%jobs} +make cd .. pushd ../ # freeramdisk build cd freeramdisk -make %{?jobs:-j%jobs} CFLAGS="$RPM_OPT_FLAGS" freeramdisk +make CFLAGS="$RPM_OPT_FLAGS" freeramdisk cd .. # which build cd which-%{which_ver} @@ -192,7 +192,7 @@ CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr \ --mandir=%{_mandir} \ --infodir=%{_infodir} \ %{_target_cpu}-suse-linux -make %{?jobs:-j%jobs} +make cd .. # time build cd time-%{time_ver} @@ -202,16 +202,16 @@ CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE " INSTALL_PROGRAM='$(INSTALL)' \ --mandir=%{_mandir} \ --infodir=%{_infodir} \ %{_target_cpu}-suse-linux -make %{?jobs:-j%jobs} +make cd .. # klogconsole build cd klogconsole -make %{?jobs:-j%jobs} CFLAGS="$RPM_OPT_FLAGS" +make CFLAGS="$RPM_OPT_FLAGS" cd .. popd # setctsid build rm -f setctsid -make %{?jobs:-j%jobs} setctsid CFLAGS="$RPM_OPT_FLAGS" +make setctsid CFLAGS="$RPM_OPT_FLAGS" # # util-linux itself # @@ -241,7 +241,7 @@ autoreconf -fi --disable-static \ $BUILD_ENABLE \ CFLAGS="$CFLAGS $RPM_OPT_FLAGS" -make %{?jobs:-j%jobs} +make gcc $RPM_OPT_FLAGS -o nologin nologin.c gcc $RPM_OPT_FLAGS -o mkzimage_cmdline %{S:29} gcc $RPM_OPT_FLAGS -o chrp-addnote %{SOURCE31}