Changeset 33995

Timestamp:

Jun 10, 2012, 6:12:36 AM (14 years ago)

Author:

eugene

Message:

temp mods to get Ubuntu 12.04 working

Location:

branches/eam_branches/ipp-20120601

Files:

• Ohana/configure.tcsh (modified) (1 diff)
• psconfig/pscheckmods (modified) (4 diffs)
• psconfig/tagsets/ipp-3.0.perl (modified) (2 diffs)

branches/eam_branches/ipp-20120601/Ohana/configure.tcsh

@@ -210 +210 @@
 endif  
 if ($profile) set LDFLAGS = "$LDFLAGS -Wl,--start-group -Wl,-Bstatic -Wl,-Bdynamic"
+
+# XXX EAM : temporary while working on Ubuntu 12.04 / gcc 4.6.3
+# XXX --no-as-needed fixes problems introduced by Ubuntu 11.10 use of --as-needed
+# but this may be hiding an underlying link problem
+set LDFLAGS = "$LDFLAGS -Wl,--no-as-needed"
 
 set syslibpath = "/lib /usr/lib /usr/X11R6/lib /usr/local/lib"

branches/eam_branches/ipp-20120601/psconfig/pscheckmods

@@ -9 +9 @@
 
 if ($VERBOSE) { print STDERR "checking in @INC\n"; }
+
+## XXX EAM $realfilename = "ISO8601.pm";
+## XXX EAM $result = do $realfilename;
+## XXX EAM print "result: $result\n";
+## XXX EAM print "$@\n";
+## XXX EAM exit 2;
 
 # &detailed_require ($ARGV[0]);
@@ -34 +40 @@
     $filename =~ s|::|/|g;
     $filename = "$filename.pm";
-    print "$filename\n";
+    # print "$filename\n";
     if (exists $INC{$filename}) {
         return 1 if $INC{$filename};
@@ -43 +49 @@
       foreach $prefix (@INC) {
           $realfilename = "$prefix/$filename";
-          print "$realfilename\n";
+          # print "real: $realfilename\n";
           if (-f $realfilename) {
               $INC{$filename} = $realfilename;
+              # print "calling 'do' on $realfilename\n";
               $result = do $realfilename;
+              # print "result: $result\n";
+              # exit 4;
               last ITER;
           }
@@ -52 +61 @@
       die "Can't find $filename in \@INC";
     }
+    # print "here 1\n";
     if ($@) {
+        # print "here 2\n";
+        # print "$@";
         $INC{$filename} = undef;
+        # print "here 2a\n";
+        exit 2;
         die $@;
     } elsif (!$result) {
+        # print "here 3\n";
+        # print "no result\n";
+        exit 2;
         delete $INC{$filename};
         die "$filename did not return true value";
     } else {
+        # print "here 4\n";
+        # print "done with detailed_require\n";
+        exit 2;
         return $result;
     }

branches/eam_branches/ipp-20120601/psconfig/tagsets/ipp-3.0.perl

@@ -42 +42 @@
   31    Parse::RecDescent              Parse-RecDescent-1.94.tar.gz             1.94           NONE      NONE
   32    Class::Accessor                Class-Accessor-0.30.tar.gz               0.19           NONE      NONE
-  33    DateTime::Format::ISO8601      DateTime-Format-ISO8601-0.06.tar.gz      0.06           NONE      NONE
+# XXX EAM : comment this out for now while working on Ubuntu 12.04 / perl 5.14
+#  33    DateTime::Format::ISO8601      DateTime-Format-ISO8601-0.06.tar.gz      0.06           NONE      NONE
   34    CGI                            CGI.pm-3.25.tar.gz                       3              NONE      NONE
   35    Test::Cmd                      Test-Cmd-1.05.tar.gz                     1.05           NONE      NONE
@@ -81 +82 @@
   70    Config::YAML                   Config-YAML-1.42.tar.gz                  0              NONE      NONE
 # 72    File::ExtAttr                  File-ExtAttr-1.07.tar.gz                 0              NONE      NONE
-  73    DBI                            DBI-1.601.tar.gz                         0              NONE      NONE
+# XXX EAM : comment this out for now while working on Ubuntu 12.04 / perl 5.14
+#  73    DBI                            DBI-1.601.tar.gz                         0              NONE      NONE
   71    DBD::mysql                     DBD-mysql-4.006.tar.gz                   0              NONE      NONE
 # 74    Net::Server::Daemonize         Net-Server-0.97.tar.gz                   0.05           NONE      NONE