瀏覽代碼

OSSP fsl is link-time only; modernize flags

Ralf S. Engelschall 22 年之前
父節點
當前提交
1642929a6e
共有 2 個文件被更改,包括 7 次插入7 次删除
  1. 5 5
      imapd/imapd.spec
  2. 2 2
      teapop/teapop.spec

+ 5 - 5
imapd/imapd.spec

@@ -33,7 +33,7 @@ Distribution: OpenPKG [EVAL]
 Group:        Mail
 License:      BSD
 Version:      2.1.13
-Release:      20030502
+Release:      20030530
 
 #   package options
 %option       with_vhost_hack  no
@@ -50,8 +50,8 @@ Patch1:       vhosthack.patch
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20020206, sasl, db >= 4.1.24, openssl, make, perl, perl-openpkg, fsl
-PreReq:       OpenPKG, openpkg >= 20020206, sasl, openssl, perl, MTA, fsl
+BuildPreReq:  OpenPKG, openpkg >= 20030103, sasl, db >= 4.1.24, openssl, make, perl, perl-openpkg, fsl
+PreReq:       OpenPKG, openpkg >= 20030103, sasl, openssl, perl, MTA, fsl
 AutoReq:      no
 AutoReqProv:  no
 Provides:     IMAP
@@ -113,8 +113,8 @@ Provides:     IMAP
 %endif
 
 %build
-    cflags="-I%{l_prefix}/include `%{l_prefix}/bin/fsl-config --all --cflags`"
-    ldflags="-L%{l_prefix}/lib `%{l_prefix}/bin/fsl-config --all --ldflags`"
+    cflags="%{l_cppflags}"
+    ldflags="%{l_ldflags} `%{l_prefix}/bin/fsl-config --all --ldflags`"
     case "%{l_target}" in
         *-solaris* ) ldflags="$ldflags -lsocket -lnsl" ;;
     esac

+ 2 - 2
teapop/teapop.spec

@@ -72,8 +72,8 @@ Provides:     POP
 %build
     #   Building Teapop with OSSP fsl
     CC="%{l_cc}" \
-    CFLAGS="%{l_cflags} `%{l_prefix}/bin/fsl-config --all --cflags`" \
-    CPPFLAGS="%{l_cppflags} `%{l_prefix}/bin/fsl-config --all --cflags`" \
+    CFLAGS="%{l_cflags}" \
+    CPPFLAGS="%{l_cppflags}" \
     LDFLAGS="%{l_ldflags} `%{l_prefix}/bin/fsl-config --all --ldflags`" \
     LIBS="`%{l_prefix}/bin/fsl-config --all --libs`" \
     ./configure \