diff options
| author | Joe George <joe@zeroc.com> | 2015-06-08 13:46:25 -0400 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2015-06-08 13:51:17 -0400 |
| commit | c08a9661d51cca67e1c53a59fbd8fcd7e015a19c (patch) | |
| tree | 1df5ab4a36dfd0933ae3eddcdde3958dee7de97e /python | |
| parent | Fix ICE-6569 - Python 3 build fails with GCC (diff) | |
| download | ice-c08a9661d51cca67e1c53a59fbd8fcd7e015a19c.tar.bz2 ice-c08a9661d51cca67e1c53a59fbd8fcd7e015a19c.tar.xz ice-c08a9661d51cca67e1c53a59fbd8fcd7e015a19c.zip | |
Fix python build to work with python3
Diffstat (limited to 'python')
| -rw-r--r-- | python/config/Make.rules | 2 | ||||
| -rw-r--r-- | python/python/Makefile | 16 | ||||
| -rw-r--r-- | python/test/Slice/import/Makefile | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/python/config/Make.rules b/python/config/Make.rules index c14c7172abf..4fc7a40d729 100644 --- a/python/config/Make.rules +++ b/python/config/Make.rules @@ -142,7 +142,7 @@ SLICE2PYFLAGS = $(ICECPPFLAGS) LDFLAGS = $(LDPLATFORMFLAGS) $(CXXFLAGS) -L$(libdir) ifdef ice_src_dist - SLICE2PY = $(top_srcdir)/config/s2py.py + SLICE2PY = $(PYTHON) $(top_srcdir)/config/s2py.py SLICEPARSERLIB = $(ice_cpp_dir)/$(libsubdir)/$(call mklibfilename,Slice,$(VERSION)) ifeq ($(wildcard $(SLICEPARSERLIB)),) SLICEPARSERLIB = $(ice_cpp_dir)/$(lib64subdir)/$(call mklibfilename,Slice,$(VERSION)) diff --git a/python/python/Makefile b/python/python/Makefile index 523aa4e9240..70b1af73af7 100644 --- a/python/python/Makefile +++ b/python/python/Makefile @@ -103,42 +103,42 @@ all:: $(ALL_SRCS) SLICE2PYFLAGS += --ice -Ice_%_ice.py: $(slicedir)/Ice/%.ice $(SLICE2PY) $(SLICEPARSERLIB) +Ice_%_ice.py: $(slicedir)/Ice/%.ice $(SLICEPARSERLIB) $(SLICE2PY) --prefix Ice_ --no-package $(SLICE2PYFLAGS) $< @mkdir -p .depend @$(SLICE2PY) --prefix Ice_ --no-package $(SLICE2PYFLAGS) --depend $< > .depend/$(*F).ice.d -Ice_Metrics_ice.py: $(slicedir)/Ice/Metrics.ice $(SLICE2PY) $(SLICEPARSERLIB) +Ice_Metrics_ice.py: $(slicedir)/Ice/Metrics.ice $(SLICEPARSERLIB) $(SLICE2PY) --prefix Ice_ --checksum $(SLICE2PYFLAGS) $< @mkdir -p .depend @$(SLICE2PY) --prefix Ice_ --checksum $(SLICE2PYFLAGS) --depend $< > .depend/$(*F).ice.d -Glacier2_%_ice.py: $(slicedir)/Glacier2/%.ice $(SLICE2PY) $(SLICEPARSERLIB) +Glacier2_%_ice.py: $(slicedir)/Glacier2/%.ice $(SLICEPARSERLIB) $(SLICE2PY) --prefix Glacier2_ --no-package --checksum $(SLICE2PYFLAGS) $< @mkdir -p .depend @$(SLICE2PY) --prefix Glacier2_ --no-package --checksum $(SLICE2PYFLAGS) --depend $< > .depend/$(*F).ice.d -Glacier2_Metrics_ice.py: $(slicedir)/Glacier2/Metrics.ice $(SLICE2PY) $(SLICEPARSERLIB) +Glacier2_Metrics_ice.py: $(slicedir)/Glacier2/Metrics.ice $(SLICEPARSERLIB) $(SLICE2PY) --prefix Glacier2_ --checksum $(SLICE2PYFLAGS) $< @mkdir -p .depend @$(SLICE2PY) --prefix Glacier2_ --checksum $(SLICE2PYFLAGS) --depend $< > .depend/$(*F).ice.d -IceBox_%_ice.py: $(slicedir)/IceBox/%.ice $(SLICE2PY) $(SLICEPARSERLIB) +IceBox_%_ice.py: $(slicedir)/IceBox/%.ice $(SLICEPARSERLIB) $(SLICE2PY) --prefix IceBox_ --checksum $(SLICE2PYFLAGS) $< @mkdir -p .depend @$(SLICE2PY) --prefix IceBox_ --checksum $(SLICE2PYFLAGS) --depend $< > .depend/$(*F).ice.d -IceGrid_%_ice.py: $(slicedir)/IceGrid/%.ice $(SLICE2PY) $(SLICEPARSERLIB) +IceGrid_%_ice.py: $(slicedir)/IceGrid/%.ice $(SLICEPARSERLIB) $(SLICE2PY) --prefix IceGrid_ --checksum $(SLICE2PYFLAGS) $< @mkdir -p .depend @$(SLICE2PY) --prefix IceGrid_ --checksum $(SLICE2PYFLAGS) --depend $< > .depend/$(*F).ice.d -IcePatch2_%_ice.py: $(slicedir)/IcePatch2/%.ice $(SLICE2PY) $(SLICEPARSERLIB) +IcePatch2_%_ice.py: $(slicedir)/IcePatch2/%.ice $(SLICEPARSERLIB) $(SLICE2PY) --prefix IcePatch2_ --checksum $(SLICE2PYFLAGS) $< @mkdir -p .depend @$(SLICE2PY) --prefix IcePatch2_ --checksum $(SLICE2PYFLAGS) --depend $< > .depend/$(*F).ice.d -IceStorm_%_ice.py: $(slicedir)/IceStorm/%.ice $(SLICE2PY) $(SLICEPARSERLIB) +IceStorm_%_ice.py: $(slicedir)/IceStorm/%.ice $(SLICEPARSERLIB) $(SLICE2PY) --prefix IceStorm_ --checksum $(SLICE2PYFLAGS) $< @mkdir -p .depend @$(SLICE2PY) --prefix IceStorm_ --checksum $(SLICE2PYFLAGS) --depend $< > .depend/$(*F).ice.d diff --git a/python/test/Slice/import/Makefile b/python/test/Slice/import/Makefile index 91581b604f5..5e79abbe450 100644 --- a/python/test/Slice/import/Makefile +++ b/python/test/Slice/import/Makefile @@ -22,10 +22,10 @@ SRCS = Test1_ice.py \ all:: $(SRCS) -Test1_ice.py: Test1.ice $(SLICE2PY) $(SLICEPARSERLIB) +Test1_ice.py: Test1.ice $(SLICEPARSERLIB) $(SLICE2PY) $(SLICE2PYFLAGS) $< -Test2_ice.py: Test2.ice $(SLICE2PY) $(SLICEPARSERLIB) +Test2_ice.py: Test2.ice $(SLICEPARSERLIB) $(SLICE2PY) $(SLICE2PYFLAGS) $< clean:: |