浏览代码

adjust for latest SQLite Autoconf world order

Ralf S. Engelschall 17 年之前
父节点
当前提交
597ec946dd
共有 1 个文件被更改,包括 8 次插入10 次删除
  1. 8 10
      sqlite/sqlite.spec

+ 8 - 10
sqlite/sqlite.spec

@@ -37,10 +37,10 @@ Class:        BASE
 Group:        Database
 License:      PD
 Version:      %{V_sqlite}
-Release:      20080323
+Release:      20080329
 
 #   package options
-%option       with_assert          no
+%option       with_debug           no
 %option       with_readline        no
 %option       with_threads         no
 %option       with_fts1            no
@@ -124,9 +124,6 @@ AutoReqProv:  no
     #   configure and build SQLite
     CC="%{l_cc}"
     CFLAGS="%{l_cflags -O}"
-%if "%{with_assert}" == "no"
-    CFLAGS="$CFLAGS -DNDEBUG=1"
-%endif
     CPPFLAGS="-I. %{l_cppflags}"
     LDFLAGS="%{l_ldflags}"
     LIBS="-lm"
@@ -150,12 +147,13 @@ AutoReqProv:  no
 %else
         --disable-readline \
 %endif
-        --disable-shared
-%if "%{with_assert}" == "yes"
-    %{l_shtool} subst \
-        -e 's;-DNDEBUG;;' \
-        Makefile
+%if "%{with_debug}" == "yes"
+        --enable-debug \
+%else
+        --disable-debug \
 %endif
+        --disable-amalgamation \
+        --disable-shared
     MFLAGS=""
 %if "%{with_fts1}" == "yes"
     MFLAGS="$MFLAGS FTS1=1"