components/perl_modules/perl-tk/patches/001-system-jpeg.patch
author Norm Jacobs <Norm.Jacobs@Oracle.COM>
Tue, 11 Feb 2014 21:34:55 -0800
branchs11-update
changeset 2949 40a8bd356d76
child 4746 8e237ffd0a48
permissions -rw-r--r--
17672127 Need CPAN perl-tk module for cssh dependency 18198698 Remove myConfig.patch and tk-GENFRAG.p5m from perl-tk
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2949
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
     1
In-House patch. 
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
     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.
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
     3
--- Tk-804.031/JPEG/Makefile.PL.orig	2014-01-03 22:04:39.788240812 -0800
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
     4
+++ Tk-804.031/JPEG/Makefile.PL	2014-01-03 21:57:20.929546011 -0800
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
     5
@@ -1,27 +1,6 @@
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
     6
 # -*- cperl -*-
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
     7
 use Tk::MMutil;
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
     8
 use Tk::Config ();
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
     9
-use File::Copy;
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    10
-my $l = $Config::Config{'lib_ext'};
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    11
-
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    12
-use Tk::MMtry;
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    13
-
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    14
-if ($Tk::MMtry::VERSION ge '4.007' && try_run("config/has_jpeg.c",['-I/usr/local/include'],['-ljpeg']))
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    15
- {
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    16
-  push(@args, LIBS => ['-ljpeg'],
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    17
-              INC  => '-I/usr/local/include',
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    18
-              DEFINE => '-DHAVE_JPEGLIB_H',
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    19
-      );
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    20
-  warn "Using system's -ljpeg\n";
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    21
-  unlink("jpeg/Makefile.PL");
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    22
- }
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    23
-else
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    24
- {
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    25
-  push(@args, MYEXTLIB  => "jpeg/libjpeg$l",
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    26
-              'INC'     => '-Ijpeg');
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    27
-  copy("Makefile.jpeg.maybe","jpeg/Makefile.PL");
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    28
-  warn "Building jpeg/libjpeg$l\n";
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    29
- }
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    30
 
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    31
 Tk::MMutil::TkExtMakefile(@args,
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    32
     'NAME'         => 'Tk::JPEG',
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    33
@@ -32,9 +11,9 @@
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    34
     'OBJECT'       => '$(O_FILES)',
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    35
     'VERSION_FROM' => 'JPEG.pm',
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    36
     'XS_VERSION'   => $Tk::Config::VERSION,
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    37
-    'dist'         => { COMPRESS => 'gzip -f9', SUFFIX => '.gz' },
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    38
-    'clean'        => { FILES => 'jpeg/Makefile jpeg/Makefile.PL jpeg/config.status jpeg/jconfig.h' }
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    39
-
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    40
+    'LIBS'         => ['-ljpeg'],
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    41
+    'DEFINE'       => '-DHAVE_JPEGLIB_H',
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    42
+    'dist'         => { COMPRESS => 'gzip -f9', SUFFIX => '.gz' }
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    43
    );
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    44
 
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    45
 sub MY::test_via_harness
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    46
@@ -45,19 +24,3 @@
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    47
 }
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    48
 
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    49
 package MY;
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    50
-
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    51
-
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    52
-sub postamble {
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    53
-  if (-f "jpeg/Makefile.PL")
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    54
-   {
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    55
-    return
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    56
-'
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    57
-$(MYEXTLIB)  : FORCE
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    58
-	cd jpeg && $(MAKE) libjpeg'.$l.'
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    59
-';
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    60
-
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    61
-   }
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    62
-}
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    63
-
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    64
-
40a8bd356d76 17672127 Need CPAN perl-tk module for cssh dependency
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    65
-