X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=make%2Futilities.pm;h=baba584ad240754030525f0d60fcaae7ec975302;hb=e6601069038c35c546fd3f3dce95024b0d13f1b4;hp=5b09b764e0d382c4d52211325608465372743f53;hpb=0b72c64a033a92876acc91344f9580cd276942d1;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/make/utilities.pm b/make/utilities.pm index 5b09b764e..baba584ad 100644 --- a/make/utilities.pm +++ b/make/utilities.pm @@ -1,25 +1,47 @@ # -# Copyright 2002-2007 The ChatSpike Development Team -# -# +# InspIRCd -- Internet Relay Chat Daemon # -# Licensed under GPL, please see the COPYING file -# for more information +# Copyright (C) 2010 Daniel De Graaf +# Copyright (C) 2007-2008 Craig Edwards +# Copyright (C) 2008 Thomas Stagner +# Copyright (C) 2007 Dennis Friis # +# This file is part of InspIRCd. InspIRCd is free software: you can +# redistribute it and/or modify it under the terms of the GNU General Public +# License as published by the Free Software Foundation, version 2. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +# details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# + package make::utilities; + +require 5.8.0; + +use strict; +use warnings FATAL => qw(all); + use Exporter 'import'; use POSIX; +use File::Temp; use Getopt::Long; -@EXPORT = qw(make_rpath pkgconfig_get_include_dirs pkgconfig_get_lib_dirs pkgconfig_check_version translate_functions promptstring vcheck); +use Fcntl; +our @EXPORT = qw(make_rpath pkgconfig_get_include_dirs pkgconfig_get_lib_dirs pkgconfig_check_version translate_functions promptstring); # Parse the output of a *_config program, # such as pcre_config, take out the -L # directive and return an rpath for it. -# \033[1;32msrc/Makefile\033[0m +# \e[1;32msrc/Makefile\e[0m my %already_added = (); +my $if_skip_lines = 0; sub promptstring($$$$$) { @@ -27,22 +49,22 @@ sub promptstring($$$$$) my $var; if (!$main::interactive) { - undef $opt_commandlineswitch; + my $opt_commandlineswitch; GetOptions ("$commandlineswitch=s" => \$opt_commandlineswitch); if (defined $opt_commandlineswitch) { - print "\033[1;32m$opt_commandlineswitch\033[0m\n"; + print "\e[1;32m$opt_commandlineswitch\e[0m\n"; $var = $opt_commandlineswitch; } else { - die "Could not detect $package! Please specify the $prompt via the command line option \033[1;32m--$commandlineswitch=\"/path/to/file\"\033[0m"; + die "Could not detect $package! Please specify the $prompt via the command line option \e[1;32m--$commandlineswitch=\"/path/to/file\"\e[0m"; } } else { print "\nPlease enter the $prompt?\n"; - print "[\033[1;32m$default\033[0m] -> "; + print "[\e[1;32m$default\e[0m] -> "; chomp($var = ); } if ($var eq "") @@ -55,17 +77,18 @@ sub promptstring($$$$$) sub make_rpath($;$) { my ($executable, $module) = @_; - chomp($data = `$executable`); + return "" if defined $ENV{DISABLE_RPATH}; + chomp(my $data = `$executable`); my $output = ""; while ($data =~ /-L(\S+)/) { - $libpath = $1; + my $libpath = $1; if (!exists $already_added{$libpath}) { - print "Adding extra library path to \033[1;32m$module\033[0m ... \033[1;32m$libpath\033[0m\n"; + print "Adding runtime library path to \e[1;32m$module\e[0m ... \e[1;32m$libpath\e[0m\n"; $already_added{$libpath} = 1; } - $output .= "-Wl,--rpath -Wl,$libpath -L$libpath "; + $output .= "-Wl,-rpath -Wl,$libpath -L$libpath "; $data =~ s/-L(\S+)//; } return $output; @@ -73,6 +96,7 @@ sub make_rpath($;$) sub extend_pkg_path() { + return if defined $ENV{DISABLE_EXTEND_PKG_PATH}; if (!exists $ENV{PKG_CONFIG_PATH}) { $ENV{PKG_CONFIG_PATH} = "/usr/lib/pkgconfig:/usr/local/lib/pkgconfig:/usr/local/libdata/pkgconfig:/usr/X11R6/libdata/pkgconfig"; @@ -90,28 +114,29 @@ sub pkgconfig_get_include_dirs($$$;$) my $key = "default_includedir_$packagename"; if (exists $main::config{$key}) { - print "Locating include directory for package \033[1;32m$packagename\033[0m for module \033[1;32m$module\033[0m... "; - $ret = $main::config{$key}; - print "\033[1;32m$ret\033[0m (cached)\n"; + print "Locating include directory for package \e[1;32m$packagename\e[0m for module \e[1;32m$module\e[0m... "; + my $ret = $main::config{$key}; + print "\e[1;32m$ret\e[0m (cached)\n"; return $ret; } extend_pkg_path(); - print "Locating include directory for package \033[1;32m$packagename\033[0m for module \033[1;32m$module\033[0m... "; - - $v = `pkg-config --modversion $packagename 2>/dev/null`; - $ret = `pkg-config --cflags $packagename 2>/dev/null`; + print "Locating include directory for package \e[1;32m$packagename\e[0m for module \e[1;32m$module\e[0m... "; + my $v = `pkg-config --modversion $packagename 2>/dev/null`; + my $ret = `pkg-config --cflags $packagename 2>/dev/null`; + my $foo = ""; if ((!defined $v) || ($v eq "")) { - $foo = `locate "$headername" | head -n 1`; - $foo =~ /(.+)\Q$headername\E/; - $find = $1; + print "\e[31mCould not find $packagename via pkg-config\e[m (\e[1;32mplease install pkg-config\e[m)\n"; + my $locbin = $^O eq 'solaris' ? 'slocate' : 'locate'; + $foo = `$locbin "$headername" 2>/dev/null | head -n 1`; + my $find = $foo =~ /(.+)\Q$headername\E/ ? $1 : ''; chomp($find); if ((defined $find) && ($find ne "") && ($find ne $packagename)) { - print "(\033[1;32mFound via search\033[0m) "; + print "(\e[1;32mFound via search\e[0m) "; $foo = "-I$1"; } else @@ -138,7 +163,14 @@ sub pkgconfig_get_include_dirs($$$;$) $headername =~ s/^\///; promptstring("path to the directory containing $headername", $key, "/usr/include",$packagename,"$packagename-includes"); $packagename =~ tr/a-z/A-Z/; - $main::config{$key} = "-I$main::config{$key}" . " $defaults -DVERSION_$packagename=\"$v\""; + if (defined $v) + { + $main::config{$key} = "-I$main::config{$key}" . " $defaults -DVERSION_$packagename=\"$v\""; + } + else + { + $main::config{$key} = "-I$main::config{$key}" . " $defaults -DVERSION_$packagename=\"0.0\""; + } $main::config{$key} =~ s/^\s+//g; $ret = $main::config{$key}; return $ret; @@ -152,65 +184,42 @@ sub pkgconfig_get_include_dirs($$$;$) $main::config{$key} = "$ret -DVERSION_$packagename=\"$v\""; $main::config{$key} =~ s/^\s+//g; $ret = $main::config{$key}; - print "\033[1;32m$ret\033[0m (version $v)\n"; + print "\e[1;32m$ret\e[0m (version $v)\n"; } $ret =~ s/^\s+//g; return $ret; } -sub vcheck($$) -{ - my ($version1, $version2) = @_; - $version1 =~ s/\-r(\d+)/\.\1/g; # minor revs/patchlevels - $version2 =~ s/\-r(\d+)/\.\1/g; - $version1 =~ s/p(\d+)/\.\1/g; - $version2 =~ s/p(\d+)/\.\1/g; - $version1 =~ s/\-//g; - $version2 =~ s/\-//g; - $version1 =~ s/a-z//g; - $version2 =~ s/a-z//g; - my @v1 = split('\.', $version1); - my @v2 = split('\.', $version2); - for ($curr = 0; $curr < scalar(@v1); $curr++) - { - if ($v1[$curr] < $v2[$curr]) - { - return 0; - } - } - return 1; -} - sub pkgconfig_check_version($$;$) { my ($packagename, $version, $module) = @_; extend_pkg_path(); - print "Checking version of package \033[1;32m$packagename\033[0m is >= \033[1;32m$version\033[0m... "; + print "Checking version of package \e[1;32m$packagename\e[0m is >= \e[1;32m$version\e[0m... "; - $v = `pkg-config --modversion $packagename 2>/dev/null`; + my $v = `pkg-config --modversion $packagename 2>/dev/null`; if (defined $v) { chomp($v); } if ((defined $v) && ($v ne "")) { - if (vcheck($v,$version) == 1) + if (!system "pkg-config --atleast-version $version $packagename") { - print "\033[1;32mYes (version $v)\033[0m\n"; + print "\e[1;32mYes (version $v)\e[0m\n"; return 1; } else { - print "\033[1;32mNo (version $v)\033[0m\n"; + print "\e[1;32mNo (version $v)\e[0m\n"; return 0; } } # If we didnt find it, we cant definitively say its too old. # Return ok, and let pkgconflibs() or pkgconfincludes() pick up # the missing library later on. - print "\033[1;32mNo (not found)\033[0m\n"; + print "\e[1;32mNo (not found)\e[0m\n"; return 1; } @@ -221,28 +230,30 @@ sub pkgconfig_get_lib_dirs($$$;$) my $key = "default_libdir_$packagename"; if (exists $main::config{$key}) { - print "Locating library directory for package \033[1;32m$packagename\033[0m for module \033[1;32m$module\033[0m... "; - $ret = $main::config{$key}; - print "\033[1;32m$ret\033[0m (cached)\n"; + print "Locating library directory for package \e[1;32m$packagename\e[0m for module \e[1;32m$module\e[0m... "; + my $ret = $main::config{$key}; + print "\e[1;32m$ret\e[0m (cached)\n"; return $ret; } extend_pkg_path(); - print "Locating library directory for package \033[1;32m$packagename\033[0m for module \033[1;32m$module\033[0m... "; + print "Locating library directory for package \e[1;32m$packagename\e[0m for module \e[1;32m$module\e[0m... "; - $v = `pkg-config --modversion $packagename 2>/dev/null`; - $ret = `pkg-config --libs $packagename 2>/dev/null`; + my $v = `pkg-config --modversion $packagename 2>/dev/null`; + my $ret = `pkg-config --libs $packagename 2>/dev/null`; + my $foo = ""; if ((!defined $v) || ($v eq "")) { - $foo = `locate "$libname" | head -n 1`; + my $locbin = $^O eq 'solaris' ? 'slocate' : 'locate'; + $foo = `$locbin "$libname" | head -n 1`; $foo =~ /(.+)\Q$libname\E/; - $find = $1; + my $find = $1; chomp($find); if ((defined $find) && ($find ne "") && ($find ne $packagename)) { - print "(\033[1;32mFound via search\033[0m) "; + print "(\e[1;32mFound via search\e[0m) "; $foo = "-L$1"; } else @@ -278,7 +289,7 @@ sub pkgconfig_get_lib_dirs($$$;$) else { chomp($v); - print "\033[1;32m$ret\033[0m (version $v)\n"; + print "\e[1;32m$ret\e[0m (version $v)\n"; my $key = "default_libdir_$packagename"; $main::config{$key} = $ret; $main::config{$key} =~ s/^\s+//g; @@ -308,30 +319,100 @@ sub translate_functions($$) { die "Developers should no longer use backticks in configuration macros. Please use exec() and eval() macros instead. Offending line: $line (In module: $module)"; } + + if ($line =~ /if(gt|lt)\("(.+?)","(.+?)"\)/) { + chomp(my $result = `$2 2>/dev/null`); + if (($1 eq 'gt' && $result le $3) || ($1 eq 'lt' && $result ge $3)) { + $line = substr $line, 0, $-[0]; + } else { + $line =~ s/if$1\("$2","$3"\)//; + } + } + + if ($line =~ /ifuname\(\!"(\w+)"\)/) + { + my $uname = $1; + if ($uname eq $^O) + { + $line = ""; + return ""; + } + + $line =~ s/ifuname\(\!"(.+?)"\)//; + } + + if ($line =~ /ifuname\("(\w+)"\)/) + { + my $uname = $1; + if ($uname ne $^O) + { + $line = ""; + return ""; + } + + $line =~ s/ifuname\("(.+?)"\)//; + } + + if ($line =~ /if\("(\w+)"\)/) + { + if (defined $main::config{$1}) + { + if (($main::config{$1} !~ /y/i) and ($main::config{$1} ne "1")) + { + $line = ""; + return ""; + } + } + + $line =~ s/if\("(.+?)"\)//; + } + if ($line =~ /if\(\!"(\w+)"\)/) + { + if (!exists $main::config{$1}) + { + $line = ""; + return ""; + } + else + { + if (defined $1) + { + if (exists ($main::config{$1}) and (($main::config{$1} =~ /y/i) or ($main::config{$1} eq "1"))) + { + $line = ""; + return ""; + } + } + } + + $line =~ s/if\(\!"(.+?)"\)//; + } while ($line =~ /exec\("(.+?)"\)/) { - print "Executing program for module \033[1;32m$module\033[0m ... \033[1;32m$1\033[0m\n"; + print "Executing program for module \e[1;32m$module\e[0m ... \e[1;32m$1\e[0m\n"; my $replace = `$1`; + die $replace if ($replace =~ /Configuration failed/); chomp($replace); $line =~ s/exec\("(.+?)"\)/$replace/; } while ($line =~ /execruntime\("(.+?)"\)/) { - $line =~ s/execruntime\("(.+?)"\)/`\1`/; + $line =~ s/execruntime\("(.+?)"\)/`$1`/; } while ($line =~ /eval\("(.+?)"\)/) { - print "Evaluating perl code for module \033[1;32m$module\033[0m ... "; + print "Evaluating perl code for module \e[1;32m$module\e[0m ... "; my $tmpfile; do { - $tmpfile = tmpnam(); + $tmpfile = File::Temp::tmpnam(); } until sysopen(TF, $tmpfile, O_RDWR|O_CREAT|O_EXCL|O_NOFOLLOW, 0700); - print "(Created and executed \033[1;32m$tmpfile\033[0m)\n"; + print "(Created and executed \e[1;32m$tmpfile\e[0m)\n"; print TF $1; close TF; my $replace = `perl $tmpfile`; chomp($replace); + unlink($tmpfile); $line =~ s/eval\("(.+?)"\)/$replace/; } while ($line =~ /pkgconflibs\("(.+?)","(.+?)","(.+?)"\)/) @@ -343,7 +424,7 @@ sub translate_functions($$) { if (pkgconfig_check_version($1, $2, $module) != 1) { - die "Version of package $1 is too old. Please upgrade it to version \033[1;32m$2\033[0m or greater and try again."; + die "Version of package $1 is too old. Please upgrade it to version \e[1;32m$2\e[0m or greater and try again."; } # This doesnt actually get replaced with anything $line =~ s/pkgconfversion\("(.+?)","(.+?)"\)//; @@ -366,15 +447,18 @@ sub translate_functions($$) while ($line =~ /rpath\("(.+?)"\)/) { my $replace = make_rpath($1,$module); - $replace = "" if ($^O =~ /darwin/i); $line =~ s/rpath\("(.+?)"\)/$replace/; } }; if ($@) { - $err = $@; - $err =~ s/at .+? line \d+.*//g; + my $err = $@; + #$err =~ s/at .+? line \d+.*//g; print "\n\nConfiguration failed. The following error occured:\n\n$err\n"; + print "\nMake sure you have pkg-config installed\n"; + print "\nIn the case of gnutls configuration errors on debian,\n"; + print "Ubuntu, etc, you should ensure that you have installed\n"; + print "gnutls-bin as well as libgnutls-dev and libgnutls.\n"; exit; } else