[Fedora-directory-commits] adminutil nscore.mk,1.1.1.1,1.2
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17001
Modified Files:
nscore.mk
Log Message:
[Bug 172166] Admin Util build (IPF)
set an appropriate macro CPU_ia64 to reflect the cpu type
Index: nscore.mk
===================================================================
RCS file: /cvs/dirsec/adminutil/nscore.mk,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- nscore.mk 20 Jul 2005 22:51:31 -0000 1.1.1.1
+++ nscore.mk 1 Feb 2006 22:47:51 -0000 1.2
@@ -51,7 +51,12 @@
endif
# HP-UX
ifeq ($(ARCH), HPUX)
- CFLAGS += -DCPU_hppa -DOS_hpux
+ HPUX_ARCH := $(shell uname -m)
+ ifeq ($(HPUX_ARCH), ia64)
+ CFLAGS += -DCPU_ia64 -DOS_hpux
+ else
+ CFLAGS += -DCPU_hppa -DOS_hpux
+ endif
CFLAGS += -D_NO_THREADS_
endif
# AIX
18 years, 2 months
- 1
- 0
[Fedora-directory-commits] setuputil nsconfig.mk, 1.5, 1.6 nscore.mk, 1.1.1.1, 1.2
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/setuputil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16971
Modified Files:
nsconfig.mk nscore.mk
Log Message:
[175900] SetupUtil build (IPF)
1) set an appropriate macro CPU_ia64 to reflect the cpu type
2) set -AA to support the standard C++ runtime
Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/setuputil/nsconfig.mk,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nsconfig.mk 28 Jan 2006 02:33:14 -0000 1.5
+++ nsconfig.mk 1 Feb 2006 22:46:18 -0000 1.6
@@ -232,19 +232,21 @@
CC=cc -Ae +ESlit
CXX=aCC
ifeq ($(NSOS_RELEASE), B.11.23)
+ ARCH_CFLAGS=-AA
ifeq ($(USE_64), 1)
BIT_SWITCH=+DD64
else
BIT_SWITCH=+DD32
endif
else # 11.11 or earlier
+ ARCH_CFLAGS=
ifeq ($(USE_64), 1)
BIT_SWITCH=+DA2.0W +DS2.0
else
BIT_SWITCH=+DAportable +DS1.1
endif
endif # B.11.23
-ARCH_CFLAGS=$(BIT_SWITCH) -D_HPUX_SOURCE -D_POSIX_C_SOURCE=199506L -D__STDC_EXT__ +z -DHPUX11
+ARCH_CFLAGS+=$(BIT_SWITCH) -D_HPUX_SOURCE -D_POSIX_C_SOURCE=199506L -D__STDC_EXT__ +z -DHPUX11
EXTRA_LIBS= -ldld -lm -lpthread
else
CC=cc
Index: nscore.mk
===================================================================
RCS file: /cvs/dirsec/setuputil/nscore.mk,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- nscore.mk 29 Jul 2005 22:16:18 -0000 1.1.1.1
+++ nscore.mk 1 Feb 2006 22:46:18 -0000 1.2
@@ -51,7 +51,12 @@
endif
# HP-UX
ifeq ($(ARCH), HPUX)
- CFLAGS += -DCPU_hppa -DOS_hpux
+ HPUX_ARCH := $(shell uname -m)
+ ifeq ($(HPUX_ARCH), ia64)
+ CFLAGS += -DCPU_ia64 -DOS_hpux
+ else
+ CFLAGS += -DCPU_hppa -DOS_hpux
+ endif
CFLAGS += -D_NO_THREADS_
endif
# AIX
18 years, 2 months
- 1
- 0