diff options
author | wtc%netscape.com <devnull@localhost> | 2002-05-18 03:24:17 +0000 |
---|---|---|
committer | wtc%netscape.com <devnull@localhost> | 2002-05-18 03:24:17 +0000 |
commit | 5d37af6dd8b57c8f3053275285b3f0d1b0b65be8 (patch) | |
tree | 4cd8b2faaa5d087ac775fc4264b35bbc4074a027 | |
parent | ad2731c93b85f57741bc783d0cbcab3169af5527 (diff) | |
download | nss-hg-5d37af6dd8b57c8f3053275285b3f0d1b0b65be8.tar.gz |
Bugzilla bug 145178: added OpenBSD build support. The patch is contributed
by Christopher Seawood <seawood@netscape.com>.
Modified Files: coreconf/config.mk sslmutex.c sslmutex.h
Added Files: coreconf/OpenBSD.mk
-rw-r--r-- | security/coreconf/OpenBSD.mk | 62 | ||||
-rw-r--r-- | security/coreconf/config.mk | 2 | ||||
-rw-r--r-- | security/nss/lib/ssl/sslmutex.c | 2 | ||||
-rw-r--r-- | security/nss/lib/ssl/sslmutex.h | 2 |
4 files changed, 65 insertions, 3 deletions
diff --git a/security/coreconf/OpenBSD.mk b/security/coreconf/OpenBSD.mk new file mode 100644 index 000000000..14fa73489 --- /dev/null +++ b/security/coreconf/OpenBSD.mk @@ -0,0 +1,62 @@ +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Netscape security libraries. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1994-2000 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# +# Alternatively, the contents of this file may be used under the +# terms of the GNU General Public License Version 2 or later (the +# "GPL"), in which case the provisions of the GPL are applicable +# instead of those above. If you wish to allow use of your +# version of this file only under the terms of the GPL and not to +# allow others to use your version of this file under the MPL, +# indicate your decision by deleting the provisions above and +# replace them with the notice and other provisions required by +# the GPL. If you do not delete the provisions above, a recipient +# may use your version of this file under either the MPL or the +# GPL. +# +# Config stuff for OpenBSD +# + +include $(CORE_DEPTH)/coreconf/UNIX.mk + +DEFAULT_COMPILER = gcc +CC = gcc +CCC = g++ +RANLIB = ranlib + +CPU_ARCH := $(shell uname -p) +ifeq ($(CPU_ARCH),i386) +OS_REL_CFLAGS = -Di386 +CPU_ARCH = x86 +endif + +DLL_SUFFIX = so.1.0 + +OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe -DOPENBSD + +OS_LIBS = + +ARCH = openbsd + +DSO_CFLAGS = -fPIC -DPIC +DSO_LDOPTS = -shared -Wl,-soname,lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) +DSO_LDFLAGS = + +MKSHLIB = $(CC) $(DSO_LDOPTS) + diff --git a/security/coreconf/config.mk b/security/coreconf/config.mk index 7ad0d1e16..01b633be8 100644 --- a/security/coreconf/config.mk +++ b/security/coreconf/config.mk @@ -58,7 +58,7 @@ endif # one for each OS release. # ####################################################################### -TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS +TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS OpenBSD ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET))) include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk diff --git a/security/nss/lib/ssl/sslmutex.c b/security/nss/lib/ssl/sslmutex.c index 9b195e794..85d6e88c2 100644 --- a/security/nss/lib/ssl/sslmutex.c +++ b/security/nss/lib/ssl/sslmutex.c @@ -87,7 +87,7 @@ static SECStatus single_process_sslMutex_Lock(sslMutex* pMutex) return SECSuccess; } -#if defined(LINUX) || defined(AIX) || defined(VMS) || defined(BEOS) || defined(BSDI) || defined(NETBSD) +#if defined(LINUX) || defined(AIX) || defined(VMS) || defined(BEOS) || defined(BSDI) || defined(NETBSD) || defined(OPENBSD) #include <unistd.h> #include <fcntl.h> diff --git a/security/nss/lib/ssl/sslmutex.h b/security/nss/lib/ssl/sslmutex.h index 9878576c5..97115782f 100644 --- a/security/nss/lib/ssl/sslmutex.h +++ b/security/nss/lib/ssl/sslmutex.h @@ -77,7 +77,7 @@ typedef struct typedef int sslPID; -#elif defined(LINUX) || defined(AIX) || defined(VMS) || defined(BEOS) || defined(BSDI) || defined(NETBSD) +#elif defined(LINUX) || defined(AIX) || defined(VMS) || defined(BEOS) || defined(BSDI) || defined(NETBSD) || defined(OPENBSD) #include <sys/types.h> #include "prtypes.h" |