IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ticket #627: psmodule-0.9.99-osx_build_fixes.2.patch

File psmodule-0.9.99-osx_build_fixes.2.patch, 4.6 KB (added by jhoblitt, 21 years ago)

patch to fix multiple build issues on osx

  • configure.ac 

    RCS file: /usr/local/cvs/repositories/pan-starrs/datasys/IPP/psModule/configure.ac,v
retrieving revision 1.15
diff -u -r1.15 configure.ac
     
    3636AM_CFLAGS="${AM_CFLAGS=} -Wall -Werror"
    3737AC_SUBST([AM_CFLAGS])
    3838
     39dnl ------------------- PERL options ---------------------
     40  AC_ARG_WITH(perl,
     41    [AS_HELP_STRING(--with-perl=FILE,Specify location of PERL executable.)],
     42    [AC_CHECK_PROG(PERL, $withval, $withval)],
     43    [AC_CHECK_PROG(PERL, perl, `which perl`)])
     44    if test "$PERL" == ""
     45    then
     46      AC_MSG_ERROR([PERL is required.  Use --with-perl to specify its install location.])
     47    fi
     48    AC_SUBST(PERL,$PERL)
     49
    3950SRCPATH='${top_srcdir}/src'
    40 SRCDIRS="astrom camera config detrend imcombine imsubtract objects photom"
    41 SRCINC=`echo "${SRCDIRS=}" | ${SED} "s|\(\\w\+\)|-I\${SRCPATH=}/\1|g"`
    42 SRCSUBLIBS=`echo "${SRCDIRS=}" | ${SED} "s|\(\\w\+\)|\1/libpsmodule\1.la|g"`
    43 AC_SUBST([SRCSUBLIBS],${SRCSUBLIBS=})
     51SRCDIRS="astrom config detrend imcombine imsubtract objects"
     52# escape two escapes at this level so \\ gets passed to the shell and \ to perl
     53SRCINC=`echo "${SRCDIRS=}" | ${PERL} -pe "s|(\w+)|-I\\\\${SRCPATH=}/\1|g"`
     54SRCINC="-I${SRCPATH=} ${SRCINC=}"
     55SRCSUBLIBS=`echo "${SRCDIRS=}" | ${PERL} -pe "s|(\w+)|\1/libpsmodule\1.la|g"`
     56AC_SUBST(SRCSUBLIBS,${SRCSUBLIBS=})
     57AC_SUBST(SRCINC,${SRCINC=})
    4458AC_SUBST([SRCDIRS],${SRCDIRS=})
    45 AC_SUBST([SRCINC],${SRCINC=})
    4659
    4760dnl doxygen -------------------------------------------------------------------
    4861
    … …  
    7891  Makefile
    7992  src/Makefile
    8093  src/astrom/Makefile
    81   src/camera/Makefile
    8294  src/config/Makefile
    8395  src/detrend/Makefile
    8496  src/imcombine/Makefile
    8597  src/imsubtract/Makefile
    8698  src/objects/Makefile
    87   src/photom/Makefile
    8899  test/Makefile
    89100  test/astrom/Makefile
    90   test/camera/Makefile
    91101  test/config/Makefile
    92102  test/detrend/Makefile
    93103  test/imcombine/Makefile
    94104  test/imsubtract/Makefile
    95105  test/objects/Makefile
    96   test/photom/Makefile
    97106  Doxyfile
    98107  psmodule-config
    99108  psmodule.pc

  • src/config/pmConfig.c 

    RCS file: /usr/local/cvs/repositories/pan-starrs/datasys/IPP/psModule/src/config/pmConfig.c,v
retrieving revision 1.4
diff -u -r1.4 pmConfig.c
     
    22 *
    33 *  @author PAP, IfA
    44 *
    5  *  @version $Revision: 1.4 $ $Name: $
     5 *  @version $Revision: 1.4 $ $Name: rel9_0 $
    66 *  @date $Date: 2005/11/15 20:09:03 $
    77 *
    88 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    2727    const char *name,                   // Name of file
    2828    const char *description)            // Description of file
    2929{
    30     int numBadLines = 0;
     30    unsigned int numBadLines = 0;
    3131
    3232    psLogMsg(__func__, PS_LOG_INFO, "Loading %s configuration from file %s\n",
    3333             description, name);
    … …  
    358358            camera = psMemIncrRefCounter(cameraItem->data.md);
    359359        } else if (cameraItem->type == PS_DATA_STRING) {
    360360            psTrace(__func__, 5, "Reading camera configuration for %s...\n", cameraItem->name);
    361             int badLines = 0;  // Number of bad lines in reading camera configuration
     361            unsigned int badLines = 0;  // Number of bad lines in reading camera configuration
    362362            camera = psMetadataConfigParse(NULL, &badLines, cameraItem->data.V, true);
    363363            if (badLines > 0) {
    364364                psLogMsg(__func__, PS_LOG_WARN, "%d bad lines encountered while reading camera"

  • src/objects/pmObjects.h 

    RCS file: /usr/local/cvs/repositories/pan-starrs/datasys/IPP/psModule/src/objects/pmObjects.h,v
retrieving revision 1.2
diff -u -r1.2 pmObjects.h
     
    99 *
    1010 *  @author GLG, MHPCC
    1111 *
    12  *  @version $Revision: 1.2 $ $Name: $
     12 *  @version $Revision: 1.2 $ $Name: rel8_0 $
    1313 *  @date $Date: 2005/10/10 19:53:40 $
    1414 *
    1515 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    3535 * outside of the PSPHOT code.  Perhaps we can set up a registered set of mask
    3636 * values with specific meanings that other functions can add to or define?
    3737 */
    38 enum {
     38typedef enum {
    3939    PSPHOT_MASK_CLEAR     = 0x00,
    4040    PSPHOT_MASK_INVALID   = 0x01,
    4141    PSPHOT_MASK_SATURATED = 0x02,