From 22168d87c6a17964104335a683376c697608595a038df2f63ceff9dfb152a68e Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 4 Oct 2011 09:22:53 +0000 Subject: [PATCH] Accepting request 86476 from home:uli_suse:branches:Base:System - cross-build fix: use %__cc, %configure macros OBS-URL: https://build.opensuse.org/request/show/86476 OBS-URL: https://build.opensuse.org/package/show/Base:System/sysvinit?expand=0&rev=143 --- sysvinit.changes | 5 +++++ sysvinit.spec | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/sysvinit.changes b/sysvinit.changes index 4798832..af56e35 100644 --- a/sysvinit.changes +++ b/sysvinit.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 4 08:51:19 UTC 2011 - uli@suse.com + +- cross-build fix: use %__cc, %configure macros + ------------------------------------------------------------------- Thu Sep 8 15:20:30 UTC 2011 - giecrilj@stegny.2a.pl diff --git a/sysvinit.spec b/sysvinit.spec index e7a7f29..6c239ae 100644 --- a/sysvinit.spec +++ b/sysvinit.spec @@ -123,25 +123,25 @@ popd %build RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -D_FILE_OFFSET_BITS=64 -pipe" - CC=gcc + CC=%__cc export RPM_OPT_FLAGS CC make %{?_smp_mflags} WITH_SELINUX=yes DISTRO=SuSE pushd ../showconsole-%{SCVER} - make %{?_smp_mflags} + make %{?_smp_mflags} CC="%__cc" popd pushd ../killproc-%{KPVER} - make %{?_smp_mflags} INC="-I../showconsole-%{SCVER} -L../showconsole-%{SCVER}" + make %{?_smp_mflags} INC="-I../showconsole-%{SCVER} -L../showconsole-%{SCVER}" CC="%__cc" popd pushd ../powerd-%{PDVER} %ifnarch s390 s390x - ./configure --prefix= --bindir='$(DESTDIR)/sbin' \ + %configure --prefix= --bindir='$(DESTDIR)/sbin' \ --mandir='$(DESTDIR)%{_mandir}' \ --sbindir='$(DESTDIR)/sbin' make %{?_smp_mflags} CFLAGS="-I../sysvinit-%{SIVER}dsf/src $RPM_OPT_FLAGS " %endif popd pushd ../startpar-%{START} - make %{?_smp_mflags} INC="-I../showconsole-%{SCVER} -L../showconsole-%{SCVER}" + make %{?_smp_mflags} INC="-I../showconsole-%{SCVER} -L../showconsole-%{SCVER}" CC="%__cc" popd %install