X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=make%2Futilities.pm;h=baba584ad240754030525f0d60fcaae7ec975302;hb=571714e28b26cc59cbc8d27098a5ba981240ee2d;hp=3d3ceb6efbcf9f4ca2ac06a3fba32dca639782da;hpb=aca1b631d74df615fb20fa0caa99d432ea9b0fd1;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/make/utilities.pm b/make/utilities.pm index 3d3ceb6ef..baba584ad 100644 --- a/make/utilities.pm +++ b/make/utilities.pm @@ -1,22 +1,72 @@ +# +# InspIRCd -- Internet Relay Chat Daemon +# +# 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; -@EXPORT = qw(make_rpath pkgconfig_get_include_dirs pkgconfig_get_lib_dirs translate_functions promptstring); +use File::Temp; +use Getopt::Long; +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($$$) +sub promptstring($$$$$) { - my ($prompt, $configitem, $default) = @_; - print "\nPlease enter the $prompt?\n"; - print "[\033[1;32m$default\033[0m] -> "; - chomp($var = ); + my ($prompt, $configitem, $default, $package, $commandlineswitch) = @_; + my $var; + if (!$main::interactive) + { + my $opt_commandlineswitch; + GetOptions ("$commandlineswitch=s" => \$opt_commandlineswitch); + if (defined $opt_commandlineswitch) + { + 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 \e[1;32m--$commandlineswitch=\"/path/to/file\"\e[0m"; + } + } + else + { + print "\nPlease enter the $prompt?\n"; + print "[\e[1;32m$default\e[0m] -> "; + chomp($var = ); + } if ($var eq "") { $var = $default; @@ -27,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; @@ -45,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"; @@ -62,30 +114,35 @@ 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/; - if (defined $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 "(\e[1;32mFound via search\e[0m) "; $foo = "-I$1"; } else { - $foo = ""; + $foo = " "; + undef $v; } $ret = "$foo"; } @@ -104,9 +161,16 @@ sub pkgconfig_get_include_dirs($$$;$) else { $headername =~ s/^\///; - promptstring("path to the directory containing $headername", $key, "/usr/include"); + 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; @@ -120,12 +184,45 @@ 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 pkgconfig_check_version($$;$) +{ + my ($packagename, $version, $module) = @_; + + extend_pkg_path(); + + print "Checking version of package \e[1;32m$packagename\e[0m is >= \e[1;32m$version\e[0m... "; + + my $v = `pkg-config --modversion $packagename 2>/dev/null`; + if (defined $v) + { + chomp($v); + } + if ((defined $v) && ($v ne "")) + { + if (!system "pkg-config --atleast-version $version $packagename") + { + print "\e[1;32mYes (version $v)\e[0m\n"; + return 1; + } + else + { + 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 "\e[1;32mNo (not found)\e[0m\n"; + return 1; +} + sub pkgconfig_get_lib_dirs($$$;$) { my ($packagename, $libname, $defaults, $module) = @_; @@ -133,30 +230,36 @@ 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/; - if (defined $1) + my $find = $1; + chomp($find); + if ((defined $find) && ($find ne "") && ($find ne $packagename)) { + print "(\e[1;32mFound via search\e[0m) "; $foo = "-L$1"; } else { - $foo = ""; + $foo = " "; + undef $v; } $ret = "$foo"; } @@ -176,7 +279,7 @@ sub pkgconfig_get_lib_dirs($$$;$) else { $libname =~ s/^\///; - promptstring("path to the directory containing $libname", $key, "/usr/lib"); + promptstring("path to the directory containing $libname", $key, "/usr/lib",$packagename,"$packagename-libs"); $main::config{$key} = "-L$main::config{$key}" . " $defaults"; $main::config{$key} =~ s/^\s+//g; $ret = $main::config{$key}; @@ -186,13 +289,14 @@ 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; $ret =~ s/^\s+//g; } - return "$ret -DVERSION_$libname=\"$v\""; + $ret =~ s/^\s+//g; + return $ret; } # Translate a $CompileFlags etc line and parse out function calls @@ -215,26 +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`/; + } 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\("(.+?)","(.+?)","(.+?)"\)/) @@ -242,6 +420,15 @@ sub translate_functions($$) my $replace = pkgconfig_get_lib_dirs($1, $2, $3, $module); $line =~ s/pkgconflibs\("(.+?)","(.+?)","(.+?)"\)/$replace/; } + while ($line =~ /pkgconfversion\("(.+?)","(.+?)"\)/) + { + if (pkgconfig_check_version($1, $2, $module) != 1) + { + 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\("(.+?)","(.+?)"\)//; + } while ($line =~ /pkgconflibs\("(.+?)","(.+?)",""\)/) { my $replace = pkgconfig_get_lib_dirs($1, $2, "", $module); @@ -265,7 +452,13 @@ sub translate_functions($$) }; if ($@) { - print "\n\nConfiguration failed. The following error occured:\n\n$@\n"; + 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