mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2025-12-22 21:37:35 -08:00
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
45 lines
1.3 KiB
Diff
45 lines
1.3 KiB
Diff
--- a/Makefile.PL
|
|
+++ b/Makefile.PL
|
|
@@ -13,6 +13,7 @@
|
|
|
|
my ($help, $jpeg_inc, $jpeg_lib, $png_inc, $png_lib, $gif_inc, $gif_lib, $gif_lib_name);
|
|
my ($jpeg_static, $png_static, $gif_static);
|
|
+my ($disable_jpeg, $disable_png, $disable_gif);
|
|
|
|
my $DEFINES = '-O2';
|
|
$DEFINES .= ' -Wall' unless $^O =~ /sun|solaris/i;
|
|
@@ -29,6 +30,9 @@
|
|
|
|
my $result = GetOptions(
|
|
"help|h" => \$help,
|
|
+ "disable-jpeg" => \$disable_jpeg,
|
|
+ "disable-png" => \$disable_png,
|
|
+ "disable-gif" => \$disable_gif,
|
|
"with-jpeg-includes=s" => \$jpeg_inc,
|
|
"with-jpeg-libs=s" => \$jpeg_lib,
|
|
"with-jpeg-static" => \$jpeg_static,
|
|
@@ -75,6 +79,7 @@
|
|
|
|
# Look for libjpeg
|
|
for my $incdir ( $jpeg_inc, @check ) {
|
|
+ last if $disable_jpeg;
|
|
if ( $incdir && -e catfile($incdir, 'jpeglib.h') ) {
|
|
$JPEG = 1;
|
|
$jpeg_inc = $incdir;
|
|
@@ -111,6 +116,7 @@
|
|
|
|
# Look for libpng
|
|
for my $incdir ( $png_inc, @check ) {
|
|
+ last if $disable_png;
|
|
if ( $incdir && -e catfile($incdir, 'png.h') ) {
|
|
$PNG = 1;
|
|
$png_inc = $incdir;
|
|
@@ -144,6 +150,7 @@
|
|
|
|
# Look for libgif
|
|
for my $incdir ( $gif_inc, @check ) {
|
|
+ last if $disable_gif;
|
|
if ( $incdir && -e catfile($incdir, 'gif_lib.h') ) {
|
|
$GIF = 1;
|
|
$gif_inc = $incdir;
|