Merge lp://qastaging/~msabramo/libmemcached/1190240 into lp://qastaging/libmemcached/1.0
Proposed by
Marc Abramowitz
Status: | Merged |
---|---|
Merged at revision: | 1169 |
Proposed branch: | lp://qastaging/~msabramo/libmemcached/1190240 |
Merge into: | lp://qastaging/libmemcached/1.0 |
Diff against target: |
8 lines (+1/-0) 1 file modified
libmemcached-1.0/deprecated_types.h (+1/-0) |
To merge this branch: | bzr merge lp://qastaging/~msabramo/libmemcached/1190240 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tangent Trunk | Pending | ||
Review via email:
|
Description of the change
Add typedef for memcached_
To post a comment you must log in.
Without this change, I get the following when trying to build pylibmc against libmemcached-1.0.17 installed in /home/vagrant/sw:
``` vagrant@ lucid64: ~/dev/git- repos/pylibmc$ git log -n 1 2e034fd0332ccb0 4b05b63a42
(py26.venv)
commit c51e7525dfbc515
Merge: b629523 eae786c
Author: Ludvig Ericson <email address hidden>
Date: Tue Jul 30 06:44:11 2013 -0700
Merge pull request #123 from ketralnis/biggil
Performance improvements to `inflate` vagrant@ lucid64: ~/dev/git- repos/pylibmc$ CFLAGS= "-I/home/ vagrant/ sw/include" LDFLAGS= "-L/home/ vagrant/ sw/lib" python setup.py build aliasing -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes -I/home/ vagrant/ sw/include -fPIC -DUSE_ZLIB -I/usr/ include/ python2. 6 -c src/_pylibmcmod ule.c -o build/temp. linux-x86_ 64-2.6/ src/_pylibmcmod ule.o -fno-strict- aliasing ule.c:1848: error: expected declaration specifiers or '...' before 'memcached_ server_ instance_ st' ule.c: In function '_PylibMC_ AddServerCallba ck': ule.c:1896: error: 'instance' undeclared (first use in this function) ule.c:1896: error: (Each undeclared identifier is reported only once ule.c:1896: error: for each function it appears in.)
(py26.venv)
running build
running build_py
running build_ext
building '_pylibmc' extension
gcc -pthread -fno-strict-
src/_pylibmcmod
src/_pylibmcmod
src/_pylibmcmod
src/_pylibmcmod
src/_pylibmcmod
error: command 'gcc' failed with exit status 1
```
With this change applied and a new libmemcached installed in /home/vagrant/sw, pylibmc builds and the tests pass:
``` vagrant@ lucid64: ~/dev/git- repos/pylibmc$ CFLAGS= "-I/home/ vagrant/ sw/include" LDFLAGS= "-L/home/ vagrant/ sw/lib" python setup.py build aliasing -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes -I/home/ vagrant/ sw/include -fPIC -DUSE_ZLIB -I/usr/ include/ python2. 6 -c src/_pylibmcmod ule.c -o build/temp. linux-x86_ 64-2.6/ src/_pylibmcmod ule.o -fno-strict- aliasing functions -L/home/ vagrant/ sw/lib -I/home/ vagrant/ sw/include build/temp. linux-x86_ 64-2.6/ src/_pylibmcmod ule.o -lmemcached -lz -o build/lib. linux-x86_ 64-2.6/ _pylibmc. so
(py26.venv)
running build
running build_py
running build_ext
building '_pylibmc' extension
gcc -pthread -fno-strict-
gcc -pthread -shared -Wl,-O1 -Wl,-Bsymbolic-
(py26.venv) vagrant@ lucid64: ~/dev/git- repos/pylibmc$ LD_LIBRARY_ PATH=/home/ vagrant/ sw/lib python bin/runtests.py pylibmc: INFO: path to dev build: build/lib. linux-x86_ 64-2.6 pylibmc: INFO: loaded _pylibmc from build/lib. linux-x86_ 64-2.6/ _pylibmc. so pylibmc: INFO: testing pylibmc 1.3.100-dev for libmemcached 1.0.17 (compression=True, sasl=False) ....... ....... ...... ------- ------- ------- ------- ------- ------- ------- ------- -------
nose.plugins.
nose.plugins.
nose.plugins.
.......
-------
Ran 27 tests in 13.905s
OK
```