1 In-House patch. 

     2 Making sure Perl-Tk does not build its own copy of libjpeg, instead links against libjpeg library already present in Solaris in /usr/lib.

     3 --- Tk-804.031/JPEG/Makefile.PL.orig	2014-01-03 22:04:39.788240812 -0800

     4 +++ Tk-804.031/JPEG/Makefile.PL	2014-01-03 21:57:20.929546011 -0800

     5 @@ -1,27 +1,6 @@

     6  # -*- cperl -*-

     7  use Tk::MMutil;

     8  use Tk::Config ();

     9 -use File::Copy;

    10 -my $l = $Config::Config{'lib_ext'};

    11 -

    12 -use Tk::MMtry;

    13 -

    14 -if ($Tk::MMtry::VERSION ge '4.007' && try_run("config/has_jpeg.c",['-I/usr/local/include'],['-ljpeg']))

    15 - {

    16 -  push(@args, LIBS => ['-ljpeg'],

    17 -              INC  => '-I/usr/local/include',

    18 -              DEFINE => '-DHAVE_JPEGLIB_H',

    19 -      );

    20 -  warn "Using system's -ljpeg\n";

    21 -  unlink("jpeg/Makefile.PL");

    22 - }

    23 -else

    24 - {

    25 -  push(@args, MYEXTLIB  => "jpeg/libjpeg$l",

    26 -              'INC'     => '-Ijpeg');

    27 -  copy("Makefile.jpeg.maybe","jpeg/Makefile.PL");

    28 -  warn "Building jpeg/libjpeg$l\n";

    29 - }

    30  

    31  Tk::MMutil::TkExtMakefile(@args,

    32      'NAME'         => 'Tk::JPEG',

    33 @@ -32,9 +11,9 @@

    34      'OBJECT'       => '$(O_FILES)',

    35      'VERSION_FROM' => 'JPEG.pm',

    36      'XS_VERSION'   => $Tk::Config::VERSION,

    37 -    'dist'         => { COMPRESS => 'gzip -f9', SUFFIX => '.gz' },

    38 -    'clean'        => { FILES => 'jpeg/Makefile jpeg/Makefile.PL jpeg/config.status jpeg/jconfig.h' }

    39 -

    40 +    'LIBS'         => ['-ljpeg'],

    41 +    'DEFINE'       => '-DHAVE_JPEGLIB_H',

    42 +    'dist'         => { COMPRESS => 'gzip -f9', SUFFIX => '.gz' }

    43     );

    44  

    45  sub MY::test_via_harness

    46 @@ -45,19 +24,3 @@

    47  }

    48  

    49  package MY;

    50 -

    51 -

    52 -sub postamble {

    53 -  if (-f "jpeg/Makefile.PL")

    54 -   {

    55 -    return

    56 -'

    57 -$(MYEXTLIB)  : FORCE

    58 -	cd jpeg && $(MAKE) libjpeg'.$l.'

    59 -';

    60 -

    61 -   }

    62 -}

    63 -

    64 -

    65 -