87 lines
3.4 KiB
Diff
87 lines
3.4 KiB
Diff
Index: configure/CONFIG_SITE
|
|
===================================================================
|
|
RCS file: /cvs/G/EPICS/base-3.14.12/configure/CONFIG_SITE,v
|
|
retrieving revision 1.5
|
|
retrieving revision 1.6
|
|
diff -c -r1.5 -r1.6
|
|
*** configure/CONFIG_SITE 14 Dec 2011 09:58:10 -0000 1.5
|
|
--- configure/CONFIG_SITE 14 Dec 2011 10:32:00 -0000 1.6
|
|
***************
|
|
*** 165,176 ****
|
|
# NOTE: Set to YES only if you have existing R3.13 ioc applications
|
|
# and extensions to be built with this base
|
|
#
|
|
! COMPAT_313=NO
|
|
|
|
# Installation directory
|
|
# If you don't want to install into $(TOP) dir then
|
|
# define INSTALL_LOCATION here
|
|
#INSTALL_LOCATION=<fullpathname>
|
|
|
|
# Use POSIX thread priority scheduling (YES or NO)
|
|
USE_POSIX_THREAD_PRIORITY_SCHEDULING = NO
|
|
--- 165,177 ----
|
|
# NOTE: Set to YES only if you have existing R3.13 ioc applications
|
|
# and extensions to be built with this base
|
|
#
|
|
! COMPAT_313=YES
|
|
|
|
# Installation directory
|
|
# If you don't want to install into $(TOP) dir then
|
|
# define INSTALL_LOCATION here
|
|
#INSTALL_LOCATION=<fullpathname>
|
|
+ INSTALL_LOCATION=/usr/local/epics/base-3.14.12
|
|
|
|
# Use POSIX thread priority scheduling (YES or NO)
|
|
USE_POSIX_THREAD_PRIORITY_SCHEDULING = NO
|
|
Index: configure/os/CONFIG_SITE.linux-x86.Common
|
|
===================================================================
|
|
RCS file: /cvs/G/EPICS/base-3.14.12/configure/os/CONFIG_SITE.linux-x86.Common,v
|
|
retrieving revision 1.4
|
|
retrieving revision 1.5
|
|
diff -c -r1.4 -r1.5
|
|
*** configure/os/CONFIG_SITE.linux-x86.Common 14 Dec 2011 10:02:01 -0000 1.4
|
|
--- configure/os/CONFIG_SITE.linux-x86.Common 14 Dec 2011 10:32:00 -0000 1.5
|
|
***************
|
|
*** 6,12 ****
|
|
# Site override definitions for linux-x86 host builds
|
|
#-------------------------------------------------------
|
|
|
|
! # JBA test override values
|
|
! #CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040 solaris-sparc
|
|
! #CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040
|
|
! #CROSS_COMPILER_TARGET_ARCHS = RTEMS-mvme2100 RTEMS-pc386 # RTEMS-mvme5500 RTEMS-mvme167
|
|
--- 6,14 ----
|
|
# Site override definitions for linux-x86 host builds
|
|
#-------------------------------------------------------
|
|
|
|
! CROSS_COMPILER_TARGET_ARCHS += T2-ppc604
|
|
! CROSS_COMPILER_TARGET_ARCHS += V67-ppc604
|
|
! CROSS_COMPILER_TARGET_ARCHS += V63-ppc603
|
|
! CROSS_COMPILER_TARGET_ARCHS += embeddedlinux-xscale_be
|
|
! CROSS_COMPILER_TARGET_ARCHS += embeddedlinux-ppc405
|
|
! CROSS_COMPILER_TARGET_ARCHS += embeddedlinux-p2020
|
|
Index: configure/os/CONFIG_SITE.solaris-sparc.Common
|
|
===================================================================
|
|
RCS file: /cvs/G/EPICS/base-3.14.12/configure/os/CONFIG_SITE.solaris-sparc.Common,v
|
|
retrieving revision 1.3
|
|
retrieving revision 1.4
|
|
diff -c -r1.3 -r1.4
|
|
*** configure/os/CONFIG_SITE.solaris-sparc.Common 14 Dec 2011 10:02:01 -0000 1.3
|
|
--- configure/os/CONFIG_SITE.solaris-sparc.Common 14 Dec 2011 10:32:00 -0000 1.4
|
|
***************
|
|
*** 5,10 ****
|
|
# Site specific override definitions for solaris-sparc host builds
|
|
# Only the local epics system manager should modify this file
|
|
|
|
! #INSTALL_LOCATION = /home/phoebus/JBA/testBaseNew
|
|
|
|
#CROSS_COMPILER_TARGET_ARCHS += vxWorks-ppc604 vxWorks-ppc603 vxWorks-68040
|
|
--- 5,10 ----
|
|
# Site specific override definitions for solaris-sparc host builds
|
|
# Only the local epics system manager should modify this file
|
|
|
|
! INSTALL_LOCATION = /afs/psi.ch/group/8431/dirk/solaris/base-3.14.12
|
|
|
|
#CROSS_COMPILER_TARGET_ARCHS += vxWorks-ppc604 vxWorks-ppc603 vxWorks-68040
|