From: twittner <twittner@pld-linux.org>
Date: Wed, 9 Apr 2008 19:12:30 +0000 (+0000)
Subject: - don't detect and make use of ccache - this decision belongs to person
X-Git-Tag: auto/th/fwbuilder-2_1_18-1~2
X-Git-Url: http://git.pld-linux.org/?p=packages%2Ffwbuilder.git;a=commitdiff_plain;h=66b856a6001ad8ef3cd350124a95640fcbbcdaaf

- don't detect and make use of ccache - this decision belongs to person
  who builds program not to `configure' script
- pass compiler from %__cxx to qmake (it wanted i686-pld-linux-g++
  instead of pentium4-pld-linux-g++ in my case)

Changed files:
    fwbuilder-dont-mess-with-compiler-names-and-ccache.patch -> 1.1
---

diff --git a/fwbuilder-dont-mess-with-compiler-names-and-ccache.patch b/fwbuilder-dont-mess-with-compiler-names-and-ccache.patch
new file mode 100644
index 0000000..54b02b8
--- /dev/null
+++ b/fwbuilder-dont-mess-with-compiler-names-and-ccache.patch
@@ -0,0 +1,84 @@
+--- b.fwbuilder-2.1.18/runqmake.sh	2008-03-06 07:48:54.000000000 +0100
++++ n.fwbuilder-2.1.18/runqmake.sh	2008-04-09 19:58:44.000000000 +0200
+@@ -17,56 +17,29 @@
+ ${QMAKE} -o doc/Makefile        doc/doc.pro
+ ${QMAKE} -o po/Makefile         po/po.pro
+ 
+-if test -n "$CCACHE"; then
+-
+     test -d src/unit_tests && {
+-        ${QMAKE} 'QMAKE_CXX=ccache g++'  -o src/unit_tests/importer/Makefile  \
++        ${QMAKE} QMAKE_CXX="$CXX"  -o src/unit_tests/importer/Makefile  \
+             src/unit_tests/importer/importer.pro
+     }
+ 
+-    ${QMAKE} 'QMAKE_CXX=ccache g++'  -o src/antlr/Makefile src/antlr/antlr.pro
++    ${QMAKE} QMAKE_CXX="$CXX"  -o src/antlr/Makefile src/antlr/antlr.pro
+ 
+-    ${QMAKE} 'QMAKE_CXX=ccache g++'  -o src/gui/Makefile src/gui/gui.pro
+-    ${QMAKE} 'QMAKE_CXX=ccache g++'  -o src/fwblookup/Makefile \
++    ${QMAKE} QMAKE_CXX="$CXX"  -o src/gui/Makefile src/gui/gui.pro
++    ${QMAKE} QMAKE_CXX="$CXX"  -o src/fwblookup/Makefile \
+         src/fwblookup/fwblookup.pro
+-    ${QMAKE} 'QMAKE_CXX=ccache g++'  -o src/fwbedit/Makefile \
++    ${QMAKE} QMAKE_CXX="$CXX"  -o src/fwbedit/Makefile \
+         src/fwbedit/fwbedit.pro
+-    ${QMAKE} 'QMAKE_CXX=ccache g++'  -o src/ipt/Makefile src/ipt/ipt.pro
+-    ${QMAKE} 'QMAKE_CXX=ccache g++'  -o src/pflib/Makefile src/pflib/pflib.pro
+-    ${QMAKE} 'QMAKE_CXX=ccache g++'  -o src/pf/Makefile src/pf/pf.pro
+-    ${QMAKE} 'QMAKE_CXX=ccache g++'  -o src/ipf/Makefile src/ipf/ipf.pro
+-    ${QMAKE} 'QMAKE_CXX=ccache g++'  -o src/ipfw/Makefile src/ipfw/ipfw.pro
+-    ${QMAKE} 'QMAKE_CXX=ccache g++'  -o src/cisco_lib/Makefile \
++    ${QMAKE} QMAKE_CXX="$CXX"  -o src/ipt/Makefile src/ipt/ipt.pro
++    ${QMAKE} QMAKE_CXX="$CXX"  -o src/pflib/Makefile src/pflib/pflib.pro
++    ${QMAKE} QMAKE_CXX="$CXX"  -o src/pf/Makefile src/pf/pf.pro
++    ${QMAKE} QMAKE_CXX="$CXX"  -o src/ipf/Makefile src/ipf/ipf.pro
++    ${QMAKE} QMAKE_CXX="$CXX"  -o src/ipfw/Makefile src/ipfw/ipfw.pro
++    ${QMAKE} QMAKE_CXX="$CXX"  -o src/cisco_lib/Makefile \
+         src/cisco_lib/cisco_lib.pro
+-    ${QMAKE} 'QMAKE_CXX=ccache g++'  -o src/iosacl/Makefile \
++    ${QMAKE} QMAKE_CXX="$CXX"  -o src/iosacl/Makefile \
+         src/iosacl/iosacl.pro
+-    ${QMAKE} 'QMAKE_CXX=ccache g++'  -o src/pix/Makefile src/pix/pix.pro
++    ${QMAKE} QMAKE_CXX="$CXX"  -o src/pix/Makefile src/pix/pix.pro
+ 
+-    ${QMAKE} 'QMAKE_CXX=ccache g++'  -o src/parsers/Makefile \
++    ${QMAKE} QMAKE_CXX="$CXX"  -o src/parsers/Makefile \
+         src/parsers/parsers.pro
+ 
+-else
+-
+-    test -d src/unit_tests && {
+-        ${QMAKE} -o src/unit_tests/importer/Makefile  \
+-            src/unit_tests/importer/importer.pro
+-    }
+-
+-    ${QMAKE}  -o src/antlr/Makefile     src/antlr/antlr.pro
+-
+-    ${QMAKE}  -o src/gui/Makefile       src/gui/gui.pro
+-    ${QMAKE}  -o src/fwblookup/Makefile src/fwblookup/fwblookup.pro
+-    ${QMAKE}  -o src/fwbedit/Makefile   src/fwbedit/fwbedit.pro
+-    ${QMAKE}  -o src/ipt/Makefile       src/ipt/ipt.pro
+-    ${QMAKE}  -o src/pflib/Makefile     src/pflib/pflib.pro
+-    ${QMAKE}  -o src/pf/Makefile        src/pf/pf.pro
+-    ${QMAKE}  -o src/ipf/Makefile       src/ipf/ipf.pro
+-    ${QMAKE}  -o src/ipfw/Makefile      src/ipfw/ipfw.pro
+-    ${QMAKE}  -o src/cisco_lib/Makefile src/cisco_lib/cisco_lib.pro
+-    ${QMAKE}  -o src/iosacl/Makefile    src/iosacl/iosacl.pro
+-    ${QMAKE}  -o src/pix/Makefile       src/pix/pix.pro
+-
+-    ${QMAKE}  -o src/parsers/Makefile   src/parsers/parsers.pro
+-
+-fi
+-
+--- fwbuilder-2.1.18/configure.in~	2008-04-09 20:04:20.000000000 +0200
++++ fwbuilder-2.1.18/configure.in	2008-04-09 20:04:25.000000000 +0200
+@@ -423,8 +423,6 @@
+ 
+ AC_SUBST(MANDIR)
+ 
+-AC_PATH_PROG(CCACHE, ccache, , )
+-
+ dnl Support for the po directory.
+ AM_PO_SUBDIRS
+