Wrap readline oursleves to avoid py3's interference

[bup.git] / Makefile

diff --git a/Makefile b/Makefile
index edf6f658df7a4f69df3551cc4e5b156cf07e7083..39202e79329fa113812687b4c24b29e854b450af 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -46,6 +46,21 @@ config/config.vars: configure config/configure config/configure.inc \
   $(wildcard config/*.in)
        MAKE="$(MAKE)" ./configure
 
+# On some platforms, Python.h and readline.h fight over the
+# _XOPEN_SOURCE version, i.e. -Werror crashes on a mismatch, so for
+# now, we're just going to let Python's version win.
+readline_cflags += $(shell pkg-config readline --cflags)
+readline_xopen := $(filter -D_XOPEN_SOURCE=%,$(readline_cflags))
+readline_xopen := $(subst -D_XOPEN_SOURCE=,,$(readline_xopen))
+ifneq ($(readline_xopen),600)
+  $(error "Unexpected pkg-config readline _XOPEN_SOURCE --cflags $(readline_cflags)")
+endif
+readline_cflags := $(filter-out -D_XOPEN_SOURCE=%,$(readline_cflags))
+readline_cflags += $(addprefix -DBUP_RL_EXPECTED_XOPEN_SOURCE=,$(readline_xopen))
+
+CFLAGS += $(readline_cflags)
+LDFLAGS += $(shell pkg-config readline --libs)
+
 bup_cmds := cmd/bup-python \
   $(patsubst cmd/%-cmd.py,cmd/bup-%,$(wildcard cmd/*-cmd.py)) \
   $(patsubst cmd/%-cmd.sh,cmd/bup-%,$(wildcard cmd/*-cmd.sh))
@@ -120,11 +135,10 @@ install: all
 config/config.h: config/config.vars
 
 lib/bup/_helpers$(SOEXT): \
-               config/config.h \
+               config/config.h lib/bup/bupsplit.h \
                lib/bup/bupsplit.c lib/bup/_helpers.c lib/bup/csetup.py
        @rm -f $@
-       cd lib/bup && \
-       LDFLAGS="$(LDFLAGS)" CFLAGS="$(CFLAGS)" "$(bup_python)" csetup.py build
+       cd lib/bup && $(bup_python) csetup.py build "$(CFLAGS)" "$(LDFLAGS)"
         # Make sure there's just the one file we expect before we copy it.
        "$(bup_python)" -c \
          "import glob; assert(len(glob.glob('lib/bup/build/*/_helpers*$(SOEXT)')) == 1)"
@@ -145,23 +159,19 @@ runtests: runtests-python runtests-cmdline
 
 python_tests := \
   lib/bup/t/tbloom.py \
+  lib/bup/t/tclient.py \
   lib/bup/t/tgit.py \
   lib/bup/t/thashsplit.py \
   lib/bup/t/thelpers.py \
   lib/bup/t/tindex.py \
   lib/bup/t/tmetadata.py \
   lib/bup/t/toptions.py \
+  lib/bup/t/tresolve.py \
   lib/bup/t/tshquote.py \
+  lib/bup/t/tvfs.py \
   lib/bup/t/tvint.py \
   lib/bup/t/txstat.py
 
-ifeq "2" "$(bup_python_majver)"
-  python_tests += \
-    lib/bup/t/tclient.py \
-    lib/bup/t/tresolve.py \
-    lib/bup/t/tvfs.py
-endif
-
 # The "pwd -P" here may not be appropriate in the long run, but we
 # need it until we settle the relevant drecurse/exclusion questions:
 # https://groups.google.com/forum/#!topic/bup-list/9ke-Mbp10Q0
@@ -171,66 +181,65 @@ runtests-python: all t/tmp
          ./wvtest.py  $(python_tests) 2>&1 \
            | tee -a t/tmp/test-log/$$$$.log
 
-cmdline_tests :=
+cmdline_tests := \
+  t/test.sh \
+  t/test-argv \
+  t/test-cat-file.sh \
+  t/test-command-without-init-fails.sh \
+  t/test-compression.sh \
+  t/test-drecurse.sh \
+  t/test-fsck.sh \
+  t/test-fuse.sh \
+  t/test-ftp \
+  t/test-gc.sh \
+  t/test-import-duplicity.sh \
+  t/test-import-rdiff-backup.sh \
+  t/test-index.sh \
+  t/test-index-check-device.sh \
+  t/test-index-clear.sh \
+  t/test-list-idx.sh \
+  t/test-ls \
+  t/test-ls-remote \
+  t/test-main.sh \
+  t/test-meta.sh \
+  t/test-on.sh \
+  t/test-packsizelimit \
+  t/test-prune-older \
+  t/test-redundant-saves.sh \
+  t/test-restore-map-owner.sh \
+  t/test-restore-single-file.sh \
+  t/test-rm.sh \
+  t/test-rm-between-index-and-save.sh \
+  t/test-save-creates-no-unrefs.sh \
+  t/test-save-restore \
+  t/test-save-errors \
+  t/test-save-restore-excludes.sh \
+  t/test-save-strip-graft.sh \
+  t/test-save-with-valid-parent.sh \
+  t/test-sparse-files.sh \
+  t/test-split-join.sh \
+  t/test-tz.sh \
+  t/test-xdev.sh
 
 ifeq "2" "$(bup_python_majver)"
+  # unresolved
+  #   web: needs more careful attention, path bytes round-trips, reprs, etc.
   cmdline_tests += \
-    t/test-argv \
-    t/test-ftp \
-    t/test-save-restore \
-    t/test-packsizelimit \
-    t/test-prune-older \
-    t/test-web.sh \
-    t/test-rm.sh \
-    t/test-gc.sh \
-    t/test-main.sh \
-    t/test-list-idx.sh \
-    t/test-index.sh \
-    t/test-split-join.sh \
-    t/test-fuse.sh \
-    t/test-drecurse.sh \
-    t/test-cat-file.sh \
-    t/test-compression.sh \
-    t/test-fsck.sh \
-    t/test-index-clear.sh \
-    t/test-index-check-device.sh \
-    t/test-ls \
-    t/test-ls-remote \
-    t/test-tz.sh \
-    t/test-meta.sh \
-    t/test-on.sh \
-    t/test-restore-map-owner.sh \
-    t/test-restore-single-file.sh \
-    t/test-rm-between-index-and-save.sh \
-    t/test-save-with-valid-parent.sh \
-    t/test-sparse-files.sh \
-    t/test-command-without-init-fails.sh \
-    t/test-redundant-saves.sh \
-    t/test-save-creates-no-unrefs.sh \
-    t/test-save-restore-excludes.sh \
-    t/test-save-strip-graft.sh \
-    t/test-import-duplicity.sh \
-    t/test-import-rdiff-backup.sh \
-    t/test-xdev.sh \
-    t/test.sh
+    t/test-web.sh
 endif
 
 tmp-target-run-test-get-%: all t/tmp
        $(pf); cd $$(pwd -P); TMPDIR="$(test_tmp)" \
          t/test-get $* 2>&1 | tee -a t/tmp/test-log/$$$$.log
 
-test_get_targets :=
-
-ifeq "2" "$(bup_python_majver)"
-  test_get_targets += \
-    tmp-target-run-test-get-replace \
-    tmp-target-run-test-get-universal \
-    tmp-target-run-test-get-ff \
-    tmp-target-run-test-get-append \
-    tmp-target-run-test-get-pick \
-    tmp-target-run-test-get-new-tag \
-    tmp-target-run-test-get-unnamed
-endif
+test_get_targets += \
+  tmp-target-run-test-get-replace \
+  tmp-target-run-test-get-universal \
+  tmp-target-run-test-get-ff \
+  tmp-target-run-test-get-append \
+  tmp-target-run-test-get-pick \
+  tmp-target-run-test-get-new-tag \
+  tmp-target-run-test-get-unnamed
 
 # For parallel runs.
 # The "pwd -P" here may not be appropriate in the long run, but we