Author: qboosh Date: Wed Aug 1 19:44:27 2007 GMT Module: SOURCES Tag: HEAD ---- Log message: - missing coreconf files
---- Files affected: SOURCES: jss-coreconf.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/jss-coreconf.patch diff -u /dev/null SOURCES/jss-coreconf.patch:1.1 --- /dev/null Wed Aug 1 21:44:27 2007 +++ SOURCES/jss-coreconf.patch Wed Aug 1 21:44:22 2007 @@ -0,0 +1,12672 @@ +diff -Nur jss-4.2.5/mozilla/security/coreconf.orig/AIX.mk jss-4.2.5/mozilla/security/coreconf/AIX.mk +--- jss-4.2.5/mozilla/security/coreconf.orig/AIX.mk 1970-01-01 01:00:00.000000000 +0100 ++++ jss-4.2.5/mozilla/security/coreconf/AIX.mk 2005-09-16 19:09:23.000000000 +0200 +@@ -0,0 +1,99 @@ ++# ++# ***** BEGIN LICENSE BLOCK ***** ++# Version: MPL 1.1/GPL 2.0/LGPL 2.1 ++# ++# 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 the Initial Developer are Copyright (C) 1994-2000 ++# the Initial Developer. All Rights Reserved. ++# ++# Contributor(s): ++# ++# Alternatively, the contents of this file may be used under the terms of ++# either the GNU General Public License Version 2 or later (the "GPL"), or ++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), ++# in which case the provisions of the GPL or the LGPL are applicable instead ++# of those above. If you wish to allow use of your version of this file only ++# under the terms of either the GPL or the LGPL, and not to allow others to ++# use your version of this file under the terms of the MPL, indicate your ++# decision by deleting the provisions above and replace them with the notice ++# and other provisions required by the GPL or the LGPL. If you do not delete ++# the provisions above, a recipient may use your version of this file under ++# the terms of any one of the MPL, the GPL or the LGPL. ++# ++# ***** END LICENSE BLOCK ***** ++ ++# Config stuff for AIX. ++ ++include $(CORE_DEPTH)/coreconf/UNIX.mk ++ ++# ++# There are two implementation strategies available on AIX: ++# pthreads, and pthreads-user. The default is pthreads. ++# In both strategies, we need to use pthread_user.c, instead of ++# aix.c. The fact that aix.c is never used is somewhat strange. ++# ++# So we need to do the following: ++# - Default (PTHREADS_USER not defined in the environment or on ++# the command line): ++# Set PTHREADS_USER=1, USE_PTHREADS=1 ++# - PTHREADS_USER=1 set in the environment or on the command line: ++# Do nothing. ++# ++ifeq ($(PTHREADS_USER),1) ++ USE_PTHREADS = # just to be safe ++ IMPL_STRATEGY = _PTH_USER ++else ++ USE_PTHREADS = 1 ++ PTHREADS_USER = 1 ++endif ++ ++DEFAULT_COMPILER = xlc_r ++ ++CC = xlc_r ++CCC = xlC_r ++ ++CPU_ARCH = rs6000 ++ ++RANLIB = ranlib ++ ++OS_CFLAGS = -DAIX -DSYSV ++OS_LIBS += -blibpath:/usr/lib:/lib -lc -lm ++ ++DSO_LDOPTS = -brtl -bnortllib -bM:SRE -bnoentry ++MKSHLIB = $(LD) $(DSO_LDOPTS) -blibpath:/usr/lib:/lib -lc -lm ++ ++AIX_WRAP = $(DIST)/lib/aixwrap.o ++AIX_TMP = $(OBJDIR)/_aix_tmp.o ++ ++ifdef MAPFILE ++DSO_LDOPTS += -bexport:$(MAPFILE) ++else ++DSO_LDOPTS += -bexpall ++endif ++ ++PROCESS_MAP_FILE = grep -v ';+' $< | grep -v ';-' | \ ++ sed -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,,' > $@ ++ ++ifdef BUILD_OPT ++ OPTIMIZER += -qmaxmem=-1 ++endif ++ ++ifeq ($(USE_64), 1) ++ OS_CFLAGS += -DAIX_64BIT ++ OBJECT_MODE=64 ++ export OBJECT_MODE ++endif ++ +diff -Nur jss-4.2.5/mozilla/security/coreconf.orig/arch.mk jss-4.2.5/mozilla/security/coreconf/arch.mk +--- jss-4.2.5/mozilla/security/coreconf.orig/arch.mk 1970-01-01 01:00:00.000000000 +0100 ++++ jss-4.2.5/mozilla/security/coreconf/arch.mk 2005-07-07 18:50:47.000000000 +0200 +@@ -0,0 +1,363 @@ ++# ++# ***** BEGIN LICENSE BLOCK ***** ++# Version: MPL 1.1/GPL 2.0/LGPL 2.1 ++# ++# 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 the Initial Developer are Copyright (C) 1994-2000 ++# the Initial Developer. All Rights Reserved. ++# ++# Contributor(s): ++# Howard Chu <[EMAIL PROTECTED]> ++# ++# Alternatively, the contents of this file may be used under the terms of ++# either the GNU General Public License Version 2 or later (the "GPL"), or ++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), ++# in which case the provisions of the GPL or the LGPL are applicable instead ++# of those above. If you wish to allow use of your version of this file only ++# under the terms of either the GPL or the LGPL, and not to allow others to ++# use your version of this file under the terms of the MPL, indicate your ++# decision by deleting the provisions above and replace them with the notice ++# and other provisions required by the GPL or the LGPL. If you do not delete ++# the provisions above, a recipient may use your version of this file under ++# the terms of any one of the MPL, the GPL or the LGPL. ++# ++# ***** END LICENSE BLOCK ***** ++ ++####################################################################### ++# Master "Core Components" macros for getting the OS architecture # ++# defines these symbols: ++# 64BIT_TAG ++# OS_ARCH (from uname -r) ++# OS_TEST (from uname -m) ++# OS_RELEASE (from uname -v and/or -r) ++# OS_TARGET User defined, or set to OS_ARCH ++# CPU_ARCH (from unmame -m or -p, ONLY on WINNT) ++# OS_CONFIG OS_TARGET + OS_RELEASE ++# OBJDIR_TAG ++# OBJDIR_NAME ++####################################################################### ++ ++# ++# Macros for getting the OS architecture ++# ++ ++ifeq ($(USE_64), 1) ++ 64BIT_TAG=_64 ++else ++ 64BIT_TAG= ++endif ++ ++OS_ARCH := $(subst /,_,$(shell uname -s)) ++ ++# ++# Attempt to differentiate between sparc and x86 Solaris ++# ++ ++OS_TEST := $(shell uname -m) ++ifeq ($(OS_TEST),i86pc) ++ OS_RELEASE := $(shell uname -r)_$(OS_TEST) ++else ++ OS_RELEASE := $(shell uname -r) ++endif ++ ++# ++# Force the IRIX64 machines to use IRIX. ++# ++ ++ifeq ($(OS_ARCH),IRIX64) ++ OS_ARCH = IRIX ++endif ++ ++# ++# Force the older BSD/OS versions to use the new arch name. ++# ++ ++ifeq ($(OS_ARCH),BSD_386) ++ OS_ARCH = BSD_OS ++endif ++ ++# ++# Catch Deterim if SVR4 is NCR or UNIXWARE ++# ++ ++ifeq ($(OS_ARCH),UNIX_SV) ++ ifneq ($(findstring NCR, $(shell grep NCR /etc/bcheckrc | head -1 )),) ++ OS_ARCH = NCR ++ else ++ # Make UnixWare something human readable ++ OS_ARCH = UNIXWARE ++ endif ++ ++ # Get the OS release number, not 4.2 ++ OS_RELEASE := $(shell uname -v) ++endif ++ ++ifeq ($(OS_ARCH),UNIX_System_V) ++ OS_ARCH = NEC ++endif ++ ++ifeq ($(OS_ARCH),AIX) ++ OS_RELEASE := $(shell uname -v).$(shell uname -r) ++endif ++ ++# ++# Distinguish between OSF1 V4.0B and V4.0D ++# ++ ++ifeq ($(OS_ARCH)$(OS_RELEASE),OSF1V4.0) ++ OS_VERSION := $(shell uname -v) ++ ifeq ($(OS_VERSION),564) ++ OS_RELEASE := V4.0B ++ endif ++ ifeq ($(OS_VERSION),878) ++ OS_RELEASE := V4.0D ++ endif ++endif ++ ++# ++# SINIX changes name to ReliantUNIX with 5.43 ++# ++ ++ifeq ($(OS_ARCH),ReliantUNIX-N) ++ OS_ARCH = ReliantUNIX ++ OS_RELEASE = 5.4 ++endif ++ ++ifeq ($(OS_ARCH),SINIX-N) ++ OS_ARCH = ReliantUNIX ++ OS_RELEASE = 5.4 ++endif ++ ++# ++# Handle FreeBSD 2.2-STABLE, Linux 2.0.30-osfmach3, and ++# IRIX 6.5-ALPHA-1289139620. ++# ++ ++ifeq (,$(filter-out Linux FreeBSD IRIX,$(OS_ARCH))) ++ OS_RELEASE := $(shell echo $(OS_RELEASE) | sed 's/-.*//') ++endif ++ ++ifeq ($(OS_ARCH),Linux) ++ OS_RELEASE := $(subst ., ,$(OS_RELEASE)) ++ ifneq ($(words $(OS_RELEASE)),1) ++ OS_RELEASE := $(word 1,$(OS_RELEASE)).$(word 2,$(OS_RELEASE)) ++ endif ++endif ++ ++# ++# For OS/2 ++# ++ifeq ($(OS_ARCH),OS_2) ++ OS_ARCH = OS2 ++ OS_RELEASE := $(shell uname -v) ++endif ++ ++ifneq (,$(findstring OpenVMS,$(OS_ARCH))) ++ OS_ARCH = OpenVMS ++ OS_RELEASE := $(shell uname -v) ++endif ++ ++####################################################################### ++# Master "Core Components" macros for getting the OS target # ++####################################################################### ++ ++# ++# Note: OS_TARGET should be specified on the command line for gmake. ++# When OS_TARGET=WIN95 is specified, then a Windows 95 target is built. ++# The difference between the Win95 target and the WinNT target is that ++# the WinNT target uses Windows NT specific features not available ++# in Windows 95. The Win95 target will run on Windows NT, but (supposedly) ++# at lesser performance (the Win95 target uses threads; the WinNT target ++# uses fibers). ++# ++# When OS_TARGET=WIN16 is specified, then a Windows 3.11 (16bit) target ++# is built. See: win16_3.11.mk for lots more about the Win16 target. ++# ++# If OS_TARGET is not specified, it defaults to $(OS_ARCH), i.e., no ++# cross-compilation. ++# ++ ++# ++# The following hack allows one to build on a WIN95 machine (as if ++# s/he were cross-compiling on a WINNT host for a WIN95 target). ++# It also accomodates for MKS's and Cygwin's uname.exe. ++# ++ifeq ($(OS_ARCH),WIN95) ++ OS_ARCH = WINNT ++ OS_TARGET = WIN95 ++endif ++ifeq ($(OS_ARCH),Windows_95) ++ OS_ARCH = Windows_NT ++ OS_TARGET = WIN95 ++endif ++ifeq ($(OS_ARCH),CYGWIN_95-4.0) ++ OS_ARCH = CYGWIN_NT-4.0 ++ OS_TARGET = WIN95 ++endif ++ifeq ($(OS_ARCH),CYGWIN_98-4.10) ++ OS_ARCH = CYGWIN_NT-4.0 ++ OS_TARGET = WIN95 ++endif ++ifeq ($(OS_ARCH),CYGWIN_ME-4.90) ++ OS_ARCH = CYGWIN_NT-4.0 ++ OS_TARGET = WIN95 ++endif ++ ++# ++# On WIN32, we also define the variable CPU_ARCH, if it isn't already. ++# ++ifndef CPU_ARCH ++ ifeq ($(OS_ARCH), WINNT) ++ CPU_ARCH := $(shell uname -p) ++ ifeq ($(CPU_ARCH),I386) ++ CPU_ARCH = x386 ++ endif ++ endif ++endif ++ ++# If uname -s returns "Windows_NT", we assume that we are using ++# the uname.exe in MKS toolkit. ++# ++# The -r option of MKS uname only returns the major version number. ++# So we need to use its -v option to get the minor version number. ++# Moreover, it doesn't have the -p option, so we need to use uname -m. ++# ++ifeq ($(OS_ARCH), Windows_NT) ++ OS_ARCH = WINNT ++ OS_MINOR_RELEASE := $(shell uname -v) ++ # strip leading 0 ++ OS_MINOR_RELEASE := $(patsubst 0%,%,$(OS_MINOR_RELEASE)) ++ OS_RELEASE := $(OS_RELEASE).$(OS_MINOR_RELEASE) ++ ifndef CPU_ARCH ++ CPU_ARCH := $(shell uname -m) ++ # ++ # MKS's uname -m returns "586" on a Pentium machine. ++ # ++ ifneq (,$(findstring 86,$(CPU_ARCH))) ++ CPU_ARCH = x386 ++ endif ++ endif ++endif ++# ++# If uname -s returns "CYGWIN_NT-4.0", we assume that we are using ++# the uname.exe in the Cygwin tools. ++# ++ifeq (CYGWIN_NT,$(findstring CYGWIN_NT,$(OS_ARCH))) ++ OS_RELEASE := $(patsubst CYGWIN_NT-%,%,$(OS_ARCH)) ++ OS_ARCH = WINNT ++ ifndef CPU_ARCH ++ CPU_ARCH := $(shell uname -m) ++ # ++ # Cygwin's uname -m returns "i686" on a Pentium Pro machine. ++ # ++ ifneq (,$(findstring 86,$(CPU_ARCH))) ++ CPU_ARCH = x386 ++ endif ++ endif ++endif ++# ++# If uname -s returns "MINGW32_NT-5.1", we assume that we are using ++# the uname.exe in the MSYS toolkit. ++# ++ifeq (MINGW32_NT,$(findstring MINGW32_NT,$(OS_ARCH))) ++ OS_RELEASE := $(patsubst MINGW32_NT-%,%,$(OS_ARCH)) ++ OS_ARCH = WINNT ++ USE_MSYS = 1 ++ ifndef CPU_ARCH ++ CPU_ARCH := $(shell uname -m) ++ # ++ # MSYS's uname -m returns "i686" on a Pentium Pro machine. ++ # ++ ifneq (,$(findstring 86,$(CPU_ARCH))) ++ CPU_ARCH = x386 ++ endif ++ endif ++endif ++ ++ifndef OS_TARGET ++ OS_TARGET = $(OS_ARCH) ++endif ++ ++ifeq ($(OS_TARGET), WIN95) ++ OS_RELEASE = 4.0 ++endif ++ ++ifeq ($(OS_TARGET), WIN16) ++ OS_RELEASE = ++# OS_RELEASE = _3.11 ++endif ++ ++ifdef OS_TARGET_RELEASE ++ OS_RELEASE = $(OS_TARGET_RELEASE) ++endif ++ ++# ++# This variable is used to get OS_CONFIG.mk. ++# ++ ++OS_CONFIG = $(OS_TARGET)$(OS_RELEASE) ++ ++# ++# OBJDIR_TAG depends on the predefined variable BUILD_OPT, ++# to distinguish between debug and release builds. ++# ++ ++ifdef BUILD_OPT ++ ifeq ($(OS_TARGET),WIN16) ++ OBJDIR_TAG = _O ++ else ++ OBJDIR_TAG = $(64BIT_TAG)_OPT ++ endif ++else ++ ifdef BUILD_IDG ++ ifeq ($(OS_TARGET),WIN16) ++ OBJDIR_TAG = _I ++ else ++ OBJDIR_TAG = $(64BIT_TAG)_IDG ++ endif ++ else ++ ifeq ($(OS_TARGET),WIN16) ++ OBJDIR_TAG = _D ++ else ++ OBJDIR_TAG = $(64BIT_TAG)_DBG ++ endif ++ endif ++endif ++ ++# ++# The following flags are defined in the individual $(OS_CONFIG).mk ++# files. ++# ++# CPU_TAG is defined if the CPU is not the most common CPU. ++# COMPILER_TAG is defined if the compiler is not the default compiler. ++# IMPL_STRATEGY may be defined too. ++# ++ ++OBJDIR_NAME = $(OS_TARGET)$(OS_RELEASE)$(CPU_TAG)$(COMPILER_TAG)$(LIBC_TAG)$(IMPL_STRATEGY)$(OBJDIR_TAG).OBJ ++ ++ifeq (,$(filter-out WINNT WIN95 WINCE,$(OS_TARGET))) # list omits WIN16 ++ifndef BUILD_OPT ++# ++# Define USE_DEBUG_RTL if you want to use the debug runtime library ++# (RTL) in the debug build ++# ++ifdef USE_DEBUG_RTL ++ OBJDIR_NAME = $(OS_TARGET)$(OS_RELEASE)$(CPU_TAG)$(COMPILER_TAG)$(IMPL_STRATEGY)$(OBJDIR_TAG).OBJD ++endif ++endif ++endif ++ ++MK_ARCH = included +diff -Nur jss-4.2.5/mozilla/security/coreconf.orig/BeOS.mk jss-4.2.5/mozilla/security/coreconf/BeOS.mk +--- jss-4.2.5/mozilla/security/coreconf.orig/BeOS.mk 1970-01-01 01:00:00.000000000 +0100 ++++ jss-4.2.5/mozilla/security/coreconf/BeOS.mk 2004-04-25 17:02:17.000000000 +0200 +@@ -0,0 +1,81 @@ ++# ++# ***** BEGIN LICENSE BLOCK ***** ++# Version: MPL 1.1/GPL 2.0/LGPL 2.1 ++# ++# 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 the Initial Developer are Copyright (C) 2002 ++# the Initial Developer. All Rights Reserved. ++# ++# Contributor(s): ++# ++# Alternatively, the contents of this file may be used under the terms of ++# either the GNU General Public License Version 2 or later (the "GPL"), or ++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), ++# in which case the provisions of the GPL or the LGPL are applicable instead ++# of those above. If you wish to allow use of your version of this file only ++# under the terms of either the GPL or the LGPL, and not to allow others to ++# use your version of this file under the terms of the MPL, indicate your ++# decision by deleting the provisions above and replace them with the notice ++# and other provisions required by the GPL or the LGPL. If you do not delete ++# the provisions above, a recipient may use your version of this file under ++# the terms of any one of the MPL, the GPL or the LGPL. ++# ++# ***** END LICENSE BLOCK ***** ++ ++include $(CORE_DEPTH)/coreconf/UNIX.mk ++ ++XP_DEFINE := $(XP_DEFINE:-DXP_UNIX=-DXP_BEOS) ++ ++USE_PTHREADS = ++ ++ifeq ($(USE_PTHREADS),1) ++ IMPL_STRATEGY = _PTH ++endif ++ ++CC = gcc ++CCC = g++ ++RANLIB = ranlib ++ ++DEFAULT_COMPILER = gcc ++ ++ifeq ($(OS_TEST),ppc) ++ OS_REL_CFLAGS = -Dppc ++ CPU_ARCH = ppc ++else ++ OS_REL_CFLAGS = -Di386 ++ CPU_ARCH = x86 ++endif ++ ++MKSHLIB = $(CC) -nostart -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) ++ifdef BUILD_OPT ++ OPTIMIZER = -O2 ++endif ++ ++OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -Wall -pipe ++OS_LIBS = -lbe ++ ++DEFINES += -DBEOS ++ ++ifdef USE_PTHREADS ++ DEFINES += -D_REENTRANT ++endif ++ ++ARCH = beos ++ ++DSO_CFLAGS = -fPIC ++DSO_LDOPTS = ++DSO_LDFLAGS = ++ +diff -Nur jss-4.2.5/mozilla/security/coreconf.orig/BSD_OS.mk jss-4.2.5/mozilla/security/coreconf/BSD_OS.mk +--- jss-4.2.5/mozilla/security/coreconf.orig/BSD_OS.mk 1970-01-01 01:00:00.000000000 +0100 ++++ jss-4.2.5/mozilla/security/coreconf/BSD_OS.mk 2005-09-16 19:09:23.000000000 +0200 +@@ -0,0 +1,91 @@ ++# ++# ***** BEGIN LICENSE BLOCK ***** ++# Version: MPL 1.1/GPL 2.0/LGPL 2.1 ++# ++# 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 the Initial Developer are Copyright (C) 1994-2000 ++# the Initial Developer. All Rights Reserved. ++# ++# Contributor(s): ++# Kurt J. Lidl ++# ++# Alternatively, the contents of this file may be used under the terms of ++# either the GNU General Public License Version 2 or later (the "GPL"), or ++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), ++# in which case the provisions of the GPL or the LGPL are applicable instead ++# of those above. If you wish to allow use of your version of this file only ++# under the terms of either the GPL or the LGPL, and not to allow others to ++# use your version of this file under the terms of the MPL, indicate your ++# decision by deleting the provisions above and replace them with the notice <<Diff was trimmed, longer than 597 lines>> _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
