X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=make%2Futilities.pm;h=c00a541b337e33755b19a8ccb18af9cd74a9a1ff;hb=ed7912c90fad5ba4a83946af9bf46a9bd3656f23;hp=2e0f7e67cc631b409263001ac763e372d371d182;hpb=614618a21fdece732b1a5f8a8c24fb958ccf6b42;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/make/utilities.pm b/make/utilities.pm index 2e0f7e67c..c00a541b3 100644 --- a/make/utilities.pm +++ b/make/utilities.pm @@ -1,7 +1,17 @@ +# +# Copyright 2002-2007 The ChatSpike Development Team +# +# +# +# Licensed under GPL, please see the COPYING file +# for more information +# + package make::utilities; use Exporter 'import'; use POSIX; -@EXPORT = qw(make_rpath pkgconfig_get_include_dirs pkgconfig_get_lib_dirs translate_functions promptstring); +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,12 +21,30 @@ use POSIX; my %already_added = (); -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) + { + 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; @@ -59,12 +87,12 @@ sub pkgconfig_get_include_dirs($$$;$) { 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... "; - print "\033[1;32m$ret\033[0m (cached)\n"; - my $key = "default_includedir_$packagename"; $ret = $main::config{$key}; + print "\033[1;32m$ret\033[0m (cached)\n"; return $ret; } @@ -79,13 +107,17 @@ sub pkgconfig_get_include_dirs($$$;$) { $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"; } @@ -104,8 +136,10 @@ sub pkgconfig_get_include_dirs($$$;$) else { $headername =~ s/^\///; - promptstring("path to the directory containing $headername", $key, "/usr/include"); - $main::config{$key} = "-I$main::config{$key}" . " $defaults -DVERSION_$libname=\"$v\""; + 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; } @@ -114,22 +148,82 @@ sub pkgconfig_get_include_dirs($$$;$) { chomp($v); my $key = "default_includedir_$packagename"; - $main::config{$key} = "$ret -DVERSION_$libname=\"$v\""; + $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 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, $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... "; - print "\033[1;32m$ret\033[0m (cached)\n"; - my $key = "default_libdir_$packagename"; $ret = $main::config{$key}; + print "\033[1;32m$ret\033[0m (cached)\n"; return $ret; } @@ -144,13 +238,17 @@ sub pkgconfig_get_lib_dirs($$$;$) { $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"; } @@ -170,9 +268,9 @@ sub pkgconfig_get_lib_dirs($$$;$) else { $libname =~ s/^\///; - promptstring("path to the directory containing $libname", $key, "/usr/lib"); - chomp($v); - $main::config{$key} = "-L$main::config{$key}" . " $defaults -DVERSION_$libname=\"$v\""; + 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; } @@ -182,9 +280,12 @@ sub pkgconfig_get_lib_dirs($$$;$) chomp($v); print "\033[1;32m$ret\033[0m (version $v)\n"; my $key = "default_libdir_$packagename"; - $main::config{$key} = "$ret -DVERSION_$libname=\"$v\""; + $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 @@ -234,6 +335,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 \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, "", $module); @@ -252,12 +362,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"; + $err = $@; + $err =~ s/at .+? line \d+.*//g; + print "\n\nConfiguration failed. The following error occured:\n\n$err\n"; exit; } else