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.
18943294 Convert the gnuplot binaries to 64 bit
authorDavid Marx <David.M.Marx@Oracle.Com>
Fri, 24 Oct 2014 11:31:09 -0700
changeset 2169 f78677fd112a
parent 2168 416ecfb814c9
child 2170 0be434f30a4f
18943294 Convert the gnuplot binaries to 64 bit 19884916 /usr/demo/gnuplot/binary2 and binary3 are copies of binary1.
components/gnuplot/Makefile file | annotate | diff | comparison | revisions
components/gnuplot/gnuplot.p5m file | annotate | diff | comparison | revisions 
--- a/components/gnuplot/Makefile	Wed Oct 22 15:26:11 2014 -0700
+++ b/components/gnuplot/Makefile	Fri Oct 24 11:31:09 2014 -0700
@@ -51,15 +51,20 @@
 CONFIGURE_OPTIONS  += --x-libraries=$(CONFIGURE_LIBDIR.$(BITS))
 CONFIGURE_OPTIONS  += CFLAGS="$(CFLAGS)"
 CONFIGURE_OPTIONS  += CXXFLAGS="$(CXXFLAGS)"
+CONFIGURE_OPTIONS  += LDFLAGS="$(LDFLAGS)"
+CONFIGURE_OPTIONS  += WX_CONFIG="/usr/bin/$(MACH64)/wx-config"
+
+# Enable aslr for this component
+ASLR_MODE = $(ASLR_ENABLE)
 
 include ../../make-rules/shared-targets.mk
 
 # common targets
-build:		$(BUILD_32)
+build:		$(BUILD_64)
 
-install:	$(INSTALL_32)
+install:	$(INSTALL_64)
 
-test:		$(TEST_32)
+test:		$(TEST_64)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
--- a/components/gnuplot/gnuplot.p5m	Wed Oct 22 15:26:11 2014 -0700
+++ b/components/gnuplot/gnuplot.p5m	Fri Oct 24 11:31:09 2014 -0700
@@ -35,7 +35,7 @@
 license gnuplot.license license=other
 
 
-file path=usr/bin/gnuplot mode=555
+file usr/bin/$(MACH64)/gnuplot path=usr/bin/gnuplot mode=555
 file path=usr/demo/gnuplot/1.dat
 file path=usr/demo/gnuplot/2.dat
 file path=usr/demo/gnuplot/3.dat
@@ -54,9 +54,9 @@
 file path=usr/demo/gnuplot/barchart_art.dem
 file path=usr/demo/gnuplot/big_peak.dat
 file path=usr/demo/gnuplot/binary.dem
-file $(MACH32)/demo/binary1 path=usr/demo/gnuplot/binary1
-file $(MACH32)/demo/binary1 path=usr/demo/gnuplot/binary2
-file $(MACH32)/demo/binary1 path=usr/demo/gnuplot/binary3
+file $(MACH64)/demo/binary1 path=usr/demo/gnuplot/binary1
+file $(MACH64)/demo/binary2 path=usr/demo/gnuplot/binary2
+file $(MACH64)/demo/binary3 path=usr/demo/gnuplot/binary3
 file path=usr/demo/gnuplot/bivariat.dem
 file path=usr/demo/gnuplot/bldg.png
 file path=usr/demo/gnuplot/blutux.rgb
@@ -206,7 +206,7 @@
 file path=usr/demo/gnuplot/world.dat
 file path=usr/demo/gnuplot/world.dem
 file path=usr/demo/gnuplot/world2.dem
-file path=usr/lib/gnuplot/4.6/gnuplot_x11 mode=555
+file path=usr/lib/$(MACH64)/gnuplot/4.6/gnuplot_x11 mode=555
 file path=usr/share/emacs/site-lisp/gnuplot-gui.el
 file path=usr/share/emacs/site-lisp/gnuplot-gui.elc
 file path=usr/share/emacs/site-lisp/gnuplot.el
upstream/oracle/userland-gate