X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=rpm.spec;h=cfb51d6b7a8747eeb40095b1cad1c2a454f383f3;hb=73b247aa00fdad8d00cd664ba29fd147490f8c39;hp=707c9b9d5bc6118017a64201fae783db38e3a388;hpb=635e71bb9c2fcce962cc35f8d9162c23ec15f7aa;p=packages%2Frpm.git diff --git a/rpm.spec b/rpm.spec index 707c9b9..cfb51d6 100644 --- a/rpm.spec +++ b/rpm.spec @@ -28,6 +28,7 @@ # 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' @@ -47,7 +48,7 @@ Summary(ru.UTF-8): Менеджер пакетов от RPM Summary(uk.UTF-8): Менеджер пакетів від RPM Name: rpm Version: 4.5 -Release: 57 +Release: 58 License: LGPL Group: Base Source0: %{name}-%{version}.tar.gz @@ -243,9 +244,9 @@ 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 +#%%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, @@ -867,9 +868,9 @@ CPPFLAGS="%{rpmcppflags} -I/usr/include/ossp-uuid" --without-db %{__make} \ - CC="%{__newcc}" \ - CXX="%{__newcxx}" \ - CPP="%{__newcpp}" \ + CC="%{__cc}" \ + CXX="%{__cxx}" \ + CPP="%{__cpp}" \ libdb_la=%{_libdir}/libdb.la \ pylibdir=%{py_libdir} \ myLDFLAGS="%{rpmldflags}" \