18198698 Remove myConfig.patch and tk-GENFRAG.p5m from perl-tk
authorNorm Jacobs <Norm.Jacobs@Oracle.COM>
Tue, 11 Feb 2014 19:57:43 -0800
changeset 1708 5f9e83d9256b
parent 1707 99c37525cdda
child 1709 beec163c6a30
18198698 Remove myConfig.patch and tk-GENFRAG.p5m from perl-tk
components/perl_modules/perl-tk/Makefile
components/perl_modules/perl-tk/patches/myConfig.patch
components/perl_modules/perl-tk/tk-GENFRAG.p5m
--- a/components/perl_modules/perl-tk/Makefile	Tue Feb 11 16:49:58 2014 -0800
+++ b/components/perl_modules/perl-tk/Makefile	Tue Feb 11 19:57:43 2014 -0800
@@ -38,6 +38,9 @@
 include $(WS_TOP)/make-rules/ips.mk
 include $(WS_TOP)/make-rules/makemaker.mk
 
+# override LIBS so that the Tk.so RunPATH doesn't get set.
+CONFIGURE_OPTIONS += LIBS="-lXft -lX11 -lfontconfig -lm -lc"
+
 # Disbale ASLR for this module.
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
--- a/components/perl_modules/perl-tk/patches/myConfig.patch	Tue Feb 11 16:49:58 2014 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-In house, Solaris specific patch to remove path to X11R6/lib as this gets added to LD_RUN_PATH and causes pkg lint warnings of 32-bit runpath in 64-bit binary.
---- Tk-804.031/myConfig	2013-05-21 06:25:13.000000000 -0700
-+++ Tk-804.031/myConfig.new	2014-01-29 23:20:16.182341526 -0800
[email protected]@ -369,6 +369,7 @@
-       $xlib = &lX11(0,split(/\s+/,$Config{'libpth'}))
-     }
- 
-+  $xlib = "";
-   unless(defined $xlib)
-     {
-       warn "Cannot find -lX11 anywhere --- cannot build Perl/Tk\n";
--- a/components/perl_modules/perl-tk/tk-GENFRAG.p5m	Tue Feb 11 16:49:58 2014 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
-#
-
-depend fmri=library/perl-5/perl-tk-threaded-512 predicate=runtime/perl-threaded-512 type=conditional