Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-01 11:27:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Various makefile cleanups. On SCO OpenServer, the value of OS_ARCH

Browse Source 
is now 'SCOOS' instead of 'SCO_SV'.  Also, we just use the cpp macro 'SCO'
and deleted the macro 'SCO_SV'.
In pr/src/md/unix/Makefile, we do not assemble the ultrasparc assembly
file if we are compiling with gcc.
This commit is contained in:
wtc 1998-04-30 19:36:53 +00:00
parent 40bc934f3b
commit 5a5cb58738
15 changed files with 54 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nsprpub/config/SCOOS.mk
View File

@ -17,6 +17,8 @@
#
# Config stuff for SCO OpenServer for x86.
# SCO OpenServer 5, based on SVR3.2, is intended for small to
# medium customers.
#
include $(MOD_DEPTH)/config/UNIX.mk
@ -28,11 +30,10 @@ RANLIB = /bin/true
DEFINES += -D_PR_LOCAL_THREADS_ONLY
#
# -DSCO_PM - Policy Manager AKA: SCO Licensing
# -DSCO - Changes to Netscape source (consistent with AIX, LINUX, etc..)
# -Dsco - Needed for /usr/include/X11/*
#
OS_CFLAGS = -DSCO_SV -DSYSV -D_SVID3 -DHAVE_STRERROR -D_PR_NEED_H_ERRNO -DSCO_PM -DSCO -Dsco
OS_CFLAGS = -DSYSV -D_SVID3 -DHAVE_STRERROR -D_PR_NEED_H_ERRNO -DSCO -Dsco
#OS_LIBS = -lpmapi -lsocket -lc
MKSHLIB = $(LD) $(DSO_LDOPTS)

18
nsprpub/config/SINIX.mk
View File

@ -16,7 +16,7 @@
#
#
# Config stuff for SNI SINIX-N (aka ReliantUNIX)
# Config stuff for SNI SINIX (aka ReliantUNIX)
#
include $(MOD_DEPTH)/config/UNIX.mk
@ -24,7 +24,7 @@ include $(MOD_DEPTH)/config/UNIX.mk
# use gcc -tf-
NS_USE_GCC = 1
ifdef NS_USE_GCC
ifeq ($(NS_USE_GCC),1)
## gcc-2.7.2 homebrewn
CC = gcc
COMPILER_TAG = _gcc
@ -36,8 +36,8 @@ ifdef BUILD_OPT
OPTIMIZER = -O
#OPTIMIZER = -O6
endif
MKSHLIB = $(LD) -G -h $(@:$(OBJDIR)/%.so=%.so)
DSO_LDOPTS = -G -Xlinker -Blargedynsym
MKSHLIB = $(LD) -G -z defs -h $(@:$(OBJDIR)/%.so=%.so)
#DSO_LDOPTS = -G -Xlinker -Blargedynsym
else
## native compiler (CDS++ 1.0)
CC = /usr/bin/cc
@ -49,11 +49,11 @@ ifdef BUILD_OPT
#OPTIMIZER = -Olimit 4000
OPTIMIZER = -O -F Olimit,4000
endif
MKSHLIB = $(CC) -G -h $(@:$(OBJDIR)/%.so=%.so)
DSO_LDOPTS = -G -W l,-Blargedynsym
MKSHLIB = $(LD) -G -z defs -h $(@:$(OBJDIR)/%.so=%.so)
#DSO_LDOPTS = -G -W l,-Blargedynsym
endif
ODD_CFLAGS += -DSVR4 -DSNI -DRELIANTUNIX -D_SVID_GETTOD
ODD_CFLAGS += -DSVR4 -DSNI -DRELIANTUNIX -Dsinix -D_SVID_GETTOD
CPU_ARCH = mips
@ -64,11 +64,9 @@ NOMD_OS_CFLAGS = $(ODD_CFLAGS)
# we do not have -MDupdate ...
OS_CFLAGS = $(NOMD_OS_CFLAGS)
OS_LIBS = -lsocket -lnsl -lresolv -lgen -ldl -lc $(UCBLIB)
UCBLIB = -L/usr/ucblib -lucb
OS_LIBS = -lsocket -lnsl -lresolv -ldl -lc
NOSUCHFILE = /no-such-file
HAVE_PURIFY = 0
DEFINES += -D_PR_LOCAL_THREADS_ONLY
OS_CFLAGS = $(ODD_CFLAGS) -DSVR4 -DSNI -Dsinix

6
nsprpub/config/UNIXWARE.mk
View File

@ -17,6 +17,12 @@
#
# Config stuff for SCO UnixWare
# UnixWare is intended for high-end enterprise customers.
# UnixWare 2.1 and 2.1.1 are based on SVR4. (2.1.2 is a maintenance
# release.)
# UnixWare 7 (codename Gemini) is based on what SCO calls SVR5.
# The somewhat odd version number 7 was chosen to suggest that
# UnixWare 2 + OpenServer 5 = UnixWare 7
#
include $(MOD_DEPTH)/config/UNIX.mk

4
nsprpub/lib/ds/Makefile
View File

@ -69,14 +69,14 @@ EXTRA_LIBS = -L$(DIST)/lib -lnspr$(MOD_VERSION)
endif
endif
# On NCR and SCO_SV, we can't link with extra libraries when
# On NCR and SCOOS, we can't link with extra libraries when
# we build a shared library. If we do so, the linker doesn't
# complain, but we would run into weird problems at run-time.
# Therefore on these platforms, we link just the .o files.
ifeq ($(OS_ARCH),NCR)
EXTRA_LIBS =
endif
ifeq ($(OS_ARCH),SCO_SV)
ifeq ($(OS_ARCH),SCOOS)
EXTRA_LIBS =
endif

4
nsprpub/lib/libc/src/Makefile
View File

@ -75,14 +75,14 @@ EXTRA_LIBS = -L$(DIST)/lib -lnspr$(MOD_VERSION)
endif
endif
# On NCR and SCO_SV, we can't link with extra libraries when
# On NCR and SCOOS, we can't link with extra libraries when
# we build a shared library. If we do so, the linker doesn't
# complain, but we would run into weird problems at run-time.
# Therefore on these platforms, we link just the .o files.
ifeq ($(OS_ARCH),NCR)
EXTRA_LIBS =
endif
ifeq ($(OS_ARCH),SCO_SV)
ifeq ($(OS_ARCH),SCOOS)
EXTRA_LIBS =
endif

4
nsprpub/lib/msgc/src/Makefile
View File

@ -73,14 +73,14 @@ EXTRA_LIBS = -L$(DIST)/lib -lnspr$(NSPR_VERSION)
endif
endif
# On NCR and SCO_SV, we can't link with extra libraries when
# On NCR and SCOOS, we can't link with extra libraries when
# we build a shared library. If we do so, the linker doesn't
# complain, but we would run into weird problems at run-time.
# Therefore on these platforms, we link just the .o files.
ifeq ($(OS_ARCH),NCR)
EXTRA_LIBS =
endif
ifeq ($(OS_ARCH),SCO_SV)
ifeq ($(OS_ARCH),SCOOS)
EXTRA_LIBS =
endif

4
nsprpub/lib/msgc/tests/Makefile
View File

@ -181,7 +181,7 @@ EXTRA_LIBS = -ldl
endif
endif
ifeq ($(OS_ARCH), SCO_SV)
ifeq ($(OS_ARCH), SCOOS)
# SCO Unix needs to link against -lsocket again even though we
# already linked with these system libraries when we built libnspr.so.
EXTRA_LIBS = -lsocket
@ -192,7 +192,7 @@ export LD_RUN_PATH = $(PWD)/$(DIST)/lib
endif
ifeq ($(OS_ARCH),SINIX)
EXTRA_LIBS = -lsocket -lnsl -lgen -ldl -lresolv /usr/ucblib/libucb.a
EXTRA_LIBS = -lsocket -lnsl -lresolv -ldl
# This hardcodes in the executable programs the directory to find
# libnspr.so etc. at program startup. Equivalent to the -R or -rpath
# option for ld on other platforms.

4
nsprpub/lib/prstreams/Makefile
View File

@ -78,14 +78,14 @@ EXTRA_LIBS = -L$(DIST)/lib -lnspr$(MOD_VERSION)
endif
endif
# On NCR and SCO_SV, we can't link with extra libraries when
# On NCR and SCOOS, we can't link with extra libraries when
# we build a shared library. If we do so, the linker doesn't
# complain, but we would run into weird problems at run-time.
# Therefore on these platforms, we link just the object files.
ifeq ($(OS_ARCH),NCR)
EXTRA_LIBS =
endif
ifeq ($(OS_ARCH),SCO_SV)
ifeq ($(OS_ARCH),SCOOS)
EXTRA_LIBS =
endif

2
nsprpub/lib/prstreams/tests/testprstrm/Makefile
View File

@ -129,7 +129,7 @@ EXTRA_LIBS = -lsocket -lnsl -ldl
#export LD_RUN_PATH = $(PWD)/$(DIST)/lib
endif
ifeq ($(OS_ARCH), SCO_SV)
ifeq ($(OS_ARCH), SCOOS)
# SCO Unix needs to link against -lsocket again even though we
# already linked with these system libraries when we built libnspr.so.
EXTRA_LIBS = -lsocket

2
nsprpub/pr/include/md/Makefile
View File

@ -87,7 +87,7 @@ ifeq ($(OS_ARCH),NEC)
MDCPUCFG_H = _nec.cfg
endif
ifeq ($(OS_ARCH),SCO_SV)
ifeq ($(OS_ARCH),SCOOS)
MDCPUCFG_H = _scoos.cfg
endif

8
nsprpub/pr/src/md/unix/Makefile
View File

@ -146,7 +146,7 @@ endif
ifeq ($(OS_ARCH),NCR)
CSRCS += $(NCR_CSRCS)
endif
ifeq ($(OS_ARCH),SCO_SV)
ifeq ($(OS_ARCH),SCOOS)
CSRCS += $(SCOOS_CSRCS)
endif
@ -191,6 +191,7 @@ endif
ifeq ($(OS_ARCH),SunOS)
ifneq ($(OS_RELEASE),4.1.3_U1)
ifeq ($(OS_TEST),sun4u)
ifneq ($(NS_USE_GCC),1)
LIBRARY_NAME = $(ULTRASPARC_LIBRARY)
LIBRARY_VERSION = $(MOD_VERSION)
ULTRASPARC_ASFILES = os_$(OS_ARCH)_ultrasparc.s
@ -198,6 +199,7 @@ ifeq ($(OS_ARCH),SunOS)
TARGETS += $(ULTRASPARC_ASOBJS) $(SHARED_LIBRARY)
endif
endif
endif
endif
INCLUDES = -I$(DIST)/include/private -I$(DIST)/include
@ -212,9 +214,11 @@ export:: $(TARGETS)
#endif
#endif
#endif
ifeq ($(OS_ARCH),SunOS)
ifneq ($(OS_RELEASE),4.1.3_U1)
ifeq ($(OS_TEST),sun4u)
ifneq ($(NS_USE_GCC),1)
$(SHARED_LIBRARY): $(ULTRASPARC_ASOBJS)
$(LD) -G -z text -o $@ $(ULTRASPARC_ASOBJS)
$(INSTALL) -m 444 $(SHARED_LIBRARY) $(DIST)/lib
@ -224,6 +228,6 @@ $(ULTRASPARC_ASOBJS): $(ULTRASPARC_ASFILES)
endif
endif
endif
endif
install:: export

2
nsprpub/pr/src/md/unix/objs.mk
View File

@ -139,7 +139,7 @@ endif
ifeq ($(OS_ARCH),NCR)
CSRCS += $(NCR_CSRCS)
endif
ifeq ($(OS_ARCH),SCO_SV)
ifeq ($(OS_ARCH),SCOOS)
CSRCS += $(SCOOS_CSRCS)
endif

20
nsprpub/pr/src/md/unix/unix_errors.c
View File

@ -670,9 +670,9 @@ void _MD_unix_map_socket_error(int err)
case EACCES:
PR_SetError(PR_NO_ACCESS_RIGHTS_ERROR, err);
break;
#if !defined(SCO_SV)
#if !defined(SCO)
case ENOBUFS:
#endif /* !defined(SCO_SV) */
#endif /* !defined(SCO) */
case ENOMEM:
#ifdef ENOSR
case ENOSR:
@ -786,11 +786,11 @@ void _MD_unix_map_send_error(int err)
case EINVAL:
PR_SetError(PR_INVALID_ARGUMENT_ERROR, err);
break;
#if !defined(SCO_SV)
#if !defined(SCO)
case ENOBUFS:
PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, err);
break;
#endif /* !defined(SCO_SV) */
#endif /* !defined(SCO) */
case ECONNREFUSED:
PR_SetError(PR_CONNECT_REFUSED_ERROR, err);
break;
@ -840,11 +840,11 @@ void _MD_unix_map_sendto_error(int err)
case EINVAL:
PR_SetError(PR_INVALID_ARGUMENT_ERROR, err);
break;
#if !defined(SCO_SV)
#if !defined(SCO)
case ENOBUFS:
PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, err);
break;
#endif /* !defined(SCO_SV) */
#endif /* !defined(SCO) */
case ECONNREFUSED:
PR_SetError(PR_CONNECT_REFUSED_ERROR, err);
break;
@ -1174,9 +1174,9 @@ void _MD_unix_map_getsockname_error(int err)
case EFAULT:
PR_SetError(PR_ACCESS_FAULT_ERROR, err);
break;
#if !defined(SCO_SV)
#if !defined(SCO)
case ENOBUFS:
#endif /* !defined(SCO_SV) */
#endif /* !defined(SCO) */
case ENOMEM:
#ifdef ENOSR
case ENOSR:
@ -1205,9 +1205,9 @@ void _MD_unix_map_getpeername_error(int err)
case EFAULT:
PR_SetError(PR_ACCESS_FAULT_ERROR, err);
break;
#if !defined(SCO_SV)
#if !defined(SCO)
case ENOBUFS:
#endif /* !defined(SCO_SV) */
#endif /* !defined(SCO) */
case ENOMEM:
#ifdef ENOSR
case ENOSR:

4
nsprpub/pr/tests/Makefile
View File

@ -269,7 +269,7 @@ endif
endif
endif
ifeq ($(OS_ARCH), SCO_SV)
ifeq ($(OS_ARCH), SCOOS)
# SCO Unix needs to link against -lsocket again even though we
# already linked with these system libraries when we built libnspr.so.
EXTRA_LIBS = -lsocket
@ -280,7 +280,7 @@ export LD_RUN_PATH = $(PWD)/$(DIST)/lib
endif
ifeq ($(OS_ARCH),SINIX)
EXTRA_LIBS = -lsocket -lnsl -lgen -ldl -lresolv /usr/ucblib/libucb.a
EXTRA_LIBS = -lsocket -lnsl -lresolv -ldl
# This hardcodes in the executable programs the directory to find
# libnspr.so etc. at program startup. Equivalent to the -R or -rpath
# option for ld on other platforms.

2
nsprpub/tools/Makefile
View File

@ -131,7 +131,7 @@ EXTRA_LIBS = -lsocket -lnsl -ldl
#export LD_RUN_PATH = $(PWD)/$(DIST)/lib
endif
ifeq ($(OS_ARCH), SCO_SV)
ifeq ($(OS_ARCH), SCOOS)
# SCO Unix needs to link against -lsocket again even though we
# already linked with these system libraries when we built libnspr.so.
EXTRA_LIBS = -lsocket