浏览代码

Backout last changes

Ralf S. Engelschall 23 年之前
父节点
当前提交
db71dfa2ef
共有 1 个文件被更改,包括 12 次插入8 次删除
  1. 12 8
      pgp/pgp.spec

+ 12 - 8
pgp/pgp.spec

@@ -37,7 +37,7 @@ Distribution: OpenPKG [REL]
 Group:        Cryptography
 License:      GPL
 Version:      %{V_long}
-Release:      20020621
+Release:      20020206
 
 #   list of sources
 Source0:      ftp://ftp.pgpi.org/pub/pgp/%{V_short}/%{V_long}/pgpsrc%{V_strip}unix.tar.gz
@@ -68,21 +68,25 @@ AutoReqProv:  no
 %build
     cd pgpsrc
     ( cd libs/pfl
-      CC="%{l_cc}" ./configure
-      %{l_make} %{l_mflags} DEBUG=0
+      CC="%{l_cc}" CFLAGS="%{l_cflags -O}" ./configure
+      %{l_make} %{l_mflags} OPT="%{l_cflags -O}" DEBUG=0
     )
     ( cd libs/pgpcdk
-      CC="%{l_cc}" ./configure
+      CC="%{l_cc}" CFLAGS="%{l_cflags -O}" ./configure
       %{l_make} %{l_mflags} headers
-      %{l_make} %{l_mflags} DEBUG=0
+      %{l_make} %{l_mflags} OPT="%{l_cflags -O}" DEBUG=0
     )
     ( cd clients/pgp/shared
-      CC="%{l_cc}" ./configure
-      %{l_make} %{l_mflags} DEBUG=0
+      CC="%{l_cc}" CFLAGS="%{l_cflags -O}" ./configure
+      %{l_make} %{l_mflags} OPT="%{l_cflags -O}" DEBUG=0
     )
     ( cd clients/pgp/cmdline
+      CFLAGS="%{l_cflags -O}"
+      case "%{l_target}" in
+          *-freebsd* ) CFLAGS="$CFLAGS -pthread" ;;
+      esac
       CC="%{l_cc}" CFLAGS="$CFLAGS" LIBS="$LIBS" ./configure
-      %{l_make} %{l_mflags} DEBUG=0
+      %{l_make} %{l_mflags} OPT="%{l_cflags -O}" DEBUG=0
     )
 
 %install