Convert gcc-4-runtime to gcc-6-runtime

Aurelien Larcher

2018-01-20 2136604c82fa97645ec6488d4a395fdaebb7eba4

 components/image/graphviz/Makefile

@@ -26,51 +26,83 @@
include ../../../make-rules/shared-macros.mk

COMPONENT_NAME=      graphviz
COMPONENT_VERSION=   2.28.0
COMPONENT_REVISION=   6
COMPONENT_VERSION=   2.40.1
COMPONENT_REVISION=   1
COMPONENT_PROJECT_URL=   http://www.graphviz.org/
COMPONENT_SRC=      $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE=   $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH=   \
    sha256:d3aa7973c578cae4cc26d9d6498c57ed06680cab9a4e940d0357a3c6527afc76
COMPONENT_ARCHIVE_URL=   $(COMPONENT_PROJECT_URL)pub/graphviz/stable/SOURCES/$(COMPONENT_ARCHIVE)
COMPONENT_BUGDB=   utility/graphviz
COMPONENT_ARCHIVE_HASH= sha256:ca5218fade0204d59947126c38439f432853543b0818d9d728c589dfe7f3a421
COMPONENT_ARCHIVE_URL= http://204.178.9.49/pub/graphviz/stable/SOURCES/$(COMPONENT_ARCHIVE)

include $(WS_TOP)/make-rules/prep.mk
include $(WS_TOP)/make-rules/configure.mk
include $(WS_TOP)/make-rules/ips.mk
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/configure.mk
include $(WS_MAKE_RULES)/ips.mk

PATH =      /usr/bin:/usr/gnu/bin:/usr/php/5.4/bin
PATH_PHP.32 = /usr/php/5.6/bin
PATH_PHP.64 = /usr/php/5.6/bin/$(MACH64)
PATH = /usr/bin:/usr/gnu/bin:$(PATH_PHP.$(BITS))

CPPFLAGS += -I/usr/lib/$(MACH64)/ocaml
# GMP header files for the guile extension (no --with- flag)
# The guile build is broken with studio (7073649), so we disable this for now.
# CPPFLAGS +=   -I/usr/include/gmp
# Java header files (--with-javaincludedir allows for only one directory)
CPPFLAGS +=   -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/solaris
# PHP header files (no --with- flag)
CPPFLAGS +=   $(shell /usr/php/5.4/bin/php-config --includes)
CPPFLAGS_PHP.32 =   $(shell /usr/php/5.6/bin/php-config --includes)
CPPFLAGS_PHP.64 =   $(shell /usr/php/5.6/bin/$(MACH64)/php-config --includes)
CPPFLAGS += $(CPPFLAGS_PHP.$(BITS))
#CXX +=      $(studio_NORUNPATH)

COMPONENT_PREP_ACTION = (cd $(@D) && libtoolize -cf && \
            aclocal && \
            autoconf -f -I m4 && \
            autoheader && \
            automake --add-missing)

# Can't find headers without this.
COMPONENT_PRE_CONFIGURE_ACTION =        ($(CLONEY) $(SOURCE_DIR) $(@D))

CONFIGURE_ENV +=   CPPFLAGS="$(CPPFLAGS)"
CONFIGURE_ENV +=   PERL=$(PERL)
# Explicitly use Ruby 1.9.  Allows switching Ruby default without
# affecting graphviz build.
CONFIGURE_ENV +=   RUBY=$(RUBY.1.9)
CONFIGURE_ENV +=   RUBY=$(RUBY)
CONFIGURE_OPTIONS +=   --without-included-ltdl
CONFIGURE_OPTIONS +=   --enable-python=no
CONFIGURE_OPTIONS +=   --enable-python26=yes
CONFIGURE_OPTIONS +=   --enable-python26=no
CONFIGURE_OPTIONS +=   --enable-python27=yes
CONFIGURE_ENV +=   PYTHON27=$(PYTHON.2.7.$(BITS))
# We build only 64-bit java library,
# but avoid building other 64-bit bindings for now
CONFIGURE_OPTIONS.32 +=   --enable-java=no
CONFIGURE_OPTIONS.64 +=   --enable-java=yes
CONFIGURE_OPTIONS.64 +=   --enable-perl=no
CONFIGURE_OPTIONS.64 +=   --enable-ruby=no
CONFIGURE_OPTIONS.64 +=   --enable-tcl=no
CONFIGURE_OPTIONS +=   --x-libraries=$(CONFIGURE_LIBDIR.$(BITS))
CONFIGURE_OPTIONS +=   --with-qt=no
CONFIGURE_OPTIONS += --with-gdincludedir=$(CONFIGURE_INCLUDEDIR)/gd2

CONFIGURE_ENV.32 += ac_cv_path_GDLIB_CONFIG=/usr/bin/gdlib-config
CONFIGURE_ENV.64 += ac_cv_path_GDLIB_CONFIG=/usr/bin/$(MACH64)/gdlib-config

COMPONENT_BUILD_ARGS +=    GREP=/usr/bin/ggrep

# common targets
build:      $(BUILD_32)
COMPONENT_POST_INSTALL_ACTION += \
    ( cd $(PROTOUSRLIBDIR)/python$(PYTHON_VERSION) ; \
        $(RM) -r vendor-packages-$(BITS) ; \
        $(MV) site-packages vendor-packages-$(BITS) )

install:   $(INSTALL_32)
# common targets

# We don't want to overwrite 32-bit bits
$(INSTALL_32):   $(INSTALL_64)

build:      $(BUILD_32_and_64)

install:   $(INSTALL_32_and_64)
   env LD_LIBRARY_PATH=$(PROTO_DIR)/usr/lib GVBINDIR=$(PROTO_DIR)/usr/lib/graphviz $(PROTO_DIR)/usr/bin/dot -c
   $(PYTHON.2.6.32) -m compileall $(PROTO_DIR)/usr/lib/graphviz/python26
   $(PYTHON.2.7.32) -m compileall $(PROTO_DIR)/usr/lib/graphviz/python27

# The test infrastructure doesn't run in a VPATHed environment.
@@ -82,4 +114,40 @@
# http://graphviz.org/bugs/b2063.html
test:      $(NO_TESTS)

BUILD_PKG_DEPENDENCIES =   $(BUILD_TOOLS)
# Auto-generated dependencies
REQUIRED_PACKAGES += SUNWcs
REQUIRED_PACKAGES += image/graphviz
REQUIRED_PACKAGES += image/library/librsvg
REQUIRED_PACKAGES += library/desktop/atk
REQUIRED_PACKAGES += library/desktop/cairo
REQUIRED_PACKAGES += library/desktop/gdk-pixbuf
REQUIRED_PACKAGES += library/desktop/gtk2
REQUIRED_PACKAGES += library/desktop/pango
REQUIRED_PACKAGES += library/expat
REQUIRED_PACKAGES += library/gd
REQUIRED_PACKAGES += library/glib2
REQUIRED_PACKAGES += library/libpoppler
REQUIRED_PACKAGES += library/libtool/libltdl
REQUIRED_PACKAGES += library/math/gts
REQUIRED_PACKAGES += library/zlib
REQUIRED_PACKAGES += print/filter/ghostscript
REQUIRED_PACKAGES += runtime/lua
REQUIRED_PACKAGES += runtime/perl-522
REQUIRED_PACKAGES += runtime/ruby-23
REQUIRED_PACKAGES += runtime/tk-8
REQUIRED_PACKAGES += system/library
REQUIRED_PACKAGES += system/library/g++-4-runtime
REQUIRED_PACKAGES += system/library/gcc-6-runtime
REQUIRED_PACKAGES += system/library/math
REQUIRED_PACKAGES += x11/library/libx11
REQUIRED_PACKAGES += x11/library/libxmu
REQUIRED_PACKAGES += x11/library/toolkit/libxaw7
REQUIRED_PACKAGES += x11/library/toolkit/libxt
REQUIRED_PACKAGES += runtime/lua
REQUIRED_PACKAGES += runtime/perl-522
REQUIRED_PACKAGES += runtime/python-27
REQUIRED_PACKAGES += runtime/ruby-23
REQUIRED_PACKAGES += runtime/tk-8
REQUIRED_PACKAGES += runtime/java/openjdk8
REQUIRED_PACKAGES += runtime/ocaml
REQUIRED_PACKAGES += web/php-56