浏览代码

I don't know why DB 4.6 still breaks slapd(8), but as it still segfaults switch back to DB 4.5 again

Ralf S. Engelschall 18 年之前
父节点
当前提交
3eddfd56ca
共有 1 个文件被更改,包括 6 次插入6 次删除
  1. 6 6
      openldap/openldap.spec

+ 6 - 6
openldap/openldap.spec

@@ -33,7 +33,7 @@ Class:        BASE
 Group:        LDAP
 License:      GPL
 Version:      2.4.6
-Release:      20071031
+Release:      20071103
 
 #   package options
 %option       with_server   yes
@@ -57,8 +57,8 @@ Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
 BuildPreReq:  OpenPKG, openpkg >= 20060823, make, gcc
 PreReq:       OpenPKG, openpkg >= 20060823
-BuildPreReq:  readline, openssl, db >= 4.5
-PreReq:       readline, openssl, db >= 4.5
+BuildPreReq:  readline, openssl, db45
+PreReq:       readline, openssl, db45
 %if "%{with_server}" == "yes" && "%{with_fsl}" == "yes"
 BuildPreReq:  fsl
 PreReq:       fsl
@@ -105,8 +105,8 @@ AutoReqProv:  no
     #   configuration: standard build flags
     export CC="%{l_cc}"
     export CFLAGS="%{l_cflags -O}"
-    export CPPFLAGS="%{l_cppflags}"
-    export LDFLAGS="%{l_ldflags}"
+    export CPPFLAGS="%{l_cppflags db45 .}"
+    export LDFLAGS="%{l_ldflags db45 .}"
     export LIBS=""
     export ARGS=""
     ARGS="$ARGS --prefix=%{l_prefix}"
@@ -195,7 +195,7 @@ AutoReqProv:  no
     #   configuration: use hard-links and make sure our Berkeley-DB is picked up first
     %{l_shtool} subst \
         -e 's;ln -s;ln;g' \
-        -e 's;-ldb4[1-9];%{l_prefix}/lib/libdb.a;g' \
+        -e 's;-ldb4[1-9];%{l_prefix}/lib/db45/libdb.a;g' \
         -e 's;<db\.h>;"db.h";g' \
         configure