X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=make%2Futilities.pm;h=5ad6def210522b2c9a375b343b75353da26008d8;hb=2cc6856e8709c9a5c339ab4af1c0d0b9a01ed917;hp=2227200585308233381c81a8918111f132978757;hpb=1403bd4c85009000c3bf64acf8b7dec5cc154c70;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/make/utilities.pm b/make/utilities.pm index 222720058..5ad6def21 100644 --- a/make/utilities.pm +++ b/make/utilities.pm @@ -1,14 +1,33 @@ +# +------------------------------------+ +# | 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 strict; +use warnings FATAL => qw(all); + use Exporter 'import'; use POSIX; use Getopt::Long; -@EXPORT = qw(make_rpath pkgconfig_get_include_dirs pkgconfig_get_lib_dirs translate_functions promptstring); +use Fcntl; +our @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 # directive and return an rpath for it. -# \033[1;32msrc/Makefile\033[0m +# \e[1;32msrc/Makefile\e[0m my %already_added = (); @@ -18,21 +37,22 @@ sub promptstring($$$$$) my $var; if (!$main::interactive) { - undef $opt_commandlineswitch; - GetOptions ("$commandlineswitch" => \$opt_commandlineswitch); + 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 $commandlineswitch=\"/path/to/file\""; + 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 "") @@ -45,17 +65,17 @@ sub promptstring($$$$$) sub make_rpath($;$) { my ($executable, $module) = @_; - chomp($data = `$executable`); + 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 extra 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 " unless defined $main::opt_disablerpath; $data =~ s/-L(\S+)//; } return $output; @@ -80,30 +100,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... "; + print "Locating include 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 --cflags $packagename 2>/dev/null`; + 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) + my $find = $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"; } @@ -138,12 +163,68 @@ 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 (my $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 \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 (vcheck($v,$version) == 1) + { + 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) = @_; @@ -151,30 +232,35 @@ 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`; $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"; } @@ -204,13 +290,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 @@ -235,20 +322,25 @@ sub translate_functions($$) } 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(); } 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`; @@ -260,6 +352,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); @@ -278,12 +379,15 @@ sub translate_functions($$) while ($line =~ /rpath\("(.+?)"\)/) { my $replace = make_rpath($1,$module); + $replace = "" if ($^O =~ /darwin/i); $line =~ s/rpath\("(.+?)"\)/$replace/; } }; 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"; exit; } else