Skip to content

Commit f91bc2c

Browse files
committed
undo the python undo
fixup dbgsym? fixup dbgsym? fixup dbgsym? fixup dbgsym? fixup dbgsym? fixup dbgsym? fixup dbgsym? fixup dbgsym fixup dbgpkg Revert "DISPATCH-1942 Use findPython when on CMake3.15+" This reverts commit f486435 fixup too many decrefs fixup travis yml; this is the best way ;DDDD fixup travis yml? fixup try -fno-omit-frame-pointer fixup try -fno-omit-frame-pointer fixup try -fno-omit-frame-pointer fixup try -fno-omit-frame-pointer fixup try -fno-omit-frame-pointer try -fno-omit-frame-pointer WIP: attempt at improving situation around DISPATCH-1962 WIP: attempt at improving situation around DISPATCH-1962
1 parent a2a9ffc commit f91bc2c

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

.travis.yml

+3-5
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ jobs:
5050
env:
5151
- PATH="/usr/bin:$PATH" PROTON_VERSION=main BUILD_TYPE=Debug
5252
- DISPATCH_CMAKE_ARGS='-DRUNTIME_CHECK=asan'
53-
- PYTHON_EXECUTABLE=/usr/bin/python2.7-dbg
5453
- name: "qdrouterd:Coverage"
5554
os: linux
5655
env:
@@ -60,7 +59,6 @@ jobs:
6059
env:
6160
- PATH="/usr/bin:$PATH" PROTON_VERSION=0.34.0 BUILD_TYPE=RelWithDebInfo
6261
- DISPATCH_CMAKE_ARGS='-DRUNTIME_CHECK=asan -DCMAKE_C_FLAGS=-DQD_MEMORY_DEBUG'
63-
- PYTHON_EXECUTABLE=/usr/bin/python2.7-dbg
6462
- name: "qdrouterd:RelWithDebInfo+MemoryDebug (clang on focal)"
6563
os: linux
6664
dist: focal
@@ -161,7 +159,7 @@ addons:
161159
- cmake
162160
- libsasl2-dev
163161
- libssl-dev
164-
- python2.7-dbg
162+
- python2.7
165163
- python2.7-dev
166164
- sasl2-bin
167165
- swig
@@ -188,15 +186,15 @@ install:
188186
# Build and install proton from source.
189187
- mkdir qpid-proton/build
190188
- pushd qpid-proton/build
191-
- cmake .. -DCMAKE_INSTALL_PREFIX=$PREFIX -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DPYTHON_LIBRARY=/usr/lib/x86_64-linux-gnu/libpython2.7_d.so -DBUILD_BINDINGS=python
189+
- cmake .. -DCMAKE_INSTALL_PREFIX=$PREFIX -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DBUILD_BINDINGS=python
192190
- cmake --build . --target install -- -j $NPROC
193191
- popd
194192

195193
before_script:
196194
- source qpid-proton/build/config.sh
197195
- mkdir build
198196
- pushd build
199-
- cmake .. -DCMAKE_INSTALL_PREFIX=$PREFIX -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DPYTHON_EXECUTABLE=${PYTHON_EXECUTABLE} -DPYTHON_LIBRARY=/usr/lib/x86_64-linux-gnu/libpython2.7_d.so ${DISPATCH_CMAKE_ARGS}
197+
- cmake .. -DCMAKE_INSTALL_PREFIX=$PREFIX -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ${DISPATCH_CMAKE_ARGS}
200198
- . config.sh
201199
- make -j $NPROC
202200

0 commit comments

Comments
 (0)