Fix rpath issues with libraries (finally).
This commit is contained in:
parent
6adb29b50d
commit
3bbc540abe
@ -291,6 +291,10 @@ autoreconf -vi
|
|||||||
--enable-xapian \
|
--enable-xapian \
|
||||||
#
|
#
|
||||||
|
|
||||||
|
# Try to get rid of RPATH....
|
||||||
|
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
|
||||||
|
|
||||||
# The configure script will set up the Perl makefiles, but not in the way
|
# The configure script will set up the Perl makefiles, but not in the way
|
||||||
# Fedora needs them. So regenerate them manually.
|
# Fedora needs them. So regenerate them manually.
|
||||||
for i in perl/annotator perl/imap perl/sieve/managesieve; do
|
for i in perl/annotator perl/imap perl/sieve/managesieve; do
|
||||||
@ -436,6 +440,9 @@ find %buildroot -name ".packlist" -exec rm {} \;
|
|||||||
|
|
||||||
|
|
||||||
%check
|
%check
|
||||||
|
export LD_LIBRARY_PATH=%buildroot/%_libdir
|
||||||
|
export CYRUS_USER=$USER
|
||||||
|
|
||||||
make %{?_smp_mflags} check || exit 1
|
make %{?_smp_mflags} check || exit 1
|
||||||
|
|
||||||
%if %{without cassandane}
|
%if %{without cassandane}
|
||||||
@ -450,9 +457,6 @@ mkdir -p imaptest/src
|
|||||||
ln -s /usr/bin/imaptest imaptest/src
|
ln -s /usr/bin/imaptest imaptest/src
|
||||||
ln -s /usr/share/imaptest/tests imaptest/src
|
ln -s /usr/share/imaptest/tests imaptest/src
|
||||||
|
|
||||||
export LD_LIBRARY_PATH=%buildroot/%_libdir
|
|
||||||
export CYRUS_USER=$USER
|
|
||||||
|
|
||||||
# Construct the set of excluded tests to pass to Cassandane
|
# Construct the set of excluded tests to pass to Cassandane
|
||||||
# ---------------------------------------------------------
|
# ---------------------------------------------------------
|
||||||
exclude=()
|
exclude=()
|
||||||
@ -641,6 +645,7 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d /v
|
|||||||
* Wed Jun 13 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.7-5
|
* Wed Jun 13 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.7-5
|
||||||
- Split out cyr_virusscan into a -virusscan subpackage.
|
- Split out cyr_virusscan into a -virusscan subpackage.
|
||||||
- Split libraries into a -libs subpackage.
|
- Split libraries into a -libs subpackage.
|
||||||
|
- Fix rpath issues in libraries.
|
||||||
|
|
||||||
* Thu Jun 07 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.7-4
|
* Thu Jun 07 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.7-4
|
||||||
- Update Cassandane checkout. Drop upstreamed patch.
|
- Update Cassandane checkout. Drop upstreamed patch.
|
||||||
|
Loading…
Reference in New Issue
Block a user