[Erp5-report] r38493 luke - in /erp5/trunk/utils/erp5.recipe.cmmiforcei686: ./ src/ src/erp...
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Sep 20 18:37:28 CEST 2010
Author: luke
Date: Mon Sep 20 18:37:28 2010
New Revision: 38493
URL: http://svn.erp5.org?rev=38493&view=rev
Log:
- recipe to compile msgpack and kumofs on i386, i586 and i686 in case if
configure script is not able to work properly
Added:
erp5/trunk/utils/erp5.recipe.cmmiforcei686/
erp5/trunk/utils/erp5.recipe.cmmiforcei686/CHANGES.txt (with props)
erp5/trunk/utils/erp5.recipe.cmmiforcei686/README.txt (with props)
erp5/trunk/utils/erp5.recipe.cmmiforcei686/setup.py
erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/
erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5/
erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5.recipe.cmmiforcei686.egg-info/
erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5.recipe.cmmiforcei686.egg-info/PKG-INFO
erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5.recipe.cmmiforcei686.egg-info/SOURCES.txt (with props)
erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5.recipe.cmmiforcei686.egg-info/dependency_links.txt (with props)
erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5.recipe.cmmiforcei686.egg-info/entry_points.txt (with props)
erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5.recipe.cmmiforcei686.egg-info/namespace_packages.txt (with props)
erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5.recipe.cmmiforcei686.egg-info/requires.txt (with props)
erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5.recipe.cmmiforcei686.egg-info/top_level.txt (with props)
erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5/__init__.py
erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5/__init__.pyc (with props)
erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5/recipe/
erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5/recipe/__init__.py
erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5/recipe/__init__.pyc (with props)
erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5/recipe/cmmiforcei686/
erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5/recipe/cmmiforcei686/__init__.py
erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5/recipe/cmmiforcei686/__init__.pyc (with props)
Added: erp5/trunk/utils/erp5.recipe.cmmiforcei686/CHANGES.txt
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.recipe.cmmiforcei686/CHANGES.txt?rev=38493&view=auto
==============================================================================
--- erp5/trunk/utils/erp5.recipe.cmmiforcei686/CHANGES.txt (added)
+++ erp5/trunk/utils/erp5.recipe.cmmiforcei686/CHANGES.txt [utf8] Mon Sep 20 18:37:28 2010
@@ -0,0 +1,5 @@
+Changelog
+=========
+
+0.1.1 (unreleased)
+------------------
Propchange: erp5/trunk/utils/erp5.recipe.cmmiforcei686/CHANGES.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: erp5/trunk/utils/erp5.recipe.cmmiforcei686/README.txt
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.recipe.cmmiforcei686/README.txt?rev=38493&view=auto
==============================================================================
--- erp5/trunk/utils/erp5.recipe.cmmiforcei686/README.txt (added)
+++ erp5/trunk/utils/erp5.recipe.cmmiforcei686/README.txt [utf8] Mon Sep 20 18:37:28 2010
@@ -0,0 +1,15 @@
+Introduction
+============
+
+Recipe to force i686 in case of i386 architecture.
+
+Used to workaround issues with kumofs and messagepack:
+
+configure: error: __sync_* atomic operations are not supported.
+
+Note that gcc < 4.1 is not supported.
+
+If you are using gcc >= 4.1 and the default target CPU architecture is "i386", try to
+add CFLAGS="--march=i686" and CXXFLAGS="-march=i686" options to ./configure as follows:
+
+ $ ./configure CFLAGS="-march=i686" CXXFLAGS="-march=i686"
Propchange: erp5/trunk/utils/erp5.recipe.cmmiforcei686/README.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: erp5/trunk/utils/erp5.recipe.cmmiforcei686/setup.py
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.recipe.cmmiforcei686/setup.py?rev=38493&view=auto
==============================================================================
--- erp5/trunk/utils/erp5.recipe.cmmiforcei686/setup.py (added)
+++ erp5/trunk/utils/erp5.recipe.cmmiforcei686/setup.py [utf8] Mon Sep 20 18:37:28 2010
@@ -0,0 +1,38 @@
+from setuptools import setup, find_packages
+
+name = "erp5.recipe.cmmiforcei686"
+version = '0.1.1'
+
+def read(name):
+ return open(name).read()
+
+long_description=( read('README.txt')
+ + '\n' +
+ read('CHANGES.txt')
+ )
+
+setup(
+ name = name,
+ version = version,
+ author = "Lukasz Nowak",
+ author_email = "luke at nexedi.com",
+ description = "ZC Buildout recipe to build software using hexagonit."
+ "recipe.cmmi which is not able to properly detect architecutre",
+ long_description=long_description,
+ license = "ZPL 2.1",
+ keywords = "software compilation buildout",
+ classifiers=[
+ "License :: OSI Approved :: Zope Public License",
+ "Framework :: Buildout",
+ ],
+ packages = find_packages('src'),
+ package_dir = {'': 'src'},
+ include_package_data = True,
+ install_requires = [
+ 'zc.recipe.egg',
+ 'setuptools',
+ 'hexagonit.recipe.cmmi'
+ ],
+ namespace_packages = ['erp5', 'erp5.recipe'],
+ entry_points = {'zc.buildout': ['default = %s:Recipe' % name]},
+ )
Added: erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5.recipe.cmmiforcei686.egg-info/PKG-INFO
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5.recipe.cmmiforcei686.egg-info/PKG-INFO?rev=38493&view=auto
==============================================================================
--- erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5.recipe.cmmiforcei686.egg-info/PKG-INFO (added)
+++ erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5.recipe.cmmiforcei686.egg-info/PKG-INFO [utf8] Mon Sep 20 18:37:28 2010
@@ -0,0 +1,34 @@
+Metadata-Version: 1.0
+Name: erp5.recipe.cmmiforcei686
+Version: 0.1.1
+Summary: ZC Buildout recipe to build software using hexagonit.recipe.cmmi which is not able to properly detect architecutre
+Home-page: UNKNOWN
+Author: Lukasz Nowak
+Author-email: luke at nexedi.com
+License: ZPL 2.1
+Description: Introduction
+ ============
+
+ Recipe to force i686 in case of i386 architecture.
+
+ Used to workaround issues with kumofs and messagepack:
+
+ configure: error: __sync_* atomic operations are not supported.
+
+ Note that gcc < 4.1 is not supported.
+
+ If you are using gcc >= 4.1 and the default target CPU architecture is "i386", try to
+ add CFLAGS="--march=i686" and CXXFLAGS="-march=i686" options to ./configure as follows:
+
+ $ ./configure CFLAGS="-march=i686" CXXFLAGS="-march=i686"
+
+ Changelog
+ =========
+
+ 0.1.1 (unreleased)
+ ------------------
+
+Keywords: software compilation buildout
+Platform: UNKNOWN
+Classifier: License :: OSI Approved :: Zope Public License
+Classifier: Framework :: Buildout
Added: erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5.recipe.cmmiforcei686.egg-info/SOURCES.txt
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5.recipe.cmmiforcei686.egg-info/SOURCES.txt?rev=38493&view=auto
==============================================================================
--- erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5.recipe.cmmiforcei686.egg-info/SOURCES.txt (added)
+++ erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5.recipe.cmmiforcei686.egg-info/SOURCES.txt [utf8] Mon Sep 20 18:37:28 2010
@@ -0,0 +1,12 @@
+README.txt
+setup.py
+src/erp5/__init__.py
+src/erp5.recipe.cmmiforcei686.egg-info/PKG-INFO
+src/erp5.recipe.cmmiforcei686.egg-info/SOURCES.txt
+src/erp5.recipe.cmmiforcei686.egg-info/dependency_links.txt
+src/erp5.recipe.cmmiforcei686.egg-info/entry_points.txt
+src/erp5.recipe.cmmiforcei686.egg-info/namespace_packages.txt
+src/erp5.recipe.cmmiforcei686.egg-info/requires.txt
+src/erp5.recipe.cmmiforcei686.egg-info/top_level.txt
+src/erp5/recipe/__init__.py
+src/erp5/recipe/cmmiforcei686/__init__.py
\ No newline at end of file
Propchange: erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5.recipe.cmmiforcei686.egg-info/SOURCES.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5.recipe.cmmiforcei686.egg-info/dependency_links.txt
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5.recipe.cmmiforcei686.egg-info/dependency_links.txt?rev=38493&view=auto
==============================================================================
--- erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5.recipe.cmmiforcei686.egg-info/dependency_links.txt (added)
+++ erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5.recipe.cmmiforcei686.egg-info/dependency_links.txt [utf8] Mon Sep 20 18:37:28 2010
@@ -0,0 +1 @@
+
Propchange: erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5.recipe.cmmiforcei686.egg-info/dependency_links.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5.recipe.cmmiforcei686.egg-info/entry_points.txt
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5.recipe.cmmiforcei686.egg-info/entry_points.txt?rev=38493&view=auto
==============================================================================
--- erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5.recipe.cmmiforcei686.egg-info/entry_points.txt (added)
+++ erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5.recipe.cmmiforcei686.egg-info/entry_points.txt [utf8] Mon Sep 20 18:37:28 2010
@@ -0,0 +1,3 @@
+[zc.buildout]
+default = erp5.recipe.cmmiforcei686:Recipe
+
Propchange: erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5.recipe.cmmiforcei686.egg-info/entry_points.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5.recipe.cmmiforcei686.egg-info/namespace_packages.txt
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5.recipe.cmmiforcei686.egg-info/namespace_packages.txt?rev=38493&view=auto
==============================================================================
--- erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5.recipe.cmmiforcei686.egg-info/namespace_packages.txt (added)
+++ erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5.recipe.cmmiforcei686.egg-info/namespace_packages.txt [utf8] Mon Sep 20 18:37:28 2010
@@ -0,0 +1,2 @@
+erp5
+erp5.recipe
Propchange: erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5.recipe.cmmiforcei686.egg-info/namespace_packages.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5.recipe.cmmiforcei686.egg-info/requires.txt
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5.recipe.cmmiforcei686.egg-info/requires.txt?rev=38493&view=auto
==============================================================================
--- erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5.recipe.cmmiforcei686.egg-info/requires.txt (added)
+++ erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5.recipe.cmmiforcei686.egg-info/requires.txt [utf8] Mon Sep 20 18:37:28 2010
@@ -0,0 +1,3 @@
+zc.recipe.egg
+setuptools
+hexagonit.recipe.cmmi
\ No newline at end of file
Propchange: erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5.recipe.cmmiforcei686.egg-info/requires.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5.recipe.cmmiforcei686.egg-info/top_level.txt
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5.recipe.cmmiforcei686.egg-info/top_level.txt?rev=38493&view=auto
==============================================================================
--- erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5.recipe.cmmiforcei686.egg-info/top_level.txt (added)
+++ erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5.recipe.cmmiforcei686.egg-info/top_level.txt [utf8] Mon Sep 20 18:37:28 2010
@@ -0,0 +1 @@
+erp5
Propchange: erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5.recipe.cmmiforcei686.egg-info/top_level.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5/__init__.py
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5/__init__.py?rev=38493&view=auto
==============================================================================
--- erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5/__init__.py (added)
+++ erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5/__init__.py [utf8] Mon Sep 20 18:37:28 2010
@@ -0,0 +1,6 @@
+# See http://peak.telecommunity.com/DevCenter/setuptools#namespace-packages
+try:
+ __import__('pkg_resources').declare_namespace(__name__)
+except ImportError:
+ from pkgutil import extend_path
+ __path__ = extend_path(__path__, __name__)
Added: erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5/__init__.pyc
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5/__init__.pyc?rev=38493&view=auto
==============================================================================
Binary file - no diff available.
Propchange: erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5/__init__.pyc
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5/recipe/__init__.py
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5/recipe/__init__.py?rev=38493&view=auto
==============================================================================
--- erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5/recipe/__init__.py (added)
+++ erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5/recipe/__init__.py [utf8] Mon Sep 20 18:37:28 2010
@@ -0,0 +1,6 @@
+# See http://peak.telecommunity.com/DevCenter/setuptools#namespace-packages
+try:
+ __import__('pkg_resources').declare_namespace(__name__)
+except ImportError:
+ from pkgutil import extend_path
+ __path__ = extend_path(__path__, __name__)
Added: erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5/recipe/__init__.pyc
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5/recipe/__init__.pyc?rev=38493&view=auto
==============================================================================
Binary file - no diff available.
Propchange: erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5/recipe/__init__.pyc
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5/recipe/cmmiforcei686/__init__.py
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5/recipe/cmmiforcei686/__init__.py?rev=38493&view=auto
==============================================================================
--- erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5/recipe/cmmiforcei686/__init__.py (added)
+++ erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5/recipe/cmmiforcei686/__init__.py [utf8] Mon Sep 20 18:37:28 2010
@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2010 Nexedi SA and Contributors. All Rights Reserved.
+# Copyright (c) 2006-2008 Zope Corporation and Contributors.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+
+from hexagonit.recipe.cmmi import Recipe as OriginalRecipe
+import zc.buildout
+import subprocess
+import logging
+
+class Recipe(OriginalRecipe):
+ def _getArchitecture(self):
+ return subprocess.Popen(['uname', '-m'], stdout=subprocess.PIPE,
+ stderr=subprocess.STDOUT).communicate()[0].strip()
+
+ def install(self):
+ arch = self._getArchitecture()
+ log = logging.getLogger(self.name)
+ if arch not in ['i386', 'i586', 'i686']:
+ # no patching needed
+ log.debug('No patching needed on %r architecture' % arch)
+ return OriginalRecipe.install(self)
+ if 'CFLAGS' in self.environ or 'CXXFLAGS' in self.environ:
+ raise zc.buildout.UserError('Cannot patch environment variable '
+ 'CFLAGS and CXXFLAGS as set by user')
+ self.environ['CFLAGS'] = '-march=i686'
+ self.environ['CXXFLAGS'] = '-march=i686'
+ log.info(
+ 'Patched CFLAGS and CXXFLAGS on 32bit arch to being able to compile')
+
+ return OriginalRecipe.install(self)
Added: erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5/recipe/cmmiforcei686/__init__.pyc
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5/recipe/cmmiforcei686/__init__.pyc?rev=38493&view=auto
==============================================================================
Binary file - no diff available.
Propchange: erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5/recipe/cmmiforcei686/__init__.pyc
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
More information about the Erp5-report
mailing list