fix linking without rpath, prelink won't screw up the libraries anymore
Resolves: #475265
This commit is contained in:
parent
a67b803d7d
commit
cb2006c8a5
@ -14,7 +14,7 @@ Source2: openipmi.initscript
|
|||||||
Source3: openipmigui.desktop
|
Source3: openipmigui.desktop
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
BuildRequires: gdbm-devel swig glib2-devel net-snmp-devel ncurses-devel
|
BuildRequires: gdbm-devel swig glib2-devel net-snmp-devel ncurses-devel
|
||||||
BuildRequires: openssl-devel python-devel perl-devel chrpath tcl-devel tkinter
|
BuildRequires: openssl-devel python-devel perl-devel tcl-devel tkinter
|
||||||
BuildRequires: desktop-file-utils
|
BuildRequires: desktop-file-utils
|
||||||
Requires(post): chkconfig
|
Requires(post): chkconfig
|
||||||
Requires(preun): chkconfig
|
Requires(preun): chkconfig
|
||||||
@ -73,20 +73,21 @@ and control IPMI-enabled devices.
|
|||||||
%build
|
%build
|
||||||
export CFLAGS=-fPIC
|
export CFLAGS=-fPIC
|
||||||
%configure --with-pythoninstall=%{python_sitearch} --disable-dependency-tracking --with-tcl=no --disable-static
|
%configure --with-pythoninstall=%{python_sitearch} --disable-dependency-tracking --with-tcl=no --disable-static
|
||||||
sed -i 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir}|' libtool
|
# get rid of rpath
|
||||||
make # not %{?_smp_mflags} safe
|
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
|
||||||
|
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
|
||||||
|
|
||||||
|
make # not %{?_smp_mflags} safe
|
||||||
|
|
||||||
%install
|
%install
|
||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf $RPM_BUILD_ROOT
|
||||||
make install DESTDIR=$RPM_BUILD_ROOT
|
make install DESTDIR=$RPM_BUILD_ROOT
|
||||||
rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la
|
rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la
|
||||||
|
|
||||||
# Remove python cruft in 32bit libdir on 64bit archs...
|
# Remove python cruft in 32bit libdir on 64bit archs...
|
||||||
%ifarch ppc64 s390x x86_64
|
%ifarch ppc64 s390x x86_64
|
||||||
rm -rf $RPM_BUILD_ROOT/usr/lib
|
rm -rf $RPM_BUILD_ROOT/usr/lib
|
||||||
%endif
|
%endif
|
||||||
# Remove rpaths from libOpenIPMIposix.so.0.0.1
|
|
||||||
chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libOpenIPMIposix.so.0.0.1
|
|
||||||
# Remove static libraries
|
|
||||||
|
|
||||||
install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
|
install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
|
||||||
install -m 644 %SOURCE1 ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/ipmi
|
install -m 644 %SOURCE1 ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/ipmi
|
||||||
@ -164,6 +165,10 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_datadir}/applications/fedora-openipmigui.desktop
|
%{_datadir}/applications/fedora-openipmigui.desktop
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Dec 11 2008 Jan Safranek <jsafrane@redhat.com> - 2.0.14-9
|
||||||
|
- fix linking without rpath, prelink won't screw up the libraries
|
||||||
|
anymore (#475265)
|
||||||
|
|
||||||
* Wed Dec 10 2008 Jan Safranek <jsafrane@redhat.com> - 2.0.14-8
|
* Wed Dec 10 2008 Jan Safranek <jsafrane@redhat.com> - 2.0.14-8
|
||||||
- shorter probe interval is used in init script, making the service startup
|
- shorter probe interval is used in init script, making the service startup
|
||||||
quicker in most situations (#475101)
|
quicker in most situations (#475101)
|
||||||
|
Loading…
Reference in New Issue
Block a user