X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=make%2Futilities.pm;h=c3909c1e4019d1e1b0cc8e4def3225918d35026c;hb=4bd6bbfebcc830db5a77ac340c4689b025bf4bfd;hp=10d36bbcf9dd545b478198f4687d1d4feadbae9e;hpb=55f4198a3528a2f80bc0723046e9946c6f8445fe;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/make/utilities.pm b/make/utilities.pm index 10d36bbcf..c3909c1e4 100644 --- a/make/utilities.pm +++ b/make/utilities.pm @@ -1,7 +1,23 @@ +# +------------------------------------+ +# | Inspire Internet Relay Chat Daemon | +# +------------------------------------+ +# +# InspIRCd: (C) 2002-2007 InspIRCd Development Team +# See: http://www.inspircd.org/wiki/index.php/Credits +# +# This program is free but copyrighted software; see +# the file COPYING for details. +# +# --------------------------------------------------- + package make::utilities; + +require 5.8.0; + use Exporter 'import'; use POSIX; -@EXPORT = qw(make_rpath pkgconfig_get_include_dirs pkgconfig_get_lib_dirs translate_functions); +use Getopt::Long; +@EXPORT = qw(make_rpath pkgconfig_get_include_dirs pkgconfig_get_lib_dirs pkgconfig_check_version translate_functions promptstring vcheck); # Parse the output of a *_config program, # such as pcre_config, take out the -L @@ -11,9 +27,40 @@ use POSIX; my %already_added = (); -sub make_rpath($) +sub promptstring($$$$$) +{ + my ($prompt, $configitem, $default, $package, $commandlineswitch) = @_; + my $var; + if (!$main::interactive) + { + undef $opt_commandlineswitch; + GetOptions ("$commandlineswitch=s" => \$opt_commandlineswitch); + if (defined $opt_commandlineswitch) + { + print "\033[1;32m$opt_commandlineswitch\033[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"; + } + } + else + { + print "\nPlease enter the $prompt?\n"; + print "[\033[1;32m$default\033[0m] -> "; + chomp($var = ); + } + if ($var eq "") + { + $var = $default; + } + $main::config{$configitem} = $var; +} + +sub make_rpath($;$) { - my ($executable) = @_; + my ($executable, $module) = @_; chomp($data = `$executable`); my $output = ""; while ($data =~ /-L(\S+)/) @@ -21,10 +68,10 @@ sub make_rpath($) $libpath = $1; if (!exists $already_added{$libpath}) { - print "Adding extra library path \033[1;32m$libpath\033[0m ...\n"; + print "Adding extra library path to \033[1;32m$module\033[0m ... \033[1;32m$libpath\033[0m\n"; $already_added{$libpath} = 1; } - $output .= "-Wl,--rpath -Wl,$libpath -L$libpath "; + $output .= "-Wl,--rpath -Wl,$libpath -L$libpath " unless defined $main::opt_disablerpath; $data =~ s/-L(\S+)//; } return $output; @@ -42,25 +89,41 @@ sub extend_pkg_path() } } -sub pkgconfig_get_include_dirs($$$) +sub pkgconfig_get_include_dirs($$$;$) { - my ($packagename, $headername, $defaults) = @_; + my ($packagename, $headername, $defaults, $module) = @_; + + 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"; + return $ret; + } + extend_pkg_path(); - print "Locating include directory for package \033[1;32m$packagename\033[0m ... "; + 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`; - if ((!defined $ret) || ($ret eq "")) + + if ((!defined $v) || ($v eq "")) { $foo = `locate "$headername" | head -n 1`; $foo =~ /(.+)\Q$headername\E/; - if (defined $1) + $find = $1; + chomp($find); + if ((defined $find) && ($find ne "") && ($find ne $packagename)) { + print "(\033[1;32mFound via search\033[0m) "; $foo = "-I$1"; } else { - $foo = ""; + $foo = " "; + undef $v; } $ret = "$foo"; } @@ -69,36 +132,129 @@ sub pkgconfig_get_include_dirs($$$) $ret = "$foo " . $defaults; } chomp($ret); - if (($ret eq " ") || (!defined $ret)) + if ((($ret eq " ") || (!defined $ret)) && ((!defined $v) || ($v eq ""))) { - print "\033[1;32mUsing defaults\033[0m\n"; + my $key = "default_includedir_$packagename"; + if (exists $main::config{$key}) + { + $ret = $main::config{$key}; + } + else + { + $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\""; + $main::config{$key} =~ s/^\s+//g; + $ret = $main::config{$key}; + return $ret; + } } else { - print "\033[1;32m$ret\033[0m\n"; + chomp($v); + my $key = "default_includedir_$packagename"; + $packagename =~ tr/a-z/A-Z/; + $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"; } + $ret =~ s/^\s+//g; return $ret; } -sub pkgconfig_get_lib_dirs($$$) +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... "; + + $v = `pkg-config --modversion $packagename 2>/dev/null`; + if (defined $v) + { + chomp($v); + } + if ((defined $v) && ($v ne "")) + { + if (vcheck($v,$version) == 1) + { + print "\033[1;32mYes (version $v)\033[0m\n"; + return 1; + } + else + { + print "\033[1;32mNo (version $v)\033[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"; + return 1; +} + +sub pkgconfig_get_lib_dirs($$$;$) { - my ($packagename, $libname, $defaults) = @_; + my ($packagename, $libname, $defaults, $module) = @_; + + 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"; + return $ret; + } + extend_pkg_path(); - print "Locating library directory for package \033[1;32m$packagename\033[0m ... "; + print "Locating library 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 --libs $packagename 2>/dev/null`; - if ((!defined $ret) || ($ret eq "")) + + if ((!defined $v) || ($v eq "")) { $foo = `locate "$libname" | head -n 1`; $foo =~ /(.+)\Q$libname\E/; - if (defined $1) + $find = $1; + chomp($find); + if ((defined $find) && ($find ne "") && ($find ne $packagename)) { + print "(\033[1;32mFound via search\033[0m) "; $foo = "-L$1"; } else { - $foo = ""; + $foo = " "; + undef $v; } $ret = "$foo"; } @@ -108,14 +264,33 @@ sub pkgconfig_get_lib_dirs($$$) $ret = "$foo " . $defaults; } chomp($ret); - if (($ret eq " ") || (!defined $ret)) + if ((($ret eq " ") || (!defined $ret)) && ((!defined $v) || ($v eq ""))) { - print "\033[1;32mUsing defaults\033[0m\n"; + my $key = "default_libdir_$packagename"; + if (exists $main::config{$key}) + { + $ret = $main::config{$key}; + } + else + { + $libname =~ s/^\///; + 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}; + return $ret; + } } else { - print "\033[1;32m$ret\033[0m\n"; + chomp($v); + print "\033[1;32m$ret\033[0m (version $v)\n"; + my $key = "default_libdir_$packagename"; + $main::config{$key} = $ret; + $main::config{$key} =~ s/^\s+//g; + $ret =~ s/^\s+//g; } + $ret =~ s/^\s+//g; return $ret; } @@ -123,9 +298,12 @@ sub pkgconfig_get_lib_dirs($$$) # to functions within these modules at configure time. sub translate_functions($$) { + my ($line,$module) = @_; + eval { - my ($line,$module) = @_; + $module =~ /modules*\/(.+?)$/; + $module = $1; # This is only a cursory check, just designed to catch casual accidental use of backticks. # There are pleanty of ways around it, but its not supposed to be for security, just checking @@ -138,19 +316,23 @@ sub translate_functions($$) } while ($line =~ /exec\("(.+?)"\)/) { - print "Executing program ... \033[1;32m$1\033[0m\n"; + print "Executing program for module \033[1;32m$module\033[0m ... \033[1;32m$1\033[0m\n"; my $replace = `$1`; chomp($replace); $line =~ s/exec\("(.+?)"\)/$replace/; } + while ($line =~ /execruntime\("(.+?)"\)/) + { + $line =~ s/execruntime\("(.+?)"\)/`\1`/; + } while ($line =~ /eval\("(.+?)"\)/) { - print "Evaluating perl code ... "; + print "Evaluating perl code for module \033[1;32m$module\033[0m ... "; my $tmpfile; do { $tmpfile = tmpnam(); - } until sysopen(TF, $tmpfile, O_RDWR|O_CREAT|O_EXCL, 0700); + } 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 TF $1; close TF; @@ -160,36 +342,51 @@ sub translate_functions($$) } while ($line =~ /pkgconflibs\("(.+?)","(.+?)","(.+?)"\)/) { - my $replace = pkgconfig_get_lib_dirs($1, $2, $3); + 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 \033[1;32m$2\033[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, ""); + my $replace = pkgconfig_get_lib_dirs($1, $2, "", $module); $line =~ s/pkgconflibs\("(.+?)","(.+?)",""\)/$replace/; } while ($line =~ /pkgconfincludes\("(.+?)","(.+?)",""\)/) { - my $replace = pkgconfig_get_include_dirs($1, $2, ""); + my $replace = pkgconfig_get_include_dirs($1, $2, "", $module); $line =~ s/pkgconfincludes\("(.+?)","(.+?)",""\)/$replace/; } while ($line =~ /pkgconfincludes\("(.+?)","(.+?)","(.+?)"\)/) { - my $replace = pkgconfig_get_include_dirs($1, $2, $3); + my $replace = pkgconfig_get_include_dirs($1, $2, $3, $module); $line =~ s/pkgconfincludes\("(.+?)","(.+?)","(.+?)"\)/$replace/; } while ($line =~ /rpath\("(.+?)"\)/) { - my $replace = make_rpath($1); + my $replace = make_rpath($1,$module); + $replace = "" if ($^O =~ /darwin/i); $line =~ s/rpath\("(.+?)"\)/$replace/; } - return $line; }; if ($@) { - print "\n\nConfiguration failed. The following error occured:\n\n$@\n"; + $err = $@; + $err =~ s/at .+? line \d+.*//g; + print "\n\nConfiguration failed. The following error occured:\n\n$err\n"; exit; } + else + { + return $line; + } } 1;