components/perl_modules/perl-tk/patches/001-system-jpeg.patch
author Bill Rushmore <bill.rushmore@oracle.com>
Fri, 07 Aug 2015 13:43:38 -0700
changeset 4746 8e237ffd0a48
parent 1677 e41bbf0b1631
permissions -rw-r--r--
20995635 Perl TK needs to be upgraded to work with Perl 5.20 20994112 Perl XML::Parser needs to work with Perl 5.20 20989929 Perl net-ssleay needs to be fixed so it builds with Perl 5.20 20989909 Perl libxml needs to be fixed so it builds with Perl 5.20 20989894 Perl DBI - needs to be fixed so it builds with Perl 5.20 20989877 AUTHEN-PAM needs to be fixed so it builds with Perl 5.20 21195142 OpenSCAP's Makefile needs to be updated to work with Perl 5.20 21216887 Dependencies and references to Perl 5.16 need to be replaced with Perl 5.20

In-House patch. 
Making sure Perl-Tk does not build its own copy of libjpeg, instead links against libjpeg library already present in Solaris in /usr/lib.
--- Tk-804.033/JPEG/Makefile.PL.orig	2014-01-03 22:04:39.788240812 -0800
+++ Tk-804.033/JPEG/Makefile.PL	2014-01-03 21:57:20.929546011 -0800
@@ -1,27 +1,6 @@
 # -*- cperl -*-
 use Tk::MMutil;
 use Tk::Config ();
-use File::Copy;
-my $l = $Config::Config{'lib_ext'};
-
-use Tk::MMtry;
-
-if ($Tk::MMtry::VERSION ge '4.007' && try_run("config/has_jpeg.c",['-I/usr/local/include'],['-ljpeg']))
- {
-  push(@args, LIBS => ['-ljpeg'],
-              INC  => '-I/usr/local/include',
-              DEFINE => '-DHAVE_JPEGLIB_H',
-      );
-  warn "Using system's -ljpeg\n";
-  unlink("jpeg/Makefile.PL");
- }
-else
- {
-  push(@args, MYEXTLIB  => "jpeg/libjpeg$l",
-              'INC'     => '-Ijpeg');
-  copy("Makefile.jpeg.maybe","jpeg/Makefile.PL");
-  warn "Building jpeg/libjpeg$l\n";
- }
 
 Tk::MMutil::TkExtMakefile(@args,
     'NAME'         => 'Tk::JPEG',
@@ -32,9 +11,9 @@
     'OBJECT'       => '$(O_FILES)',
     'VERSION_FROM' => 'JPEG.pm',
     'XS_VERSION'   => $Tk::Config::VERSION,
-    'dist'         => { COMPRESS => 'gzip -f9', SUFFIX => '.gz' },
-    'clean'        => { FILES => 'jpeg/Makefile jpeg/Makefile.PL jpeg/config.status jpeg/jconfig.h' }
-
+    'LIBS'         => ['-ljpeg'],
+    'DEFINE'       => '-DHAVE_JPEGLIB_H',
+    'dist'         => { COMPRESS => 'gzip -f9', SUFFIX => '.gz' }
    );
 
 sub MY::test_via_harness
@@ -45,19 +24,3 @@
 }
 
 package MY;
-
-
-sub postamble {
-  if (-f "jpeg/Makefile.PL")
-   {
-    return
-'
-$(MYEXTLIB)  : FORCE
-	cd jpeg && $(MAKE) libjpeg'.$l.'
-';
-
-   }
-}
-
-
-