equal
deleted
inserted
replaced
55 |
55 |
56 CONFIGURE_ENV += CPPFLAGS="$(CPPFLAGS)" |
56 CONFIGURE_ENV += CPPFLAGS="$(CPPFLAGS)" |
57 CONFIGURE_ENV += CFLAGS="$(CFLAGS)" |
57 CONFIGURE_ENV += CFLAGS="$(CFLAGS)" |
58 CONFIGURE_ENV += CXXFLAGS="$(CXXFLAGS)" |
58 CONFIGURE_ENV += CXXFLAGS="$(CXXFLAGS)" |
59 # Make sure to use the right python, depending on the 32/64-bit build. |
59 # Make sure to use the right python, depending on the 32/64-bit build. |
60 CONFIGURE_ENV += PYTHON26=$(PYTHON.2.6) |
|
61 CONFIGURE_ENV += PYTHON27=$(PYTHON.2.7) |
60 CONFIGURE_ENV += PYTHON27=$(PYTHON.2.7) |
62 CONFIGURE_OPTIONS += --without-included-ltdl |
61 CONFIGURE_OPTIONS += --without-included-ltdl |
63 CONFIGURE_OPTIONS += --enable-python=no |
62 CONFIGURE_OPTIONS += --enable-python=no |
64 CONFIGURE_OPTIONS += --enable-python26=yes |
|
65 CONFIGURE_OPTIONS += --enable-python27=yes |
63 CONFIGURE_OPTIONS += --enable-python27=yes |
66 CONFIGURE_OPTIONS += --x-libraries=$(CONFIGURE_LIBDIR.$(BITS)) |
64 CONFIGURE_OPTIONS += --x-libraries=$(CONFIGURE_LIBDIR.$(BITS)) |
67 |
65 |
68 COMPONENT_BUILD_ARGS += GREP=/usr/bin/ggrep |
66 COMPONENT_BUILD_ARGS += GREP=/usr/bin/ggrep |
69 |
67 |
94 |
92 |
95 build: $(BUILD_32_and_64) |
93 build: $(BUILD_32_and_64) |
96 |
94 |
97 install: $(INSTALL_32_and_64) |
95 install: $(INSTALL_32_and_64) |
98 env LD_LIBRARY_PATH=$(PROTO_DIR)/usr/lib GVBINDIR=$(PROTO_DIR)/usr/lib/graphviz $(PROTO_DIR)/usr/bin/dot -c |
96 env LD_LIBRARY_PATH=$(PROTO_DIR)/usr/lib GVBINDIR=$(PROTO_DIR)/usr/lib/graphviz $(PROTO_DIR)/usr/bin/dot -c |
99 $(PYTHON.2.6.32) -m compileall $(PROTO_DIR)/$(PYTHON.2.6.VENDOR_PACKAGES) |
|
100 $(PYTHON.2.7.32) -m compileall $(PROTO_DIR)/$(PYTHON.2.7.VENDOR_PACKAGES) |
97 $(PYTHON.2.7.32) -m compileall $(PROTO_DIR)/$(PYTHON.2.7.VENDOR_PACKAGES) |
101 |
98 |
102 # The test infrastructure doesn't run in a VPATHed environment. |
99 # The test infrastructure doesn't run in a VPATHed environment. |
103 COMPONENT_PRE_TEST_ACTION = \ |
100 COMPONENT_PRE_TEST_ACTION = \ |
104 (cd $(@D)/rtest; ln -s $(SOURCE_DIR)/rtest/* .) |
101 (cd $(@D)/rtest; ln -s $(SOURCE_DIR)/rtest/* .) |