components/database/postgresql-93/Makefile
@@ -29,8 +29,6 @@ include $(WS_TOP)/make-rules/configure.mk include $(WS_TOP)/make-rules/ips.mk PYTHON_VERSION=2.7 PATH= /usr/bin:/usr/sfw/bin:/usr/ccs/bin:/usr/sbin:/usr/gnu/bin # Missing files in build dir for configure without this. components/database/postgresql-94/Makefile
@@ -29,8 +29,6 @@ include $(WS_TOP)/make-rules/configure.mk include $(WS_TOP)/make-rules/ips.mk PYTHON_VERSION=2.7 PATH= /usr/bin:/usr/sfw/bin:/usr/ccs/bin:/usr/sbin:/usr/gnu/bin # Missing files in build dir for configure without this. components/database/postgresql-95/Makefile
@@ -29,8 +29,6 @@ include $(WS_TOP)/make-rules/configure.mk include $(WS_TOP)/make-rules/ips.mk PYTHON_VERSION=2.7 PATH= /usr/bin:/usr/sfw/bin:/usr/ccs/bin:/usr/sbin:/usr/gnu/bin # Missing files in build dir for configure without this. components/desktop/avant-window-navigator/Makefile
@@ -29,8 +29,6 @@ include $(WS_TOP)/make-rules/configure.mk include $(WS_TOP)/make-rules/ips.mk PYTHON_VERSION=2.7 PATH=/usr/gnu/bin:/usr/bin:/usr/perl5/bin CONFIGURE_OPTIONS+= --sysconfdir=/etc components/desktop/desktop-cache/Makefile
@@ -30,8 +30,6 @@ include $(WS_MAKE_RULES)/configure.mk include $(WS_MAKE_RULES)/ips.mk PYTHON_VERSION=2.7 CONFIGURE_OPTIONS = --libdir=/lib CONFIGURE_OPTIONS += --datadir=/usr/share CONFIGURE_OPTIONS += --sysconfdir=/lib components/desktop/e/efl/Makefile
@@ -39,8 +39,6 @@ include $(WS_MAKE_RULES)/configure.mk include $(WS_MAKE_RULES)/ips.mk PYTHON_VERSION=2.7 PATCH_LEVEL=0 CONFIGURE_OPTIONS+= CFLAGS="$(CFLAGS) -D__EXTENSIONS__" components/desktop/e/expedite/Makefile
@@ -40,8 +40,6 @@ include $(WS_MAKE_RULES)/configure.mk include $(WS_MAKE_RULES)/ips.mk PYTHON_VERSION=2.7 PATCH_LEVEL=0 CONFIGURE_OPTIONS+= --enable-opengl-x11 components/desktop/gnome2/GConf/Makefile
@@ -31,8 +31,6 @@ include $(WS_MAKE_RULES)/configure.mk include $(WS_MAKE_RULES)/ips.mk PYTHON_VERSION=2.7 PATH=/usr/gnu/bin:/usr/bin COMPONENT_PREP_ACTION = (cd $(@D) && autoreconf --install --force) components/desktop/gnome2/alacarte/Makefile
@@ -33,8 +33,6 @@ include $(WS_TOP)/make-rules/configure.mk include $(WS_TOP)/make-rules/ips.mk PYTHON_VERSION=2.7 PATH=/usr/gnu/bin:/usr/bin COMPONENT_PREP_ACTION = ( cd $(@D) && \ components/desktop/gnome2/at-spi/Makefile
@@ -35,8 +35,6 @@ include $(WS_MAKE_RULES)/configure.mk include $(WS_MAKE_RULES)/ips.mk PYTHON_VERSION=2.7 PATH=/usr/gnu/bin:/usr/bin COMPONENT_POST_UNPACK_ACTION = ( cd $(SOURCE_DIR) && cp -r pyatspi pyatspi-26) components/desktop/gnome2/deskbar-applet/Makefile
@@ -31,8 +31,6 @@ include $(WS_MAKE_RULES)/configure.mk include $(WS_MAKE_RULES)/ips.mk PYTHON_VERSION=2.7 PATH=/usr/gnu/bin:/usr/bin COMPONENT_PREP_ACTION = ( cd $(@D) && \ components/desktop/gnome2/gdesklets/Makefile
@@ -36,8 +36,6 @@ include $(WS_MAKE_RULES)/configure.mk include $(WS_MAKE_RULES)/ips.mk PYTHON_VERSION=2.7 PATH=/usr/gnu/bin:/usr/bin COMPONENT_PRE_CONFIGURE_ACTION = (chmod -R u+r $(SOURCE_DIR) && cp -rp $(SOURCE_DIR)/* $(@D) && \ components/desktop/gnome2/gnome-applets/Makefile
@@ -31,8 +31,6 @@ include $(WS_MAKE_RULES)/configure.mk include $(WS_MAKE_RULES)/ips.mk PYTHON_VERSION=2.7 PATH=/usr/gnu/bin:/usr/bin COMPONENT_PREP_ACTION = ( cd $(@D) && \ components/desktop/gnome2/gnome-commander/Makefile
@@ -33,8 +33,6 @@ include $(WS_TOP)/make-rules/configure.mk include $(WS_TOP)/make-rules/ips.mk PYTHON_VERSION=2.7 PATH=/usr/gnu/bin:/usr/bin:/usr/perl5/bin CONFIGURE_OPTIONS+= --sysconfdir=/etc components/desktop/gnome2/gnome-connection-manager/Makefile
@@ -34,8 +34,6 @@ include $(WS_MAKE_RULES)/prep.mk include $(WS_MAKE_RULES)/ips.mk PYTHON_VERSION=2.7 CLEAN_PATHS+= $(BUILD_DIR) # rules are very simple, because the project is a script - just deliver and run components/desktop/gnome2/gnome-desktop/Makefile
@@ -30,8 +30,6 @@ include $(WS_TOP)/make-rules/configure.mk include $(WS_TOP)/make-rules/ips.mk PYTHON_VERSION=2.7 PATH=/usr/gnu/bin:/usr/bin COMPONENT_PREP_ACTION = ( cd $(@D) && \ components/desktop/gnome2/gnome-games/Makefile
@@ -29,8 +29,6 @@ include $(WS_TOP)/make-rules/configure.mk include $(WS_TOP)/make-rules/ips.mk PYTHON_VERSION=2.7 PATH=/usr/gnu/bin:/usr/bin COMPONENT_PREP_ACTION = ( cd $(@D) && \ components/desktop/gnome2/gnome-menus/Makefile
@@ -31,8 +31,6 @@ PATH=/usr/gnu/bin:/usr/bin PYTHON_VERSION=2.7 COMPONENT_POST_UNPACK_ACTION = ( cd $(SOURCE_DIR) && cp -r python python-2.6) COMPONENT_PREP_ACTION = ( cd $(@D) && \ components/desktop/gnome2/gnome-panel/Makefile
@@ -29,8 +29,6 @@ include $(WS_MAKE_RULES)/configure.mk include $(WS_MAKE_RULES)/ips.mk PYTHON_VERSION=2.7 PATH=/usr/gnu/bin:/usr/bin COMPONENT_PREP_ACTION = ( cp $(COMPONENT_DIR)/files/*.png $(@D)/icons && cd $(@D) && \ components/desktop/gnome2/hamster-applet/Makefile
@@ -32,7 +32,6 @@ include $(WS_TOP)/make-rules/configure.mk include $(WS_TOP)/make-rules/ips.mk PYTHON_VERSION = 2.7 PATH=/usr/gnu/bin:/usr/bin
@@ -30,8 +30,6 @@ include $(WS_MAKE_RULES)/configure.mk include $(WS_MAKE_RULES)/ips.mk PYTHON_VERSION=2.7 PATH=/usr/gnu/bin:/usr/bin CONFIGURE_OPTIONS+= --sysconfdir=/etc components/desktop/gnome2/planner/Makefile
@@ -29,8 +29,6 @@ include $(WS_TOP)/make-rules/configure.mk include $(WS_TOP)/make-rules/ips.mk PYTHON_VERSION=2.7 PATH=/usr/gnu/bin:/usr/bin:/usr/perl5/bin COMPONENT_PREP_ACTION = ( cd $(@D) && \ components/desktop/mate/caja/Makefile
@@ -44,7 +44,6 @@ CONFIGURE_OPTIONS+= --with-gnome-distributor="The OpenIndiana Project" CONFIGURE_OPTIONS+= --libexecdir=/usr/lib/$(COMPONENT_NAME) PYTHON_VERSION = 2.7 CONFIGURE_ENV+= PYTHON="$(PYTHON)" COMPONENT_BUILD_ENV += CC="$(CC)" components/desktop/mate/mate-menus/Makefile
@@ -46,7 +46,6 @@ CONFIGURE_OPTIONS+= --localstatedir=/var/lib CONFIGURE_OPTIONS+= --enable-python PYTHON_VERSION = 2.7 CONFIGURE_ENV += PYTHON="$(PYTHON.$(BITS))" CONFIGURE_ENV += PYTHONPATH="$(PYTHON_VENDOR_PACKAGES.$(BITS))" COMPONENT_BUILD_ENV += CC="$(CC)" components/desktop/mate/mate-notification-daemon/Makefile
@@ -45,8 +45,6 @@ CONFIGURE_OPTIONS+= --with-gnome-distributor="The OpenIndiana Project" CONFIGURE_OPTIONS+= --libexecdir=/usr/lib/$(COMPONENT_NAME) PYTHON_VERSION = 2.7 CONFIGURE_ENV+= PYTHON="$(PYTHON)" COMPONENT_BUILD_ENV += CC="$(CC)" components/desktop/mate/mate-panel/Makefile
@@ -45,7 +45,6 @@ CONFIGURE_OPTIONS+= --libexecdir=/usr/lib/$(COMPONENT_NAME) CONFIGURE_OPTIONS+= --with-gtk=2.0 PYTHON_VERSION = 2.7 CONFIGURE_ENV+= PYTHON="$(PYTHON)" COMPONENT_BUILD_ENV += CC="$(CC)" components/desktop/mate/mate-settings-daemon/Makefile
@@ -45,7 +45,6 @@ CONFIGURE_OPTIONS+= --with-default-wm CONFIGURE_OPTIONS+= --libexecdir=/usr/lib/$(COMPONENT_NAME) PYTHON_VERSION = 2.7 CONFIGURE_ENV+= PYTHON="$(PYTHON)" CONFIGURE_ENV.64 += NSS_LIBS="-L/usr/lib/mps/64"
@@ -32,8 +32,6 @@ include $(WS_MAKE_RULES)/configure.mk include $(WS_MAKE_RULES)/ips.mk PYTHON_VERSION=2.7 PATH=/usr/gnu/bin:/usr/bin COMPONENT_PREP_ACTION = ( cd $(@D) && \ components/desktop/xchat/Makefile
@@ -29,8 +29,6 @@ include $(WS_TOP)/make-rules/configure.mk include $(WS_TOP)/make-rules/ips.mk PYTHON_VERSION=2.7 PATH=/usr/gnu/bin:/usr/bin:/usr/perl5/bin COMPONENT_PREP_ACTION = ( cd $(@D) && \ components/developer/antlr/Makefile
@@ -43,8 +43,6 @@ include $(WS_TOP)/make-rules/configure.mk include $(WS_TOP)/make-rules/ips.mk PYTHON_VERSION=2.7 PATCH_LEVEL = 0 CONFIGURE_OPTIONS += --without-examples components/developer/gdb/Makefile
@@ -43,8 +43,6 @@ include $(WS_MAKE_RULES)/configure.mk include $(WS_MAKE_RULES)/ips.mk PYTHON_VERSION=2.7 # GDB wants the GNU utilities PATH=/usr/gnu/bin:/usr/bin:/usr/perl5/bin
@@ -49,8 +49,6 @@ include $(WS_MAKE_RULES)/configure.mk include $(WS_MAKE_RULES)/ips.mk PYTHON_VERSION=2.7 CONFIGURE_PREFIX = /usr CONFIGURE_OPTIONS += --with-libpcre CONFIGURE_OPTIONS += --without-openssl components/developer/glade/Makefile
@@ -33,8 +33,6 @@ include $(WS_TOP)/make-rules/configure.mk include $(WS_TOP)/make-rules/ips.mk PYTHON_VERSION=2.7 PATH=/usr/gnu/bin:/usr/bin COMPONENT_PREP_ACTION = ( cd $(@D) && \ components/developer/gnome-doc-utils/Makefile
@@ -29,8 +29,6 @@ include $(WS_TOP)/make-rules/configure.mk include $(WS_TOP)/make-rules/ips.mk PYTHON_VERSION=2.7 PATH=/usr/gnu/bin:/usr/bin # Missing files in build dir for xml2po without this. components/developer/gtk-doc/Makefile
@@ -28,8 +28,6 @@ include $(WS_TOP)/make-rules/configure.mk include $(WS_TOP)/make-rules/ips.mk PYTHON_VERSION=2.7 PATH=/usr/gnu/bin:/usr/bin CONFIGURE_OPTIONS+= --sysconfdir=/etc components/developer/meld/Makefile
@@ -50,8 +50,6 @@ include $(WS_MAKE_RULES)/justmake.mk include $(WS_MAKE_RULES)/ips.mk PYTHON_VERSION=2.7 PATH=/usr/gnu/bin:/usr/bin PKG_OPTIONS += -D COMPONENT_DESCRIPTION="$(COMPONENT_DESCRIPTION)" components/developer/scons/Makefile
@@ -35,9 +35,6 @@ CLEAN_PATHS+= $(BUILD_DIR) # The package delivery should be fixed in 2.7 (matching dirs in globs # as bad files and dying). Also, it is in SCons requirements ;) PYTHON_VERSION = 2.7 PKG_MACROS += PYTHON_VERSION="$(PYTHON_VERSION)" PKG_MACROS += PYTHON_LIB="$(PYTHON_LIB)"
@@ -42,7 +42,6 @@ include $(WS_TOP)/make-rules/configure.mk include $(WS_TOP)/make-rules/ips.mk PYTHON_VERSION=2.7 PATCH_LEVEL = 0 PYMODS = client core delta fs ra repos wc PLMODS= Fs Core Wc Client Repos Ra Delta components/editor/gedit-plugins/Makefile
@@ -33,8 +33,6 @@ include $(WS_TOP)/make-rules/configure.mk include $(WS_TOP)/make-rules/ips.mk PYTHON_VERSION=2.7 PATH=/usr/gnu/bin:/usr/bin CONFIGURE_OPTIONS+= --sysconfdir=/etc components/editor/gedit/Makefile
@@ -33,7 +33,6 @@ include $(WS_MAKE_RULES)/configure.mk include $(WS_MAKE_RULES)/ips.mk PYTHON_VERSION=2.7 PATH=/usr/gnu/bin:/usr/bin COMPONENT_PREP_ACTION = ( cd $(@D) && \ components/illumos/openindiana-welcome/Makefile
@@ -29,8 +29,6 @@ PKG_MACROS+= GIT_REPO="$(GIT_REPO)" PYTHON_VERSION=2.7 GIT=git GIT_REPO=https://github.com/OpenIndiana/openindiana-welcome GIT_BRANCH=master components/image/eog/Makefile
@@ -29,8 +29,6 @@ include $(WS_TOP)/make-rules/configure.mk include $(WS_TOP)/make-rules/ips.mk PYTHON_VERSION=2.7 PATH=/usr/gnu/bin:/usr/bin COMPONENT_PRE_CONFIGURE_ACTION = (cp -r $(SOURCE_DIR)/* $(@D) && \ components/image/gimp/Makefile
@@ -31,8 +31,6 @@ include $(WS_TOP)/make-rules/configure.mk include $(WS_TOP)/make-rules/ips.mk PYTHON_VERSION=2.7 PATH=/usr/gnu/bin:/usr/bin CFLAGS += -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include components/inputmethod/imf-selector/Makefile
@@ -34,8 +34,6 @@ $(SOURCE_DIR)/.prep: Makefile $(TOUCH) $@ PYTHON_VERSION=2.7 PATH=/usr/gnu/bin:/usr/bin # Missing files in build dir for configure without this. components/library/brltty/Makefile
@@ -33,8 +33,6 @@ include $(WS_MAKE_RULES)/configure.mk include $(WS_MAKE_RULES)/ips.mk PYTHON_VERSION=2.7 PATH=/usr/bin:/usr/gnu/bin COMPONENT_POST_UNPACK_ACTION = ( cd $(SOURCE_DIR) && cp -r Bindings/Python Bindings/Python26) components/library/gamin/Makefile
@@ -35,8 +35,6 @@ include $(WS_MAKE_RULES)/configure.mk include $(WS_MAKE_RULES)/ips.mk PYTHON_VERSION=2.7 PATH=/usr/gnu/bin:/usr/bin COMPONENT_PREP_ACTION = ( cd $(@D) && \ components/library/glib/Makefile
@@ -31,8 +31,6 @@ include $(WS_TOP)/make-rules/configure.mk include $(WS_TOP)/make-rules/ips.mk PYTHON_VERSION=2.7 PATH=/usr/gnu/bin:/usr/bin gcc_OPT = -O2 components/library/gobject-introspection/Makefile
@@ -37,8 +37,6 @@ include $(WS_TOP)/make-rules/configure.mk include $(WS_TOP)/make-rules/ips.mk PYTHON_VERSION=2.7 COMPONENT_POST_UNPACK_ACTION = \ /usr/bin/find $(SOURCE_DIR) -name *.py \ -exec $(GSED) -i -e 's:/usr/bin/env python:$(PYTHON):' "{}" \; ; components/library/gtk+/Makefile
@@ -32,8 +32,6 @@ include $(WS_MAKE_RULES)/configure.mk include $(WS_MAKE_RULES)/ips.mk PYTHON_VERSION=2.7 gcc_OPT = -O2 CFLAGS += -I/usr/X11/include
@@ -31,8 +31,6 @@ include $(WS_MAKE_RULES)/configure.mk include $(WS_MAKE_RULES)/ips.mk PYTHON_VERSION=2.7 PATH = /usr/bin:/usr/gnu/bin:/usr/perl5/bin COMPONENT_PRE_CONFIGURE_ACTION = ($(CLONEY) $(SOURCE_DIR) $(@D)) components/library/libglade/Makefile
@@ -35,8 +35,6 @@ include $(WS_MAKE_RULES)/configure.mk include $(WS_MAKE_RULES)/ips.mk PYTHON_VERSION=2.7 CFLAGS += -D__EXTENSIONS__ CONFIGURE_OPTIONS += --sysconfdir=/etc components/library/libgsf/Makefile
@@ -36,8 +36,6 @@ include $(WS_TOP)/make-rules/configure.mk include $(WS_TOP)/make-rules/ips.mk PYTHON_VERSION=2.7 PATH=/usr/gnu/bin:/usr/bin COMPONENT_PREP_ACTION = ( cd $(@D) && \ components/library/liblouis/Makefile
@@ -35,8 +35,6 @@ include $(WS_TOP)/make-rules/configure.mk include $(WS_TOP)/make-rules/ips.mk PYTHON_VERSION=2.7 PATH=/usr/gnu/bin:/usr/bin COMPONENT_BUILD_ARGS = components/library/libproxy/Makefile
@@ -32,8 +32,6 @@ include $(WS_MAKE_RULES)/configure.mk include $(WS_MAKE_RULES)/ips.mk PYTHON_VERSION=2.7 COMPONENT_PREP_ACTION= ( cd $(@D) && \ libtoolize --force &&\ aclocal -I . &&\ components/library/vte/Makefile
@@ -33,8 +33,6 @@ PATH=/usr/gnu/bin:/usr/bin PYTHON_VERSION=2.7 COMPONENT_POST_UNPACK_ACTION = ( cd $(SOURCE_DIR) && cp -r python python-2.6) COMPONENT_PREP_ACTION = ( cd $(@D) && \ components/mail/fetchmail/Makefile
@@ -40,8 +40,6 @@ include $(WS_MAKE_RULES)/configure.mk include $(WS_MAKE_RULES)/ips.mk PYTHON_VERSION=2.7 CONFIGURE_OPTIONS += am_cv_python_pythondir="$(PYTHON_VENDOR_PACKAGES)" CONFIGURE_OPTIONS += --with-kerberos5 CONFIGURE_OPTIONS += --with-ssl components/multimedia/rhythmbox/Makefile
@@ -31,8 +31,6 @@ include $(WS_MAKE_RULES)/configure.mk include $(WS_MAKE_RULES)/ips.mk PYTHON_VERSION=2.7 CXXFLAGS+= -DMOZ_DEFAULT_TOOLKIT=\"cairo-gtk2\" CXXFLAGS+= -std=gnu++0x CFLAGS += -I/usr/include/check components/multimedia/totem/Makefile
@@ -31,8 +31,6 @@ include $(WS_MAKE_RULES)/configure.mk include $(WS_MAKE_RULES)/ips.mk PYTHON_VERSION=2.7 PATH=/usr/gnu/bin:/usr/bin COMPONENT_PRE_CONFIGURE_ACTION = ($(CLONEY) $(SOURCE_DIR) $(@D) && cd $(@D) && autoconf) components/network/avahi/Makefile
@@ -31,8 +31,6 @@ include $(WS_MAKE_RULES)/configure.mk include $(WS_MAKE_RULES)/ips.mk PYTHON_VERSION=2.7 COMPONENT_PREP_ACTION += (cd $(@D) &&\ aclocal -I common &&\ automake --add-missing &&\ components/print/hal-cups-utils/Makefile
@@ -39,8 +39,6 @@ include $(WS_MAKE_RULES)/configure.mk include $(WS_MAKE_RULES)/ips.mk PYTHON_VERSION=2.7 PATCH_LEVEL = 0 USED_PYTHON=$(PYTHON)
@@ -37,8 +37,6 @@ include $(WS_MAKE_RULES)/configure.mk include $(WS_MAKE_RULES)/ips.mk PYTHON_VERSION=2.7 PKG_OPTIONS += -I $(COMPONENT_DIR) # Enable ASLR for this component components/print/system-config-printer/Makefile
@@ -32,8 +32,6 @@ include $(WS_MAKE_RULES)/configure.mk include $(WS_MAKE_RULES)/ips.mk PYTHON_VERSION=2.7 CFLAGS += -I/usr/X11/include COMPONENT_PRE_CONFIGURE_ACTION = (chmod -R u+r $(SOURCE_DIR) && \ components/samba/samba/Makefile
@@ -68,8 +68,6 @@ include $(WS_MAKE_RULES)/ips.mk PYTHON_VERSION=2.7 # directory to search for "include" in samba.p5m PKG_OPTIONS += -I $(COMPONENT_DIR) # Set the pkg... path to search files in ./Solaris/ dir (mainly the SMF manifests are there) components/sysutils/bacula/Makefile
@@ -32,8 +32,6 @@ include $(WS_MAKE_RULES)/configure.mk include $(WS_MAKE_RULES)/ips.mk PYTHON_VERSION=2.7 # Missing files in build dir for configure without this. COMPONENT_PRE_CONFIGURE_ACTION = ($(CLONEY) $(SOURCE_DIR) $(@D))
@@ -49,8 +49,6 @@ include $(WS_MAKE_RULES)/configure.mk include $(WS_MAKE_RULES)/ips.mk PYTHON_VERSION=2.7 PKG_OPTIONS += -D COMPONENT_DESCRIPTION="$(COMPONENT_DESCRIPTION)" PKG_OPTIONS += -D PYTHON_VERSION="$(PYTHON_VERSION)"
@@ -31,8 +31,6 @@ include $(WS_TOP)/make-rules/configure.mk include $(WS_TOP)/make-rules/ips.mk PYTHON_VERSION=2.7 # Missing files in build dir for configure without this. COMPONENT_PRE_CONFIGURE_ACTION = ($(CP) -a $(SOURCE_DIR)/* $(@D))
@@ -42,8 +42,6 @@ include $(WS_MAKE_RULES)/configure.mk include $(WS_MAKE_RULES)/ips.mk PYTHON_VERSION=2.7 PATH=/usr/gnu/bin:/usr/bin CFLAGS += $(CPP_LARGEFILES) components/web/bluefish/Makefile
@@ -33,8 +33,6 @@ include $(WS_TOP)/make-rules/configure.mk include $(WS_TOP)/make-rules/ips.mk PYTHON_VERSION=2.7 PATH=/usr/gnu/bin:/usr/bin CFLAGS += -DANSICPP components/web/firefox/Makefile
@@ -36,8 +36,6 @@ include $(WS_TOP)/make-rules/configure.mk include $(WS_TOP)/make-rules/ips.mk PYTHON_VERSION=2.7 COMPONENT_PRE_CONFIGURE_ACTION = (cp $(COMPONENT_DIR)/files/gld-wrapper $(BUILD_DIR); chmod +x $(BUILD_DIR)/gld-wrapper ) PATH=/usr/bin:/usr/gnu/bin:/usr/sbin components/x11/xcb-proto/Makefile
@@ -40,8 +40,6 @@ include $(WS_TOP)/make-rules/configure.mk include $(WS_TOP)/make-rules/ips.mk PYTHON_VERSION=2.7 CONFIGURE_ENV += PYTHON=$(PYTHON) build: $(BUILD_32_and_64) make-rules/prep-download.mk
@@ -64,7 +64,7 @@ $$(if $$(COMPONENT_FETCH_USER_AGENT$(1)),--user-agent $$(COMPONENT_FETCH_USER_AGENT$(1))) $$(TOUCH) $$@ REQUIRED_PACKAGES += runtime/python-26 REQUIRED_PACKAGES += runtime/python-27 endif endef make-rules/setup.py.mk
@@ -63,16 +63,16 @@ # Reset arguments specified as environmnent variables COMPONENT_BUILD_ARGS = # If we are building Python 2.7 or 3.4 support, build them and install them # before Python 2.6, so 2.6 is installed last and is the canonical version. # If we are building Python 2.6 or 3.4 support, build them and install them # before Python 2.7, so 2.7 is installed last and is the canonical version. # When we change the default, the new default should go last. ifneq ($(findstring 2.7,$(PYTHON_VERSIONS)),) $(BUILD_DIR)/%-2.6/.built: $(BUILD_DIR)/%-2.7/.built $(BUILD_DIR)/%-2.6/.installed: $(BUILD_DIR)/%-2.7/.installed ifneq ($(findstring 2.6,$(PYTHON_VERSIONS)),) $(BUILD_DIR)/%-2.7/.built: $(BUILD_DIR)/%-2.6/.built $(BUILD_DIR)/%-2.7/.installed: $(BUILD_DIR)/%-2.6/.installed endif ifneq ($(findstring 3.4,$(PYTHON_VERSIONS)),) $(BUILD_DIR)/%-2.6/.built: $(BUILD_DIR)/%-3.4/.built $(BUILD_DIR)/%-2.6/.installed: $(BUILD_DIR)/%-3.4/.installed $(BUILD_DIR)/%-2.7/.built: $(BUILD_DIR)/%-3.4/.built $(BUILD_DIR)/%-2.7/.installed: $(BUILD_DIR)/%-3.4/.installed endif # Create a distutils config file specific to the combination of build make-rules/shared-macros.mk
@@ -91,7 +91,7 @@ COMPILER = gcc LINKER = gcc BITS = 32 PYTHON_VERSION = 2.6 PYTHON_VERSION = 2.7 PYTHON_VERSIONS = 2.6 2.7 BASS_O_MATIC = $(WS_TOOLS)/bass-o-matic
