18071417 libtecla's enhance needs enhancement for ASLR & 64-bit
authorJohn Beck <John.Beck@Oracle.COM>
Mon, 13 Jan 2014 14:34:41 -0800
changeset 1638 e09cb51b45b1
parent 1637 54bd5ac8db85
child 1639 9d97e5aecc9f
18071417 libtecla's enhance needs enhancement for ASLR & 64-bit
components/libtecla/Makefile
components/libtecla/libtecla.p5m
--- a/components/libtecla/Makefile	Mon Jan 13 12:44:59 2014 -0800
+++ b/components/libtecla/Makefile	Mon Jan 13 14:34:41 2014 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../make-rules/shared-macros.mk
 
@@ -46,6 +46,8 @@
 # We have our own pre-Solarified man pages.
 CONFIGURE_OPTIONS +=	--without-man-pages
 
+ASLR_MODE =	$(ASLR_ENABLE)
+
 # common targets
 build:		$(BUILD_32_and_64)
 
--- a/components/libtecla/libtecla.p5m	Mon Jan 13 12:44:59 2014 -0800
+++ b/components/libtecla/libtecla.p5m	Mon Jan 13 14:34:41 2014 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 # The man pages are all at the top of a "files" directory; setting the hash to
@@ -30,7 +30,7 @@
 # Bypassing the mangler for these files because they are pre-Solarified.
 <transform file path=usr/share/man/.+$ -> \
     add mangler.bypass true >
-
+#
 set name=pkg.fmri \
     value=pkg:/library/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Tecla command-line editing library"
@@ -44,7 +44,7 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2004/330
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file path=usr/bin/enhance
+file usr/bin/$(MACH64)/enhance path=usr/bin/enhance
 file path=usr/include/libtecla.h
 link path=usr/lib/$(MACH64)/libtecla.so target=libtecla.so.1
 file path=usr/lib/$(MACH64)/libtecla.so.1
@@ -139,4 +139,4 @@
 file enhance.1.zh_CN.UTF-8 path=usr/share/man/zh_CN.UTF-8/man1/enhance.1
 legacy pkg=SUNWtecla desc="Tecla command-line editing library" \
     name="Tecla command-line editing library"
-license libtecla.license license="MIT-like"
+license libtecla.license license=MIT-like