From 635e71bb9c2fcce962cc35f8d9162c23ec15f7aa Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bartosz=20=C5=9Awi=C4=85tek?= Date: Mon, 3 Oct 2011 17:58:17 +0200 Subject: [PATCH] - finnally works - rel 57 --- rpm.spec | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/rpm.spec b/rpm.spec index 5d34c87..707c9b9 100644 --- a/rpm.spec +++ b/rpm.spec @@ -28,6 +28,9 @@ # force_cc - force using __cc other than "%{_target_cpu}-tld-linux-gcc" # force_cxx - force using __cxx other than "%{_target_cpu}-tld-linux-g++" # force_cpp - force using __cpp other than "%{_target_cpu}-tld-linux-gcc -E" +#%%define force_cc "%{_target_cpu}-tld-linux-gcc" +#%%define force_cxx "%{_target_cpu}-tld-linux-g++" +#%%define force_cpp '%{_target_cpu}-tld-linux-gcc -E' # versions of required libraries %define reqdb_ver 4.5.20 @@ -44,11 +47,11 @@ Summary(ru.UTF-8): Менеджер пакетов от RPM Summary(uk.UTF-8): Менеджер пакетів від RPM Name: rpm Version: 4.5 -Release: 55 +Release: 57 License: LGPL Group: Base Source0: %{name}-%{version}.tar.gz -# Source0-md5: 6b4cda21de59dc250d2e33e4187fd166 +# Source0-md5: 4e69ab971f682c87625dc0f65d9e16bc Source1: %{name}.groups Source2: %{name}.platform Source3: %{name}-install-tree @@ -240,6 +243,10 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define specflags -fno-strict-aliasing +%define _host_alias %{_target_cpu}-tld-linux%{nil} +%define _host_vendor tld +%define _vendor tld + %description RPM is a powerful package manager, which can be used to build, install, query, verify, update, and uninstall individual software @@ -860,9 +867,9 @@ CPPFLAGS="%{rpmcppflags} -I/usr/include/ossp-uuid" --without-db %{__make} \ - CC="%{__cc}" \ - CXX="%{__cxx}" \ - CPP="%{__cpp}" \ + CC="%{__newcc}" \ + CXX="%{__newcxx}" \ + CPP="%{__newcpp}" \ libdb_la=%{_libdir}/libdb.la \ pylibdir=%{py_libdir} \ myLDFLAGS="%{rpmldflags}" \ -- 2.46.0