summaryrefslogtreecommitdiff
path: root/package/dhcpcd
diff options
context:
space:
mode:
authorThomas De Schampheleire <patrickdepinguin@gmail.com>2014-06-22 15:26:52 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-06-22 19:03:31 +0200
commitfbb3837c43802deee002db58452cbad290216275 (patch)
treee271bb4d0183354ec07e4a79c44754dc41df8fb5 /package/dhcpcd
parent8d24201f4b943b7a1edd9a16c97155f1a2efda59 (diff)
dhcpcd: fix build with ccache
After the bump to dhcpcd 6.4.0, building dhcpcd with ccache fails at the configure step: Using compiler .. <buildroot>/output/host/usr/bin/ccache <buildroot>/output/host/usr/bin/i686-pc-linux-gnu-gcc <buildroot>/output/host/usr/bin/ccache <buildroot>/output/host/usr/bin/i686-pc-linux-gnu-gcc is not an executable make: *** [<buildroot>/output/build/dhcpcd-6.4.0/.stamp_configured] Error 1 This patch backports an upstream patch to fix this issue. Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/dhcpcd')
-rw-r--r--package/dhcpcd/dhcpcd-0001-fix-build-with-ccache.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/package/dhcpcd/dhcpcd-0001-fix-build-with-ccache.patch b/package/dhcpcd/dhcpcd-0001-fix-build-with-ccache.patch
new file mode 100644
index 000000000..c16230642
--- /dev/null
+++ b/package/dhcpcd/dhcpcd-0001-fix-build-with-ccache.patch
@@ -0,0 +1,32 @@
+configure: support builds using ccache
+
+The configure script checks whether CC is executable by means of a check
+'type $CC'. However, when using ccache, CC is normally set to "ccache gcc"
+(using the appropriate paths). Such a compound string is not recognized by
+type, however, and thus configure bails out.
+
+This patch changes the check 'type $CC' with a compile test.
+
+Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
+
+Upstream status: another implementation was submitted, modified by
+maintainer Roy, then simplified based on my suggestion. This patch is a fold
+of the two upstream patches:
+http://roy.marples.name/projects/dhcpcd/info/5f4bf91142fceac502c478886aeb5079a184bb43
+http://roy.marples.name/projects/dhcpcd/info/26bc10be2405659bdf31d690a72d377d6b67ebd4
+
+diff -r 66c8bdc88858 configure
+--- a/configure Sat Jun 21 16:54:30 2014 +0200
++++ b/configure Sun Jun 22 15:20:25 2014 +0200
+@@ -272,8 +272,9 @@
+ fi
+
+ echo "Using compiler .. $CC"
+-if ! type "$CC" >/dev/null 2>&1; then
+- echo "$CC is not an executable"
++if ! echo "int main(void) { return 0; }" | $CC -x c -o /dev/null - 2>/dev/null
++then
++ echo "$CC does not create executables"
+ exit 1
+ fi
+ [ "$CC" != cc ] && echo "CC= $CC" >>$CONFIG_MK