Changeset 34022

Timestamp:

Jun 17, 2012, 5:56:15 AM (14 years ago)

Author:

eugene

Message:

add -no-as-needed to LDFLAGS based on gcc

Location:

branches/eam_branches/ipp-20120601/psconfig

Files:

• pscheckmods (modified) (5 diffs)
• psconfig.csh.in (modified) (2 diffs)
• tagsets/ipp-3.0.perl (modified) (1 diff)

branches/eam_branches/ipp-20120601/psconfig/pscheckmods

@@ -1 +1 @@
 #!/usr/bin/env perl
 
+$DEBUG = 1;
 $VERBOSE = 0;
 if (@ARGV > 2 && $ARGV[0] eq "-v") {
@@ -16 +17 @@
 ## XXX EAM exit 2;
 
-# &detailed_require ($ARGV[0]);
+&detailed_require ($ARGV[0]);
 
 $x = eval "require $ARGV[0]; 1";
@@ -40 +41 @@
     $filename =~ s|::|/|g;
     $filename = "$filename.pm";
-    # print "$filename\n";
+    print "\ntesting : $filename\n" if $DEBUG;
     if (exists $INC{$filename}) {
         return 1 if $INC{$filename};
@@ -49 +50 @@
       foreach $prefix (@INC) {
           $realfilename = "$prefix/$filename";
-          # print "real: $realfilename\n";
+          print "real: $realfilename\n" if $DEBUG;
           if (-f $realfilename) {
               $INC{$filename} = $realfilename;
-              # print "calling 'do' on $realfilename\n";
+              print "calling 'do' on $realfilename\n" if $DEBUG;
               $result = do $realfilename;
-              # print "result: $result\n";
-              # exit 4;
+              print "result: $result\n" if $DEBUG;
               last ITER;
           }
@@ -61 +61 @@
       die "Can't find $filename in \@INC";
     }
-    # print "here 1\n";
     if ($@) {
-        # print "here 2\n";
-        # print "$@";
+        print "$@" if $DEBUG;
         $INC{$filename} = undef;
-        # print "here 2a\n";
-        exit 2;
         die $@;
     } elsif (!$result) {
-        # print "here 3\n";
-        # print "no result\n";
-        exit 2;
+        print "no result\n" if $DEBUG;
         delete $INC{$filename};
         die "$filename did not return true value";
     } else {
-        # print "here 4\n";
-        # print "done with detailed_require\n";
-        exit 2;
+        print "done with detailed_require\n" if $DEBUG;
         return $result;
     }

branches/eam_branches/ipp-20120601/psconfig/psconfig.csh.in

@@ -125 +125 @@
 if ($?PERL5LIB == 0) setenv PERL5LIB
 if ($?MANPATH == 0) setenv MANPATH
+if ($?LDFLAGS == 0) setenv LDFLAGS
 
 # identify system architecture
@@ -318 +319 @@
  case linux:
  case linrh:
+   gcc --version | grep 4.6.3 | grep Ubuntu >& /dev/null
+   if ($status == 0) then
+    set xtraflags = "-Wl,--no-as-needed"
+    echo $LDFLAGS | grep -- $xtraflags >& /dev/null
+    if ($status) then
+      setenv LDFLAGS "$LDFLAGS $xtraflags"
+    endif
+   endif  
    breaksw;
 

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

@@ -43 +43 @@
   32    Class::Accessor                Class-Accessor-0.30.tar.gz               0.19           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
+  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