PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module PSARC 2013/142 iso8601 version 0.1.4 - Python date parsing module PSARC 2013/143 jsonpointer PSARC 2013/145 tempita version 0.5.1 - Python templating language module PSARC 2013/149 httplib2 version 0.8 PSARC 2013/150 prettytable version 0.7.2 PSARC 2013/151 jsonpatch PSARC 2013/152 repoze.lru version 0.6 PSARC 2013/153 Paste version 1.7.5.1 PSARC 2013/154 jsonschema PSARC 2013/156 webob version 1.2.3 PSARC 2013/157 routes version 1.13 PSARC 2013/161 anyjson PSARC 2013/164 paste.deploy version 1.5.0 PSARC 2013/165 FormEncode version 1.2.6 PSARC 2013/168 py-amqp version 1.0.11 PSARC 2013/170 eventlet PSARC 2013/171 passlib PSARC 2013/172 warlock PSARC 2013/173 sqlalchemy PSARC 2013/174 sqlalchemy-migrate PSARC 2013/175 rabbitmq PSARC 2013/176 pyrabbit PSARC 2013/177 librabbitmq PSARC 2013/179 filechunkio version 1.5 PSARC 2013/180 boto version 2.9.2 PSARC 2013/183 python-ldap version 2.4.10 PSARC 2013/187 Kombu version 2.5.10 PSARC 2013/241 six version 1.3.0 PSARC 2013/242 d2to1 version 0.2.10 PSARC 2013/245 stevedore version 0.10 PSARC 2013/246 pbr version 0.5.18 PSARC 2013/250 pyparsing version 1.5.7 PSARC 2013/251 cliff version 1.4 PSARC 2013/252 cmd2 version 0.6.5.1 PSARC 2013/253 suds version 0.4 PSARC 2013/254 alembic version 0.5.0 PSARC 2013/255 requests version 1.2.3 PSARC 2013/256 markupsafe version 0.18 PSARC 2013/279 importlib version 1.0.2 PSARC 2013/280 ordereddict version 1.1 16665240 The Python greenlet module should be added to Userland 16667497 add the Python eventlet module to Userland 16672571 The Python iso8601 module should be added to Userland 16679500 The Python prettytable module should be added to Userland 16682029 add the Python jsonschema module to Userland 16682050 add the Python anyjson module to Userland 16685766 The Python tempita module should be added to Userland 16688436 add the Python passlib module to Userland 16693200 The Python repoze.lru module should be added to Userland 16699958 The Python webob module should be added to Userland 16699986 The Python paste module should be added to Userland 16710493 The Python paste.deploy module should be added to Userland 16724221 The Python routes module should be added to Userland 16732554 add the Python jsonpatch module to Userland 16732628 add the Python jsonpointer module to Userland 16732673 add the Python warlock module to Userland 16734803 The Python formencode module should be added to Userland 16734806 The Python kombu module should be added to Userland 16734807 The Python httplib2 module should be added to Userland 16734808 The Python boto module should be added to Userland 16734812 The Python py-amqp module should be added to Userland 16740335 add the Python sqlalchemy module to Userland 16740866 add the Python sqlalchemy-migrate module to Userland 16746942 The python-ldap module should be added to Userland 16756023 The Python filechunkio module should be added to Userland 16776524 add RabbitMQ to Userland 16783170 add the Python librabbitmq module to Userland 16789370 add the Python pyrabbit module to Userland 17079852 The Python six module should be added to Userland 17081922 The Python pbr module should be added to Userland 17081941 The Python stevedore module should be added to Userland 17081952 The Python d2to1 module should be added to Userland 17171265 The Python pyparsing module should be added to Userland 17171761 The Python cliff module should be added to Userland 17171787 The Python cmd2 module should be added to Userland 17171805 The Python suds module should be added to Userland 17171821 The Python alembic module should be added to Userland 17171836 The Python requests module should be added to Userland 17171847 The Python markupsafe module should be added to Userland 17285026 The Python importlib module should be added to Userland 17285066 The Python ordereddict module should be added to Userland

     1

Remove the use of gcc-specific flags.

     2

And don't regenerate amqp_framing.[ch] if the source hasn't changed.

     3

     4

Without the patch to connection.c, we get

     5

     6

    "Modules/_librabbitmq/connection.c", line 465: reference to static identifier "AMQTable_toPyDict" in extern inline function

     7

    "Modules/_librabbitmq/connection.c", line 685: reference to static identifier "PyDict_ToAMQTable" in extern inline function

     8

     9

from Studio.  These are new since 0.9.9, where we didn't have this problem.

    10

Not sure what the right fix is.

    11

    12

Finally, we inherit CFLAGS and LDFLAGS from the environment rather than

    13

using what Python was compiled with. In particular, Python 2.7 in

    14

Userland currently has some undesired settings such as including

    15

/usr/gnu/lib in the RUNPATH.

    16

    17

--- librabbitmq-1.0.1/setup.py	Mon Jan 14 06:05:35 2013

    18

+++ librabbitmq-1.0.1/setup.py	Mon Sep  2 14:25:44 2013

    19

@@ -3,6 +3,7 @@

    20

 import sys

    21

 from glob import glob

    22

 from setuptools import setup, find_packages

    23

+from distutils.dep_util import newer

    24

    25

 # --with-librabbitmq=<dir>: path to librabbitmq package if needed

    26

    27

@@ -26,9 +27,15 @@

    28

     codegen = LRMQSRC('codegen.py')

    29

     spec = SPECPATH('amqp-rabbitmq-0.9.1.json')

    30

     sys.path.insert(0, SPECPATH())

    31

+    hfile = LRMQSRC('amqp_framing.h')

    32

+    cfile = LRMQSRC('amqp_framing.c')

    33

+    # Don't regenerate the files if the spec file hasn't changed.  This prevents

    34

+    # a separate install phase from unnecessarily rebuilding the extension.

    35

+    if not (newer(spec, hfile) or newer(spec, cfile)):

    36

+            return

    37

     commands = [

    38

-        (sys.executable, codegen, 'header', spec, LRMQSRC('amqp_framing.h')),

    39

-        (sys.executable, codegen, 'body', spec, LRMQSRC('amqp_framing.c')),

    40

+        (sys.executable, codegen, 'header', spec, hfile),

    41

+        (sys.executable, codegen, 'body', spec, cfile),

    42

     ]

    43

     restore = senv(('PYTHONPATH', SPECPATH()), sep=':')

    44

     try:

    45

@@ -112,7 +119,7 @@

    46

    47

     class build(_build):

    48

         stdcflags = [

    49

-            '-W -Wall -DHAVE_CONFIG_H',

    50

+            '-DHAVE_CONFIG_H',

    51

         ]

    52

         if os.environ.get('PEDANTIC'):

    53

             # Python.h breaks -pedantic, so can only use it while developing.

    54

@@ -124,8 +131,7 @@

    55

             from distutils import sysconfig

    56

             config = sysconfig.get_config_vars()

    57

             try:

    58

-                restore = senv(('CFLAGS', config['CFLAGS']),

    59

-                    ('LDFLAGS', config['LDFLAGS']))

    60

+                restore = senv()

    61

                 try:

    62

                     os.chdir(LRMQDIST())

    63

                     if not os.path.isfile('config.h'):

    64

--- librabbitmq-1.0.1/Modules/_librabbitmq/connection.c	Mon Jan 14 04:48:57 2013

    65

+++ librabbitmq-1.0.1/Modules/_librabbitmq/connection.c	Mon Apr  8 16:01:05 2013

    66

@@ -62,10 +62,10 @@

    67

 _PYRMQ_INLINE int RabbitMQ_wait_nb(int);

    68

 _PYRMQ_INLINE int RabbitMQ_wait_timeout(int, double);

    69

    70

-_PYRMQ_INLINE void

    71

+void

    72

 basic_properties_to_PyDict(amqp_basic_properties_t*, PyObject*);

    73

    74

-_PYRMQ_INLINE int

    75

+int

    76

 PyDict_to_basic_properties(PyObject *,

    77

                            amqp_basic_properties_t *,

    78

                            amqp_connection_state_t );

    79

@@ -408,7 +408,7 @@

    80

 }

    81

    82

    83

-_PYRMQ_INLINE void

    84

+void

    85

 basic_properties_to_PyDict(amqp_basic_properties_t *props, PyObject *p)

    86

 {

    87

     register PyObject *value = NULL;

    88

@@ -614,7 +614,7 @@

    89

 }

    90

    91

    92

-_PYRMQ_INLINE int

    93

+int

    94

 PyDict_to_basic_properties(PyObject *p,

    95

                            amqp_basic_properties_t *props,

    96

                            amqp_connection_state_t conn)