Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
23297592 erlang is not picking wxWidgets support
authorJingning Ji <jingning.ji@oracle.com>
Fri, 22 Jul 2016 10:52:17 -0700
changeset 6455 77bad084980c
parent 6454 dfa9a292557b
child 6456 d36228d1492b
23297592 erlang is not picking wxWidgets support
components/erlang/Makefile file | annotate | diff | comparison | revisions
components/erlang/erlang.p5m file | annotate | diff | comparison | revisions 
--- a/components/erlang/Makefile	Fri Jul 22 09:17:47 2016 -0700
+++ b/components/erlang/Makefile	Fri Jul 22 10:52:17 2016 -0700
@@ -69,7 +69,8 @@
 # Fix 64-bit linking.
 LDFLAGS += $(CC_BITS)
 
-CPPFLAGS += "-I/usr/include/gd2"
+CXXFLAGS += -std=c++11
+
 CONFIGURE_OPTIONS += --enable-smp-support
 CONFIGURE_OPTIONS += --enable-threads
 # The HiPE portion is a bit sensitive, and only seems to work 64-bit on
@@ -88,6 +89,17 @@
 	($(CP) -rp $(SOURCE_DIR)/. $(@D))
 CONFIGURE_SCRIPT =		$(@D)/configure
 
+# We need to re-run the nested configure script for the wx sub-component so
+# that it will properly detect wxWidgets support by adding -std=c++11 to $(CXX)
+# (workaround for the configure script ignoring CXXFLAGS) and with ERL_TOP set
+# so that the wx component knows we're building inside the erlang source tree.
+COMPONENT_POST_CONFIGURE_ACTION = \
+	(cd $(@D)/lib/wx; $(ENV) $(CONFIGURE_ENV) \
+		CXX="$(CXX) -std=c++11" \
+		ERL_TOP="$(@D)" \
+		$(CONFIG_SHELL) \
+		./configure $(CONFIGURE_OPTIONS))
+
 # Always show the build and link lines for easier debugging.
 COMPONENT_BUILD_ARGS +=		V=1
 
@@ -110,9 +122,14 @@
 		$(PROTOUSRLIBDIR64)/erlang/bin/erl \
 		$(PROTOUSRLIBDIR64)/erlang/releases/RELEASES
 
+REQUIRED_PACKAGES += library/graphics/wxwidgets
 REQUIRED_PACKAGES += library/ncurses
 REQUIRED_PACKAGES += library/security/openssl
+REQUIRED_PACKAGES += library/security/openssl/openssl-fips-140
 REQUIRED_PACKAGES += library/zlib
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/core-os
+REQUIRED_PACKAGES += system/library/gcc/gcc-c++-runtime
+REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime
 REQUIRED_PACKAGES += system/library/math
+REQUIRED_PACKAGES += x11/library/mesa
--- a/components/erlang/erlang.p5m	Fri Jul 22 09:17:47 2016 -0700
+++ b/components/erlang/erlang.p5m	Fri Jul 22 10:52:17 2016 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 # Put the various erlang man pages in the right directories.
@@ -5083,6 +5083,10 @@
 file path=usr/lib/$(MACH64)/erlang/lib/wx-1.3.3/include/gl.hrl
 file path=usr/lib/$(MACH64)/erlang/lib/wx-1.3.3/include/glu.hrl
 file path=usr/lib/$(MACH64)/erlang/lib/wx-1.3.3/include/wx.hrl
+file path=usr/lib/$(MACH64)/erlang/lib/wx-1.3.3/priv/erl_gl.so
+file path=usr/lib/$(MACH64)/erlang/lib/wx-1.3.3/priv/erlang-logo32.png
+file path=usr/lib/$(MACH64)/erlang/lib/wx-1.3.3/priv/erlang-logo64.png
+file path=usr/lib/$(MACH64)/erlang/lib/wx-1.3.3/priv/wxe_driver.so
 file path=usr/lib/$(MACH64)/erlang/lib/wx-1.3.3/src/gen/gl.erl
 file path=usr/lib/$(MACH64)/erlang/lib/wx-1.3.3/src/gen/glu.erl
 file path=usr/lib/$(MACH64)/erlang/lib/wx-1.3.3/src/gen/wxAcceleratorEntry.erl
upstream/oracle/userland-gate