[Erp5-report] r40252 kazuhiko - /erp5/trunk/buildout/software-profiles/haproxy.cfg

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Sun Nov 14 22:39:11 2010
New Revision: 40252

URL: http://svn.erp5.org?rev=40252&view=rev
Log:
try to detect TARGET and ARCH values for more optimisation.

Modified:
    erp5/trunk/buildout/software-profiles/haproxy.cfg

Modified: erp5/trunk/buildout/software-profiles/haproxy.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/haproxy.cfg?rev=40252&r1=40251&r2=40252&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/haproxy.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/haproxy.cfg [utf8] Sun Nov 14 22:39:11 2010
@@ -6,9 +6,10 @@ recipe = hexagonit.recipe.cmmi
 url = http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.9.tar.gz
 md5sum = 2cbcc95b54c0d803edaa13e7b4aeec25
 configure-command = true
-# XXX-Luke: autodetection shall be provided by erp5.recipe.softwarebuild
-#           with possible overriding customisation
-# linux26 might be better target, but on this level portability is a must
+# If the system is running on Linux 2.6, we use "linux26" as the TARGET,
+# otherwise use "generic".
+# For ARCH value, x86_64 and i[3456]86 are supported.
 make-options =
-  TARGET=generic
+  TARGET="$(uname -sr 2>/dev/null|grep -q '^Linux 2\.6' && echo linux26 || echo generic)"
+  ARCH="$(uname -m 2>/dev/null|grep -qE '^(x86_64|i[3456]86)$' && uname -m)"
   PREFIX=${buildout:parts-directory}/haproxy