--- a/components/net-snmp/Makefile Wed Mar 22 09:27:09 2017 -0700
+++ b/components/net-snmp/Makefile Mon Mar 27 15:35:14 2017 -0700
@@ -46,11 +46,6 @@
CFLAGS += $(studio_C99_ENABLE)
CPPFLAGS += "-DFALSE_SHARING_ALIGN=64"
-# After Python 2.6 goes away, the COMPONENT_POST_{CONFIGURE,INSTALL}_ACTIONs
-# below can go away as well (for INSTALL_ACTION, 32-bit goes away; 64-bit
-# remains).
-PYTHON_VERSION=2.6
-
CONFIGURE_ENV += PYTHONPROG=$(PYTHON.$(BITS))
CONFIGURE_OPTIONS += --with-default-snmp-version=3
@@ -97,10 +92,6 @@
COMPONENT_PRE_CONFIGURE_ACTION = \
($(CLONEY) $(SOURCE_DIR) $(@D); $(CLONEY) $(COMPONENT_DIR)/sun $(@D)/sun)
-# After we have configured, make a copy of the python bits so we
-# can build separate python 2.7 support.
-COMPONENT_POST_CONFIGURE_ACTION = (cd $(@D) ; cp -rp python python2.7)
-
# for the goofy definition of ARCH in the extra Makefiles
ARCH=32
ARCH=$(BITS:64=$(MACH64))
@@ -118,11 +109,7 @@
$(INSTALL_32): COMPONENT_POST_INSTALL_ACTION= \
($(MKDIR) -p $(BUILD_DIR)/prototype/$(MACH)/etc/net-snmp/snmp/mibs; \
- cd $(BUILD_DIR)/$(MACH32)/sun ; ls agent; $(CCSMAKE) -e $(CCSMAKE_ARGS) install) ; \
- (cd $(@D)/python2.7 ; env PYTHON=$(PYTHON.2.7.$(BITS)) \
- $(PYTHON.2.7.$(BITS)) ./setup.py install \
- --root $(PROTO_DIR) \
- --install-lib=$(PYTHON.2.7.VENDOR_PACKAGES))
+ cd $(BUILD_DIR)/$(MACH32)/sun ; ls agent; $(CCSMAKE) -e $(CCSMAKE_ARGS) install)
$(INSTALL_64): COMPONENT_POST_INSTALL_ACTION= \
($(MKDIR) -p $(BUILD_DIR)/prototype/$(MACH64)/etc/net-snmp/snmp/mibs; \
@@ -144,7 +131,6 @@
$(ENV) srcdir=$(@D) $(DOXYGEN) $(@D)/doxygen.conf)
$(TOUCH) $@
REQUIRED_PACKAGES += runtime/perl-512
-REQUIRED_PACKAGES += runtime/python-26
REQUIRED_PACKAGES += runtime/python-27
REQUIRED_PACKAGES += shell/bash
REQUIRED_PACKAGES += shell/ksh93