Changeset 25027 for branches/pap/psconfig
- Timestamp:
- Aug 7, 2009, 4:08:25 PM (17 years ago)
- Location:
- branches/pap
- Files:
-
- 7 edited
- 3 copied
-
. (modified) (1 prop)
-
psconfig (modified) (1 prop)
-
psconfig/psbuild (modified) (3 diffs)
-
psconfig/pschecklibs (modified) (2 diffs)
-
psconfig/pscheckperl (modified) (2 diffs)
-
psconfig/tagsets/ipp-2.8.dist (modified) (1 diff)
-
psconfig/tagsets/ipp-2.8.libs (modified) (3 diffs)
-
psconfig/tagsets/ipp-2.9.dist (copied) (copied from trunk/psconfig/tagsets/ipp-2.9.dist )
-
psconfig/tagsets/ipp-2.9.libs (copied) (copied from trunk/psconfig/tagsets/ipp-2.9.libs )
-
psconfig/tagsets/ipp-2.9.perl (copied) (copied from trunk/psconfig/tagsets/ipp-2.9.perl )
Legend:
- Unmodified
- Added
- Removed
-
branches/pap
- Property svn:mergeinfo changed
-
branches/pap/psconfig
- Property svn:mergeinfo deleted
-
branches/pap/psconfig/psbuild
r23790 r25027 153 153 154 154 # set build environment variables 155 ps_setenv (1, "PATH", 156 ps_setenv (1, "CPATH", 157 ps_setenv (1, "ARCH", 155 ps_setenv (1, "PATH", "--path"); 156 ps_setenv (1, "CPATH", "--cpath"); 157 ps_setenv (1, "ARCH", "--arch"); 158 158 ps_setenv (1, "LIBRARY_PATH", "--library_path"); 159 159 ps_setenv (1, "LD_LIBRARY_PATH", "--ld_library_path"); … … 161 161 ps_setenv (1, "ACLOCAL_FLAGS", "--aclocal_flags"); 162 162 ps_setenv (1, "PERL5LIB", "--perl5lib"); 163 ps_setenv (1, "CFITSIO", "--prefix"); 163 164 164 165 exit 0; … … 211 212 ps_setenv (0, "ACLOCAL_FLAGS", "--aclocal_flags"); 212 213 ps_setenv (0, "PERL5LIB", "--perl5lib"); 214 ps_setenv (0, "CFITSIO", "--prefix"); 213 215 214 216 # some versions of libtool use this value: -
branches/pap/psconfig/pschecklibs
r23155 r25027 25 25 if ($ARGV[0] eq "-force") { 26 26 if (@ARGV < 2) { die "-force must be coupled to a library name\n"; } 27 $force{lc($ARGV[1])} = 1; 27 if (lc($ARGV[1]) eq 'build') { 28 $force{'autoconf'} = 1; 29 $force{'automake'} = 1; 30 $force{'libtool'} = 1; 31 $force{'pkg-config'} = 1; 32 } else { 33 $force{lc($ARGV[1])} = 1; 34 } 28 35 shift; shift; next; 29 36 } … … 93 100 # search for, and drop, existing libdir entry in libpath? 94 101 unshift @libpath, $libdir; 102 103 # XXX a temporary hack for libreadline (this failed... needed to modify libreadline/support/shobj-conf 104 # $shlib_libs = $ENV{'SHLIB_LIBS'}; 105 # unless ($shlib_libs =~ m|-lncurses|) { 106 # $shlib_libs .= " -lncurses"; 107 # } 108 # $ENV{'SHLIB_LIBS'} = $shlib_libs; 95 109 96 110 # add the path defined by PATH -
branches/pap/psconfig/pscheckperl
r21932 r25027 57 57 $homedir = `pwd`; chomp $homedir; 58 58 59 # Astro::FITS::CFITSIO requires this to be set correctly... 60 $ENV{'CFITSIO'} = $prefix; 61 59 62 print "psconfig version: $version\n"; 60 63 print "prefix: $prefix\n"; … … 78 81 if ($modver eq "") { $modver = 0; } 79 82 system ("pscheckmods $module $modver"); 80 if ( $? == 0) {83 if (($? == 0) and not defined $force{$module} and not defined $force{'all'}) { 81 84 # print "$module: found\n"; 82 85 next; 83 86 } 84 87 85 print "$module: missing\n"; 88 if (defined $force{$module}) { 89 print "$module: force\n"; 90 } else { 91 print "$module: missing\n"; 92 } 86 93 unless ($build or defined $force{$module} or defined $force{'all'}) { 87 94 $Nmissing ++; -
branches/pap/psconfig/tagsets/ipp-2.8.dist
r23567 r25027 69 69 YYYYY DataStore ipp-2-8 -0 70 70 71 YYYYY ppMops ipp-2-8 -0 72 71 73 YNNNN extsrc/gpcsw ipp-2-8 -0 72 74 -
branches/pap/psconfig/tagsets/ipp-2.8.libs
r22743 r25027 18 18 # make install options 19 19 20 21 # Build tools 22 bin autoconf NONE NONE autoconf-2.63.tar.gz autoconf-2.63 N NONE NONE NONE 23 bin automake NONE NONE automake-1.10.tar.gz automake-1.10 N NONE NONE NONE 24 bin libtool NONE NONE libtool-2.2.6a.tar.gz libtool-2.2.6 N NONE NONE NONE 25 bin pkg-config NONE NONE pkg-config-0.23.tar.gz pkg-config-0.23 N NONE NONE NONE 26 20 27 lib libm NONE NONE NONE NONE N NONE NONE NONE 21 28 lib libX11 NONE NONE NONE NONE N NONE NONE NONE … … 27 34 lib libjpeg NONE jpeg jpegsrc.v6b-p1.tar.gz jpeg-6b N --enable-shared NONE install-lib 28 35 lib libcfitsio NONE NONE cfitsio3100-pap.tar.gz cfitsio3100-pap N --enable-shared shared NONE 29 #lib libmysqlclient NONE mysql mysql-5.0.27.tar.gz mysql-5.0.27 N NONE NONE NONE30 36 lib libmysqlclient NONE mysql mysql-5.0.51a.tar.gz mysql-5.0.51a N NONE NONE NONE 31 37 lib libgsl NONE NONE gsl-1.11.tar.gz gsl-1.11 N NONE NONE NONE 32 38 lib libfftw3f NONE NONE fftw-3.0.1.tar.gz fftw-3.0.1 N --enable-float,--enable-shared,--disable-fortran NONE NONE 33 #lib libfftw3 NONE NONE fftw-3.0.1.tar.gz fftw-3.0.1 N --enable-shared,--disable-fortran NONE NONE34 # paul claims we are not currently using double-point FFTs anywhere35 39 36 bin pkg-config NONE NONE pkg-config-0.22.tar.gz pkg-config-0.22 N NONE NONE NONE37 40 38 41 inc X11/Xatom.h NONE NONE NONE NONE N NONE NONE NONE … … 55 58 inc gsl/gsl_rng.h NONE NONE gsl-1.11.tar.gz gsl-1.11 N NONE NONE NONE 56 59 inc inttypes.h NONE NONE NONE NONE N NONE NONE NONE 57 inc jpeglib.h NONE jpeg jpegsrc.v6b .tar.gzjpeg-6b N --enable-shared NONE install-lib60 inc jpeglib.h NONE jpeg jpegsrc.v6b-p1.tar.gz jpeg-6b N --enable-shared NONE install-lib 58 61 inc limits.h NONE NONE NONE NONE N NONE NONE NONE 59 62 inc malloc.h NONE NONE NONE NONE N NONE NONE NONE
Note:
See TracChangeset
for help on using the changeset viewer.
