@@ -184,16 +184,13 @@ jobs:
184184
185185 - name : Install xapian
186186 run : |
187+ set -xv
187188 sudo apt-get install libxapian-dev
188189 # Sphinx required to build the xapian python bindings. Use 1.8.5 on
189190 # older python and newest on newer.
190191 if [[ $PYTHON_VERSION == "2."* ]]; then pip install sphinx==1.8.5; fi
191192 if [[ $PYTHON_VERSION == '3.'* ]] ; then pip install sphinx; fi
192- if [[ $PYTHON_VERSION == '3.12'* ]] ; then \
193- XAPIAN_VER=1.4.22; \
194- else
195- XAPIAN_VER=$(dpkg -l libxapian-dev | tail -n 1 | awk '{print $3}' | cut -d '-' -f 1); echo $XAPIAN_VER; \
196- fi
193+ XAPIAN_VER=$(dpkg -l libxapian-dev | tail -n 1 | awk '{print $3}' | cut -d '-' -f 1); echo $XAPIAN_VER;
197194 cd /tmp
198195 curl -s -O https://oligarchy.co.uk/xapian/$XAPIAN_VER/xapian-bindings-$XAPIAN_VER.tar.xz
199196 tar -Jxvf xapian-bindings-$XAPIAN_VER.tar.xz
@@ -205,13 +202,15 @@ jobs:
205202 # Change distutils.sysconfig... to just sysconfig and SO
206203 # to EXT_SUFFIX to get valid value.
207204 if [[ $PYTHON_VERSION == "3."* ]]; then \
205+ cp configure configure.FCS; \
208206 sed -i \
209207 -e '/PYTHON3_SO=/s/distutils\.//g' \
210208 -e '/PYTHON3_SO=/s/"SO"/"EXT_SUFFIX"/g' \
211209 -e '/PYTHON3_CACHE_TAG=/s/imp;print(imp.get_tag())/sys;print(sys.implementation.cache_tag)/' \
212210 -e '/PYTHON3_CACHE_OPT1_EXT=/s/imp\.get_tag()/sys.implementation.cache_tag/g' \
213211 -e '/PYTHON3_CACHE_OPT1_EXT=/s/imp\b/importlib/' \
214212 configure; \
213+ diff -u configure.FCS configure; \
215214 ./configure --prefix=$VIRTUAL_ENV --with-python3 --disable-documentation; \
216215 fi
217216 case "$PYTHON_VERSION" in nightly) echo skipping xapian build;; *) make && sudo make install; esac
0 commit comments