瀏覽代碼

use better GCC detection in "rpmtool cflags" (taken over from "gcc" package)

Ralf S. Engelschall 21 年之前
父節點
當前提交
1a46591168
共有 3 個文件被更改,包括 3 次插入2 次删除
  1. 1 0
      openpkg/HISTORY
  2. 1 1
      openpkg/openpkg.spec
  3. 1 1
      openpkg/rpmtool

+ 1 - 0
openpkg/HISTORY

@@ -2,6 +2,7 @@
 2004
 ====
 
+20040501 use better GCC detection in "rpmtool cflags" (taken over from "gcc" package)
 20040429 make sure <prefix>/etc/rc does not complain in cronjobs of non-privileged setups
 20040429 port to NetBSD 1.6.2
 20040428 fix "openpkg man" command now that OPENPKG_TOOLS_CMDPATH is not provided

+ 1 - 1
openpkg/openpkg.spec

@@ -39,7 +39,7 @@
 #   o any cc(1)
 
 #   the package version/release
-%define       V_openpkg  20040429
+%define       V_openpkg  20040501
 
 #   the used software versions
 %define       V_rpm      4.2.1

+ 1 - 1
openpkg/rpmtool

@@ -439,7 +439,7 @@ case $tool in
     cflags )
         tool="$1"
         isgcc=no
-        if [ ".`$tool --version 2>/dev/null | egrep '(2.[7-9]|3.[0-5])'`" != . ]; then
+        if [ ".`($tool -v; $tool --version) </dev/null 2>&1 | grep -i 'gcc'`" != . ]; then
             isgcc=yes
         fi
         cflags=''