diff options
| author | kitty <kitty@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-07-26 04:59:28 +0000 |
|---|---|---|
| committer | kitty <kitty@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-07-26 04:59:28 +0000 |
| commit | 7c295f2a35e7ab4ba6c34414e151c3679223f15e (patch) | |
| tree | 351d49ba9de94c8f45ca1f9bdad4dcd3ae6b8169 | |
| parent | ca9be7dd5feab556bfeb6687c0a937025228c0a3 (diff) | |
| download | ATCD-7c295f2a35e7ab4ba6c34414e151c3679223f15e.tar.gz | |
ChangeLogTag: Wed Jul 25 23:49:43 2001 Krishnakumar B <kitty@cs.wustl.edu>
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 10 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 10 | ||||
| -rw-r--r-- | include/makeinclude/platform_tru64_g++.GNU | 24 |
4 files changed, 50 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 4de764e7cb2..18db2ed14c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Wed Jul 25 23:49:43 2001 Krishnakumar B <kitty@cs.wustl.edu> + + * include/makeinclude/platform_tru64_g++.GNU: + + Fixed some missing defines in the Makefile for DEC Unix versions + 4.0D, 4.0E. We don't support or suggest this combination. Hence + the oversight in missing the needed defines. + + Thanks to Martin Krumpolec <krumpo@pobox.sk> for reporting this. + Wed Jul 25 23:49:00 2001 Craig Rodrigues <crodrigu@bbn.com> * include/makeinclude/wrapper_macros.GNU: diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 4de764e7cb2..18db2ed14c8 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,13 @@ +Wed Jul 25 23:49:43 2001 Krishnakumar B <kitty@cs.wustl.edu> + + * include/makeinclude/platform_tru64_g++.GNU: + + Fixed some missing defines in the Makefile for DEC Unix versions + 4.0D, 4.0E. We don't support or suggest this combination. Hence + the oversight in missing the needed defines. + + Thanks to Martin Krumpolec <krumpo@pobox.sk> for reporting this. + Wed Jul 25 23:49:00 2001 Craig Rodrigues <crodrigu@bbn.com> * include/makeinclude/wrapper_macros.GNU: diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 4de764e7cb2..18db2ed14c8 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,13 @@ +Wed Jul 25 23:49:43 2001 Krishnakumar B <kitty@cs.wustl.edu> + + * include/makeinclude/platform_tru64_g++.GNU: + + Fixed some missing defines in the Makefile for DEC Unix versions + 4.0D, 4.0E. We don't support or suggest this combination. Hence + the oversight in missing the needed defines. + + Thanks to Martin Krumpolec <krumpo@pobox.sk> for reporting this. + Wed Jul 25 23:49:00 2001 Craig Rodrigues <crodrigu@bbn.com> * include/makeinclude/wrapper_macros.GNU: diff --git a/include/makeinclude/platform_tru64_g++.GNU b/include/makeinclude/platform_tru64_g++.GNU index ef5fea64d5c..939f4063470 100644 --- a/include/makeinclude/platform_tru64_g++.GNU +++ b/include/makeinclude/platform_tru64_g++.GNU @@ -3,6 +3,10 @@ # This platform macros file is intended to work with # Digital UNIX using the GNU compiler. +# Of late, this platform and compiler combination hasn't been tested. In +# fact neither compilation nor testing has been done for almost a year. +# So it's better to avoid this combination, if possible. + ifndef ACE_DU_VERSION ACE_DU_VERSION := $(shell uname -r) endif # ACE_DU_VERSION @@ -14,17 +18,29 @@ else # ! 3.x ifeq (4.,$(findstring 4.,$(ACE_DU_VERSION))) include $(ACE_ROOT)/include/makeinclude/platform_osf1_4.0_g++.GNU - ifeq (4.0F,$(findstring 4.0F,$(shell /usr/sbin/sizer -v))) + ifndef ACE_DU_SUBVERSION + ACE_DU_SUBVERSION := $(shell /usr/sbin/sizer -v) + endif # ! ACE_DU_SUBVERSION + + ifeq (4.0F,$(findstring 4.0F,$(ACE_DU_SUBVERSION))) CFLAGS += -DDIGITAL_UNIX=0x40F - else # ! 4.0F + else + ifeq (4.0E,$(findstring 4.0E,$(ACE_DU_SUBVERSION))) + CFLAGS += -DDIGITAL_UNIX=0x40E + else + ifeq (4.0D,$(findstring 4.0D,$(ACE_DU_SUBVERSION))) + CFLAGS += -DDIGITAL_UNIX=0x40D + else CFLAGS += -DDIGITAL_UNIX=0x400 - endif # ! 4.0F + endif + endif + endif else # ! 4.x ifeq (5.,$(findstring 5.,$(ACE_DU_VERSION))) include $(ACE_ROOT)/include/makeinclude/platform_osf1_4.0_g++.GNU CFLAGS += -DDIGITAL_UNIX=0x500 - endif # 5.x + endif # ! 4.x endif # ! 3.x |