Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/libs
In directory sc8-pr-cvs17:/tmp/cvs-serv6919/10.3/unstable/main/finkinfo/libs
Added Files:
nspr.info nspr.patch spidermonkey.info spidermonkey.patch
Log Message:
nspr and spidermonkey
--- NEW FILE: nspr.patch ---
diff -uNr nspr-4.6.6/mozilla/nsprpub/configure
nspr-4.6.6-patched/mozilla/nsprpub/configure
--- nspr-4.6.6/mozilla/nsprpub/configure 2007-01-18 18:44:31.000000000
-0500
+++ nspr-4.6.6-patched/mozilla/nsprpub/configure 2007-05-29
10:50:59.000000000 -0400
@@ -100,6 +100,16 @@
infodir='${prefix}/info'
mandir='${prefix}/man'
+# NLS nuisances.
+# Only set these to C if already set. These must not be set unconditionally
+# because not all systems understand e.g. LANG=C (notably SCO).
+# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
+# Non-C LC_CTYPE values break the ctype check.
+if test "${LANG+set}" = set; then LANG=C; export LANG; fi
+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
+if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi
+
# Initialize some other variables.
subdirs=
MFLAGS= MAKEFLAGS=
@@ -488,16 +498,6 @@
esac
done
-# NLS nuisances.
-# Only set these to C if already set. These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}" = set; then LANG=C; export LANG; fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi
-
# confdefs.h avoids OS command line length limits that DEFS can exceed.
rm -rf conftest* confdefs.h
# AIX cpp loses on an empty file, so make sure it contains at least a newline.
@@ -3855,7 +3855,7 @@
PR_MD_CSRCS=linux.c
MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
DSO_CFLAGS=-fPIC
- DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
+ DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@).$(MOD_MINOR_VERSION)'
_OPTIMIZE_FLAGS=-O2
_DEBUG_FLAGS="-g -fno-inline" # most people on linux use gcc/gdb, and that
# combo is not yet good at debugging inlined
diff -uNr nspr-4.6.6/mozilla/nsprpub/pr/src/misc/prtime.c
nspr-4.6.6-patched/mozilla/nsprpub/pr/src/misc/prtime.c
--- nspr-4.6.6/mozilla/nsprpub/pr/src/misc/prtime.c 2007-01-15
19:31:10.000000000 -0500
+++ nspr-4.6.6-patched/mozilla/nsprpub/pr/src/misc/prtime.c 2007-05-29
10:51:10.000000000 -0400
@@ -1553,7 +1553,7 @@
case TT_EET: zone_offset = 2 * 60; break;
case TT_JST: zone_offset = 9 * 60; break;
default:
- PR_ASSERT (0);
+ return PR_FAILURE;
break;
}
}
@@ -1595,11 +1595,12 @@
struct tm localTime;
time_t secs;
- PR_ASSERT(tm.tm_month > -1
+ if (!(tm.tm_month > -1
&& tm.tm_mday > 0
&& tm.tm_hour > -1
&& tm.tm_min > -1
- && tm.tm_sec > -1);
+ && tm.tm_sec > -1))
+ return PR_FAILURE;
/*
* To obtain time_t from a tm structure representing the local
--- NEW FILE: spidermonkey.info ---
Package: spidermonkey
Version: 1.60
Revision: 1
CustomMirror: <<
Primary: http://ftp.mozilla.org/pub/mozilla.org/js
en-US: http://ftp.mozilla.org/pub/mozilla.org/js/older-packages
<<
Depends: %N-shlibs (= %v-%r)
BuildDepends: <<
nspr,
readline5
<<
Source: mirror:custom:js-%v.tar.gz
Source-MD5: bd8f021e43a8fbbec55ac2cd3d483243
PatchScript: sed -e 's,@FINKPREFIX@,%p,g' %a/%n.patch | patch -p2
SourceDirectory: js/src
CompileScript: <<
#!/bin/sh -ev
make -j1 -f Makefile.ref LIBDIR="/lib" SO_SUFFIX="dylib" JS_THREADSAFE=1
ranlib Darwin_OPT.OBJ/libjs.a
<<
InstallScript: <<
#!/bin/sh -ev
make -j1 -f Makefile.ref LIBDIR="/lib" SO_SUFFIX="dylib"
JS_THREADSAFE=1 install DESTDIR="%d"
mv %i/lib/libjs.dylib %i/lib/libjs.1.0.0.dylib
ln -sf libjs.1.0.0.dylib %i/lib/libjs.1.dylib
ln -sf libjs.1.dylib %i/lib/libjs.dylib
install_name_tool -id %p/lib/libjs.1.dylib %i/lib/libjs.1.0.0.dylib
<<
SplitOff: <<
Package: %N-shlibs
Files: lib/libjs.*.dylib
Shlibs: %p/lib/libjs.1.dylib 1.0.0 %n (>= 1.0-1)
<<
SplitOff2: <<
BuildDependsOnly: true
Package: %N-dev
Files: bin/jscpucfg include lib
<<
DocFiles: *.html
Description: Mozilla JavaScript-C Engine
DescPackaging: <<
Thanks to the MacPorts package for patches. :)
<<
License: OSI-Approved
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
Homepage: http://www.mozilla.org/js/spidermonkey/
--- NEW FILE: nspr.info ---
Package: nspr
Version: 4.6.6
Revision: 1
CustomMirror: <<
Primary: http://ftp.mozilla.org/pub/mozilla.org/js
en-US: http://ftp.mozilla.org/pub/mozilla.org/js/older-packages
<<
Depends: %N-shlibs (= %v-%r)
BuildDependsOnly: true
Source: http://ftp.mozilla.org/pub/mozilla.org/%n/releases/v%v/src/%n-%v.tar.gz
Source-MD5: ba49bc35e2068f54893d3ea7031ad59c
SourceDirectory: %n-%v/mozilla/nsprpub
PatchScript: <<
patch -p3 < %a/%n.patch
perl -pi -e 's,[EMAIL PROTECTED],%p/lib,g' configure
<<
ConfigureParams: --disable-debug --disable-dependency-tracking
InstallScript: <<
#!/bin/sh -ev
pushd dist
find . ! -type d | while read FILE; do
DIR=`dirname "$FILE"`
install -d -m 755 "%i/$DIR"
install -c -m 644 "$FILE" "%i/$FILE"
done
popd
rm -rf %i/bin/lib*.dylib
install -d -m 755 %i/bin
install -c -m 755 config/nspr-config %i/bin/
for file in libnspr4 libplc4 libplds4; do
mv "%i/lib/$file.dylib" "%i/lib/$file.1.0.0.dylib"
ln -sf "$file.1.0.0.dylib" "%i/lib/$file.1.dylib"
ln -sf "$file.1.dylib" "%i/lib/$file.dylib"
install_name_tool -id "%p/lib/$file.1.dylib"
"%i/lib/$file.1.0.0.dylib"
for dylib in %i/lib/*.dylib; do
install_name_tool -change "%p/lib/$file.dylib"
"%p/lib/$file.1.dylib" "$dylib"
done
done
<<
SplitOff: <<
Package: %N-shlibs
Files: <<
lib/libnspr4.*.dylib
lib/libplc4.*.dylib
lib/libplds4.*.dylib
<<
Shlibs: <<
%p/lib/libnspr4.1.dylib 1.0.0 %n (>= 4.6.6-1)
%p/lib/libplc4.1.dylib 1.0.0 %n (>= 4.6.6-1)
%p/lib/libplds4.1.dylib 1.0.0 %n (>= 4.6.6-1)
<<
<<
Description: Netscape Portable Runtime
DescDetail: <<
Netscape Portable Runtime (NSPR) provides a platform-neutral
API for system level and libc like functions. The API is
used in the Mozilla client, many of Netscape/AOL/iPlanet's
and other software offerings.
<<
DescPackaging: <<
Thanks to the MacPorts package for patches. :)
<<
License: OSI-Approved
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
Homepage: http://www.mozilla.org/projects/nspr/
--- NEW FILE: spidermonkey.patch ---
diff -uNr js/src/Makefile.ref js-patched/src/Makefile.ref
--- js/src/Makefile.ref 2006-08-21 14:58:45.000000000 -0400
+++ js-patched/src/Makefile.ref 2007-05-29 11:36:57.000000000 -0400
@@ -61,11 +61,11 @@
ifdef JS_THREADSAFE
DEFINES += -DJS_THREADSAFE
-INCLUDES += -I../../dist/$(OBJDIR)/include
+INCLUDES += [EMAIL PROTECTED]@/include/nspr
ifdef USE_MSVC
OTHER_LIBS += ../../dist/$(OBJDIR)/lib/libnspr${NSPR_LIBSUFFIX}.lib
else
-OTHER_LIBS += -L../../dist/$(OBJDIR)/lib -lnspr${NSPR_LIBSUFFIX}
+OTHER_LIBS += [EMAIL PROTECTED]@$(LIBDIR) -lnspr${NSPR_LIBSUFFIX}
endif
endif
@@ -132,7 +132,7 @@
ifdef JS_READLINE
# For those platforms with the readline library installed.
DEFINES += -DEDITLINE
-PROG_LIBS += -lreadline -ltermcap
+PROG_LIBS += -lreadline
else
ifdef JS_EDITLINE
# Use the editline library, built locally.
@@ -185,6 +185,8 @@
jsstr.h \
jsxdrapi.h \
jsxml.h \
+ jsutil.h \
+ jsprf.h \
$(NULL)
API_HFILES = \
@@ -377,3 +379,16 @@
SUFFIXES: .i
%.i: %.c
$(CC) -C -E $(CFLAGS) $< > $*.i
+
+DESTDIR :=
+PREFIX := @FINKPREFIX@
+BINDIR := $(PREFIX)/bin
+MY_LIBDIR := $(PREFIX)/$(LIBDIR)
+INCLUDEDIR := $(PREFIX)/include/js
+INSTALL := install
+install:
+ $(INSTALL) -m 755 -d $(DESTDIR)$(INCLUDEDIR) $(DESTDIR)$(MY_LIBDIR)
$(DESTDIR)$(BINDIR)
+ $(INSTALL) -m 755 $(SHARED_LIBRARY) $(DESTDIR)$(MY_LIBDIR)
+ $(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(MY_LIBDIR)
+ $(INSTALL) -m 755 $(OBJDIR)/js $(OBJDIR)/jscpucfg $(DESTDIR)$(BINDIR)
+ $(INSTALL) -m 644 $(HFILES) $(DESTDIR)$(INCLUDEDIR)
diff -uNr js/src/config/Darwin.mk js-patched/src/config/Darwin.mk
--- js/src/config/Darwin.mk 2005-02-12 15:10:33.000000000 -0500
+++ js-patched/src/config/Darwin.mk 2007-05-29 11:42:07.000000000 -0400
@@ -43,13 +43,13 @@
# Just ripped from Linux config
#
-CC = cc
+CC = gcc
CCC = g++
-CFLAGS += -Wall -Wno-format
-OS_CFLAGS = -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DDARWIN
+CFLAGS += -Wall -Wno-format -no-cpp-precomp -fno-common -pipe
+OS_CFLAGS = -DJS_THREADSAFE -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE
-DPOSIX_SOURCE -DDARWIN
RANLIB = ranlib
-MKSHLIB = libtool $(XMKSHLIBOPTS) -framework System
+MKSHLIB = $(CC) -compatibility_version 1.0 -current_version 1.0 -framework
System -dynamiclib $(XMKSHLIBOPTS) -lm -lplds4 -lplc4 -lnspr4 $(LDFLAGS)
#.c.o:
# $(CC) -c -MD $*.d $(CFLAGS) $<
@@ -57,7 +57,6 @@
CPU_ARCH = $(shell uname -m)
ifeq (86,$(findstring 86,$(CPU_ARCH)))
CPU_ARCH = x86
-OS_CFLAGS+= -DX86_LINUX
endif
GFX_ARCH = x
@@ -65,14 +64,6 @@
ASFLAGS += -x assembler-with-cpp
-ifeq ($(CPU_ARCH),alpha)
-
-# Ask the C compiler on alpha linux to let us work with denormalized
-# double values, which are required by the ECMA spec.
-
-OS_CFLAGS += -mieee
-endif
-
# Use the editline library to provide line-editing support.
JS_EDITLINE = 1
diff -uNr js/src/config/Linux_All.mk js-patched/src/config/Linux_All.mk
--- js/src/config/Linux_All.mk 2005-05-10 15:53:44.000000000 -0400
+++ js-patched/src/config/Linux_All.mk 2007-05-29 10:39:35.000000000 -0400
@@ -41,37 +41,15 @@
# Config for all versions of Linux
#
-CC = gcc
-CCC = g++
CFLAGS += -Wall -Wno-format
OS_CFLAGS = -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE
-DHAVE_LOCALTIME_R
RANLIB = echo
-MKSHLIB = $(LD) -shared $(XMKSHLIBOPTS)
+MKSHLIB = $(LD) -shared $(XMKSHLIBOPTS) -soname $(notdir $@)
#.c.o:
# $(CC) -c -MD $*.d $(CFLAGS) $<
-CPU_ARCH = $(shell uname -m)
-# don't filter in x86-64 architecture
-ifneq (x86_64,$(CPU_ARCH))
-ifeq (86,$(findstring 86,$(CPU_ARCH)))
-CPU_ARCH = x86
-OS_CFLAGS+= -DX86_LINUX
-
-ifeq (gcc, $(CC))
-# if using gcc on x86, check version for opt bug
-# (http://bugzilla.mozilla.org/show_bug.cgi?id=24892)
-GCC_VERSION := $(shell gcc -v 2>&1 | grep version | awk '{ print $$3 }')
-GCC_LIST:=$(sort 2.91.66 $(GCC_VERSION) )
-
-ifeq (2.91.66, $(firstword $(GCC_LIST)))
-CFLAGS+= -DGCC_OPT_BUG
-endif
-endif
-endif
-endif
-
GFX_ARCH = x
OS_LIBS = -lm -lc
@@ -88,16 +66,6 @@
endif
# Use the editline library to provide line-editing support.
-JS_EDITLINE = 1
+JS_READLINE = 1
-ifeq ($(CPU_ARCH),x86_64)
-# Use VA_COPY() standard macro on x86-64
-# FIXME: better use it everywhere
OS_CFLAGS += -DHAVE_VA_COPY -DVA_COPY=va_copy
-endif
-
-ifeq ($(CPU_ARCH),x86_64)
-# We need PIC code for shared libraries
-# FIXME: better patch rules.mk & fdlibm/Makefile*
-OS_CFLAGS += -DPIC -fPIC
-endif
diff -uNr js/src/config.mk js-patched/src/config.mk
--- js/src/config.mk 2003-11-14 19:10:55.000000000 -0500
+++ js-patched/src/config.mk 2007-05-29 10:39:35.000000000 -0400
@@ -112,6 +112,8 @@
CP = cp
endif
+BUILD_OPT := 1
+
ifdef BUILD_OPT
OPTIMIZER = -O
DEFINES += -UDEBUG -DNDEBUG -UDEBUG_$(shell whoami)
diff -uNr js/src/fdlibm/Makefile.ref js-patched/src/fdlibm/Makefile.ref
--- js/src/fdlibm/Makefile.ref 2003-11-14 19:11:04.000000000 -0500
+++ js-patched/src/fdlibm/Makefile.ref 2007-05-29 10:39:35.000000000 -0400
@@ -151,7 +151,7 @@
$(OBJDIR)/%.o: %.c
@$(MAKE_OBJDIR)
- $(CC) -o $@ -c $(CFLAGS) $*.c
+ $(CC) -o $@ -c $(CFLAGS) $*.c -fPIC
$(OBJDIR)/%.o: %.s
@$(MAKE_OBJDIR)
diff -uNr js/src/rules.mk js-patched/src/rules.mk
--- js/src/rules.mk 2003-11-14 19:11:04.000000000 -0500
+++ js-patched/src/rules.mk 2007-05-29 10:39:35.000000000 -0400
@@ -82,6 +82,10 @@
@$(MAKE_OBJDIR)
$(CC) -o $@ -c $(CFLAGS) $*.c
+$(OBJDIR)/%.lo: %.c
+ @$(MAKE_OBJDIR)
+ $(CC) -o $@ -c $(CFLAGS) $*.c -fPIC
+
$(OBJDIR)/%.o: %.s
@$(MAKE_OBJDIR)
$(AS) -o $@ $(ASFLAGS) $*.s
@@ -111,11 +115,12 @@
/implib:"$(OBJDIR)/$(@F:.dll=.lib)" $^
else
$(LIBRARY): $(LIB_OBJS)
- $(AR) rv $@ $?
+ $(AR) cr $@ $?
$(RANLIB) $@
-$(SHARED_LIBRARY): $(LIB_OBJS)
- $(MKSHLIB) -o $@ $(LIB_OBJS) $(LDFLAGS) $(OTHER_LIBS)
+SHARED_LIB_OBJS := $(LIB_OBJS:.o=.lo)
+$(SHARED_LIBRARY): $(SHARED_LIB_OBJS)
+ $(MKSHLIB) -o $@ $(SHARED_LIB_OBJS) $(LDFLAGS) $(OTHER_LIBS)
-install_name $(PREFIX)/lib/$(notdir $@)
endif
endif
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
