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.
20100100 xsltproc should be delivered as 64bit and ASLR enabled
authorPetr Sumbera <petr.sumbera@oracle.com>
Wed, 26 Nov 2014 01:17:06 -0800
changeset 3495 135c9369f1dc
parent 3494 21eb60acf6db
child 3497 091183b2cc24
20100100 xsltproc should be delivered as 64bit and ASLR enabled
components/libxslt/Makefile file | annotate | diff | comparison | revisions
components/libxslt/libxslt.p5m file | annotate | diff | comparison | revisions 
--- a/components/libxslt/Makefile	Wed Nov 26 00:57:52 2014 -0800
+++ b/components/libxslt/Makefile	Wed Nov 26 01:17:06 2014 -0800
@@ -42,6 +42,8 @@
 include ../../make-rules/ips.mk
 include ../../make-rules/lint-libraries.mk
 
+ASLR_MODE = $(ASLR_ENABLE)
+
 LINT_FLAGS +=	-I/usr/include/libxml2 
 
 CFLAGS +=	$(CPP_LARGEFILES)
--- a/components/libxslt/libxslt.p5m	Wed Nov 26 00:57:52 2014 -0800
+++ b/components/libxslt/libxslt.p5m	Wed Nov 26 01:17:06 2014 -0800
@@ -35,7 +35,7 @@
     value=PSARC/2002/244
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 file path=usr/bin/xslt-config facet.devel=true
-file path=usr/bin/xsltproc
+file usr/bin/$(MACH64)/xsltproc path=usr/bin/xsltproc
 file path=usr/include/libexslt/exslt.h
 file path=usr/include/libexslt/exsltconfig.h
 file path=usr/include/libexslt/exsltexports.h
upstream/oracle/userland-gate