Просмотр исходного кода

use libtool hammer to nail dependent libraries pulled in by sasl

Michael van Elst 23 лет назад
Родитель
Сommit
a7bb694464
1 измененных файлов с 13 добавлено и 2 удалено
  1. 13 2
      imapd/imapd.spec

+ 13 - 2
imapd/imapd.spec

@@ -33,7 +33,7 @@ Distribution: OpenPKG [EVAL]
 Group:        Mail
 License:      BSD
 Version:      2.1.12
-Release:      20030228
+Release:      20030311
 
 #   list of sources
 Source0:      ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-%{version}.tar.gz
@@ -45,7 +45,7 @@ Patch0:       imapd.patch
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20020206, sasl, db >= 4.1.24, openssl, make, perl, perl-openpkg
+BuildPreReq:  OpenPKG, openpkg >= 20020206, sasl, db >= 4.1.24, openssl, make, perl, perl-openpkg, libtool
 PreReq:       OpenPKG, openpkg >= 20020206, sasl, openssl, perl, MTA
 AutoReq:      no
 AutoReqProv:  no
@@ -97,6 +97,16 @@ Provides:     IMAP
         -e "s;^\(\$sievedir = \"\).*$;\1$RPM_BUILD_ROOT%{l_prefix}/var/imapd/sieve\"\;;" \
         tools/mkimap
 
+    # avoid sasl2 test in case of dependent libraries from sasl package
+    ( echo 'ac_cv_lib_sasl2_prop_get=yes'
+      echo 'ac_cv_lib_sasl2_sasl_checkapop=yes'
+    ) >cache.config
+
+    # use libtool to catch dependencies
+    %{l_shtool} subst \
+        -e 's;\$(CC) \(\$(LDFLAGS)\);%{l_libtool} --mode=link \$(CC);g' \
+        */Makefile.in
+
 %build
     cflags="-I%{l_prefix}/include"
     ldflags="-L%{l_prefix}/lib"
@@ -108,6 +118,7 @@ Provides:     IMAP
     CFLAGS="%{l_cflags -O} $cflags" \
     LDFLAGS="$ldflags" \
     ./configure \
+        --cache-file=./cache.config \
         --prefix=%{l_prefix} \
         --with-openssl=%{l_prefix} \
         --with-dbdir=%{l_prefix} \