Ticket #1639: pr1639.diff

File pr1639.diff, 2.5 KB (added by Joel Sherrill, on Jul 28, 2010 at 1:31:23 PM)

First attempt at autoconf code to check for pax/tar

  • testsuites/libtests/Makefile.am

    RCS file: /usr1/CVS/rtems/testsuites/libtests/Makefile.am,v
    retrieving revision 1.45
    diff -u -r1.45 Makefile.am
     
    1414    termios06 termios07 termios08 \
    1515    rtems++ tztest block01 block02 block03 block04 block05 block06 block07 \
    1616    block08 block09 block10 stringto01 \
    17     tar01 tar02 tar03
     17    tar03
     18
     19if HAS_TAR
     20SUBDIRS += tar01 tar02
     21endif
    1822
    1923include $(top_srcdir)/../automake/subdirs.am
    2024include $(top_srcdir)/../automake/local.am
  • testsuites/libtests/configure.ac

    RCS file: /usr1/CVS/rtems/testsuites/libtests/configure.ac,v
    retrieving revision 1.52
    diff -u -r1.52 configure.ac
     
    1212AM_INIT_AUTOMAKE([no-define foreign 1.10])
    1313AM_MAINTAINER_MODE
    1414
     15### check for pax or tar and set the arguments accordingly for creating
     16AC_PATH_PROG(TAR,pax)
     17echo ${TAR}
     18if test ${TAR} != no ; then
     19  RTEMS_TAR_CREATE="${TAR} -w -f"
     20else
     21  AC_PATH_PROG(TAR,tar)
     22  if test ${TAR} != no ; then
     23    RTEMS_TAR_CREATE="${TAR} -c -f"
     24  else
     25    AC_MSG_ERROR([no tar command found on host])
     26  fi
     27fi
     28AM_CONDITIONAL([HAS_TAR],[test X"$RTEMS_TAR_CREATE" != "X"])
     29AC_SUBST(RTEMS_TAR_CREATE)
     30### end of pax/tar check
     31
    1532RTEMS_ENABLE_CXX
    1633
    1734RTEMS_ENV_RTEMSBSP
     
    2845RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
    2946RTEMS_CHECK_CXX(RTEMS_BSP)
    3047
    31 
    3248AM_CONDITIONAL(HAS_CXX,test "$rtems_cv_HAS_CPLUSPLUS" = "yes")
    3349
    3450# Explicitly list all Makefiles here
  • testsuites/libtests/tar01/Makefile.am

    RCS file: /usr1/CVS/rtems/testsuites/libtests/tar01/Makefile.am,v
    retrieving revision 1.1
    diff -u -r1.1 Makefile.am
     
    4646        touch stamp-filesystem
    4747
    4848initial_filesystem.tar: stamp-filesystem
    49         cd initial_fs ; pax -w -f ../initial_filesystem.tar home symlink
     49        cd initial_fs ; @RTEMS_TAR_CREATE@ ../initial_filesystem.tar \
     50            home symlink
    5051
    5152CLEANFILES = initial_fs initial_filesystem* stamp-filesystem \
    5253            stamp-initial-fs-source