revrting my accident only keeping rubygem updates and ruby libs

This partially reverts commit -r 16100

svn path=/nixpkgs/trunk/; revision=16107

1 files changed, 0 insertions, 13 deletions

diff --git a/pkgs/build-support/buildenv/builder.pl b/pkgs/build-support/buildenv/builder.pl
index 35a75be053e5f..2da4311b38871 100755
--- a/pkgs/build-support/buildenv/builder.pl
+++ b/pkgs/build-support/buildenv/builder.pl
@@ -21,9 +21,7 @@ sub isInPathsToLink {
     my $path = shift;
     $path = "/" if $path eq "";
     foreach my $elem (@pathsToLink) {
-        print "isInPathsToLink elem, path $elem , $path\n";
         return 1 if substr($path, 0, length($elem)) eq $elem;
-        print "no\n";
     }
     return 0;
 }
@@ -49,14 +47,12 @@ sub createLinks {
     my $ignoreCollisions = shift;
 
     my @srcFiles = glob("$srcDir/*");
-    print "in createLinks $relName, $srcDir, $dstDir, $ignoreCollisions, @srcFiles\n";
 
     foreach my $srcFile (@srcFiles) {
         my $baseName = $srcFile;
         $baseName =~ s/^.*\///g; # strip directory
         my $dstFile = "$dstDir/$baseName";
         my $relName2 = "$relName/$baseName";
-        print "foreach source file $srcFile ...\n";
 
         # Urgh, hacky...
 	if ($srcFile =~ /\/propagated-build-inputs$/ ||
@@ -65,15 +61,12 @@ sub createLinks {
             $srcFile =~ /\/info\/dir$/ ||
             $srcFile =~ /\/log$/)
         {
-          print "do nothing\n";
             # Do nothing.
 	}
 
         elsif (-d $srcFile) {
 
-          print "-d !\n";
             if (!isInPathsToLink($relName2)) {
-                print "not isInPathsToLink, recurse\n";
                 # This path is not in the list of paths to link, but
                 # some of its children may be.
                 createLinks($relName2, $srcFile, $dstFile, $ignoreCollisions);
@@ -83,13 +76,11 @@ sub createLinks {
             lstat $dstFile;
 
             if (-d _) {
-                print "-d _\n";
                 createLinks($relName2, $srcFile, $dstFile, $ignoreCollisions);
             }
 
             elsif (-l _) {
                 my $target = readlink $dstFile or die;
-                print "-l $target\n";
                 if (!-d $target) {
                     die "collission between directory `$srcFile' and non-directory `$target'";
                 }
@@ -100,7 +91,6 @@ sub createLinks {
             }
 
             else {
-                print "symLinkMkdir \n";
                 symLinkMkdir $srcFile, $dstFile;
             }
         }
@@ -113,9 +103,7 @@ sub createLinks {
         }
 
         else {
-            print "next unless relName2 $relName2 \n";
             next unless isInPathsToLink($relName2);
-            print "passed \n";
             symLinkMkdir $srcFile, $dstFile;
         }
     }
@@ -129,7 +117,6 @@ sub addPkg;
 sub addPkg {
     my $pkgDir = shift;
     my $ignoreCollisions = shift;
-    print "adding $pkgDir\n";
 
     return if (defined $done{$pkgDir});
     $done{$pkgDir} = 1;