Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv30900
Added Files:
boost1.34.info boost1.34.patch spidermonkey.info
spidermonkey.patch
Log Message:
move to stable to satisfy dependencies
--- NEW FILE: boost1.34.info ---
Info2: <<
Package: boost1.34.%type_pkg[python]
Version: 1.34.1
Revision: 1004
Type: python (nopython systempython python2.3 python2.4 python2.5)
Distribution: (%type_pkg[python] = python23) 10.3, (%type_pkg[python] =
python23) 10.4
License: BSD
Depends: %N-shlibs (= %v-%r)
BuildDepends: boost-jam, (%type_num[python]) %type_pkg[python], fink (>= 0.27.2)
BuildDependsOnly: True
#BuildConflicts: (%type_pkg[python] != nopython) python
Conflicts: <<
boost1.31, boost1.32-py23, boost1.32-py24, boost1.32.python, boost1.33,
boost-foreach,
(%type_pkg[python] != nopython) boost1.34.systempython,
(%type_pkg[python] != nopython) boost1.34.python23,
(%type_pkg[python] != nopython) boost1.34.python24,
(%type_pkg[python] != nopython) boost1.34.python25,
boost1.35.systempython,
boost1.35.python23,
boost1.35.python24,
boost1.35.python25,
boost1.35.nopython
<<
Replaces: <<
boost1.31, boost1.32-py23, boost1.32-py24, boost1.32.python, boost1.33,
boost-foreach,
boost1.34.systempython,
boost1.34.python23,
boost1.34.python24,
boost1.34.python25,
boost1.34.nopython,
boost1.35.systempython,
boost1.35.python23,
boost1.35.python24,
boost1.35.python25,
boost1.35.nopython
<<
Source: mirror:sourceforge:boost/boost_1_34_1.tar.bz2
SourceDirectory: boost_1_34_1
Source-MD5: 2d938467e8a448a2c9763e0a9f8ca7e5
Patch: %{ni}patch
PatchScript:<<
perl -pi -e 's|windows cygwin darwin|windows cygwin|'
tools/build/v2/tools/python.jam
<<
GCC: 4.0
SetMACOSX_DEPLOYMENT_TARGET: 10.3
CompileScript: <<
#!/bin/sh -ex
USEPYTHON='--with-python'
UNDEFINED='--undefined=-Wl,-flat_namespace,-undefined,dynamic_lookup'
case %type_pkg[python] in
nopython)
UNDEFINED=''
USEPYTHON='--without-python' ;;
python*)
echo "using python : : %p/bin/%type_raw[python] ; " >>
tools/build/v2/user-config.jam
LIBDIR='--libdir=%p/lib/%type_raw[python]/site-packages' ;;
*) ;;
esac
bjam --toolset=darwin $USEPYTHON --prefix=%p $LIBDIR $UNDEFINED
--compatibility_version=1.34.0 --current_version=1.34.1 release
<<
InstallScript: <<
#!/bin/sh -ex
[ '%type_pkg[python]' == 'nopython' ] && USEPYTHON='--without-python' ||
USEPYTHON='--with-python'
bjam --toolset=darwin $USEPYTHON --prefix=%i install release
ln -s boost-1_34_1/boost %i/include/boost
if [ '%type_pkg[python]' == 'nopython' ]; then
LIBS="date_time filesystem graph iostreams program_options \
regex serialization wserialization signals \
prg_exec_monitor unit_test_framework \
thread wave";
else
LIBS="python"
fi
for LIB in $LIBS;
do
if [ $LIB == "thread" ]; then
ln -s libboost_${LIB}-mt.dylib %i/lib/libboost_${LIB}.dylib
else
ln -s libboost_${LIB}-1_34_1.dylib %i/lib/libboost_${LIB}.dylib
# ln -s libboost_${LIB}-d-1_34_1.dylib %i/lib/libboost_${LIB}-d.dylib
fi
ln -s libboost_${LIB}-mt-1_34_1.dylib %i/lib/libboost_${LIB}-mt.dylib
# ln -s libboost_${LIB}-mt-d-1_34_1.dylib
%i/lib/libboost_${LIB}-mt-d.dylib
done
if [ -n '%type_num[python]' ]; then
mkdir -p %i/lib/%type_raw[python]/site-packages
mv %i/lib/libboost*1_34_1.dylib %i/lib/%type_raw[python]/site-packages
ln -sf %type_raw[python]/site-packages/libboost_python-1_34_1.dylib
%i/lib/libboost_python.dylib
ln -sf %type_raw[python]/site-packages/libboost_python-mt-1_34_1.dylib
%i/lib/libboost_python-mt.dylib
fi
# install the tools directory by hand
mkdir -p %i/lib/boost-1_34_1
/bin/cp -pR tools %i/lib/boost-1_34_1/
<<
Splitoff: <<
Package: %N-shlibs
Depends: ( %type_num[python] ) %type_pkg[python]-shlibs
Files: <<
( %type_raw[python] = systempython ) lib/libboost_python-1_34_1.dylib
( %type_raw[python] = systempython ) lib/libboost_python-mt-1_34_1.dylib
( %type_num[python] )
lib/%type_raw[python]/site-packages/libboost_python-1_34_1.dylib
( %type_num[python] )
lib/%type_raw[python]/site-packages/libboost_python-mt-1_34_1.dylib
( %type_raw[python] = nopython ) lib/libboost_date_time-1_34_1.dylib
( %type_raw[python] = nopython ) lib/libboost_filesystem-1_34_1.dylib
( %type_raw[python] = nopython ) lib/libboost_graph-1_34_1.dylib
( %type_raw[python] = nopython ) lib/libboost_iostreams-1_34_1.dylib
( %type_raw[python] = nopython ) lib/libboost_program_options-1_34_1.dylib
( %type_raw[python] = nopython ) lib/libboost_regex-1_34_1.dylib
( %type_raw[python] = nopython ) lib/libboost_serialization-1_34_1.dylib
( %type_raw[python] = nopython ) lib/libboost_wserialization-1_34_1.dylib
( %type_raw[python] = nopython ) lib/libboost_signals-1_34_1.dylib
( %type_raw[python] = nopython ) lib/libboost_prg_exec_monitor-1_34_1.dylib
( %type_raw[python] = nopython ) lib/libboost_unit_test_framework-1_34_1.dylib
( %type_raw[python] = nopython ) lib/libboost_wave-1_34_1.dylib
( %type_raw[python] = nopython ) lib/libboost_date_time-mt-1_34_1.dylib
( %type_raw[python] = nopython ) lib/libboost_filesystem-mt-1_34_1.dylib
( %type_raw[python] = nopython ) lib/libboost_graph-mt-1_34_1.dylib
( %type_raw[python] = nopython ) lib/libboost_iostreams-mt-1_34_1.dylib
( %type_raw[python] = nopython ) lib/libboost_program_options-mt-1_34_1.dylib
( %type_raw[python] = nopython ) lib/libboost_regex-mt-1_34_1.dylib
( %type_raw[python] = nopython ) lib/libboost_serialization-mt-1_34_1.dylib
( %type_raw[python] = nopython ) lib/libboost_wserialization-mt-1_34_1.dylib
( %type_raw[python] = nopython ) lib/libboost_signals-mt-1_34_1.dylib
( %type_raw[python] = nopython ) lib/libboost_prg_exec_monitor-mt-1_34_1.dylib
( %type_raw[python] = nopython )
lib/libboost_unit_test_framework-mt-1_34_1.dylib
( %type_raw[python] = nopython ) lib/libboost_thread-mt-1_34_1.dylib
( %type_raw[python] = nopython ) lib/libboost_wave-mt-1_34_1.dylib
<<
Shlibs: <<
( %type_raw[python] = nopython ) %p/lib/libboost_date_time-1_34_1.dylib
1.34.0 %n (>= 1.34.1-1)
( %type_raw[python] = nopython ) %p/lib/libboost_filesystem-1_34_1.dylib
1.34.0 %n (>= 1.34.1-1)
( %type_raw[python] = nopython ) %p/lib/libboost_graph-1_34_1.dylib 1.34.0 %n
(>= 1.34.1-1)
( %type_raw[python] = nopython ) %p/lib/libboost_iostreams-1_34_1.dylib
1.34.0 %n (>= 1.34.1-1)
( %type_raw[python] = nopython ) %p/lib/libboost_program_options-1_34_1.dylib
1.34.0 %n (>= 1.34.1-1)
( %type_raw[python] = nopython ) %p/lib/libboost_regex-1_34_1.dylib 1.34.0 %n
(>= 1.34.1-1)
( %type_raw[python] = nopython ) %p/lib/libboost_serialization-1_34_1.dylib
1.34.0 %n (>= 1.34.1-1)
( %type_raw[python] = nopython ) %p/lib/libboost_wserialization-1_34_1.dylib
1.34.0 %n (>= 1.34.1-1)
( %type_raw[python] = nopython ) %p/lib/libboost_signals-1_34_1.dylib 1.34.0
%n (>= 1.34.1-1)
( %type_raw[python] = nopython )
%p/lib/libboost_prg_exec_monitor-1_34_1.dylib 1.34.0 %n (>= 1.34.1-1)
( %type_raw[python] = nopython )
%p/lib/libboost_unit_test_framework-1_34_1.dylib 1.34.0 %n (>= 1.34.1-1)
( %type_raw[python] = nopython ) %p/lib/libboost_wave-1_34_1.dylib 1.34.0 %n
(>= 1.34.1-1)
( %type_raw[python] = nopython ) %p/lib/libboost_date_time-mt-1_34_1.dylib
1.34.0 %n (>= 1.34.1-1)
( %type_raw[python] = nopython ) %p/lib/libboost_filesystem-mt-1_34_1.dylib
1.34.0 %n (>= 1.34.1-1)
( %type_raw[python] = nopython ) %p/lib/libboost_graph-mt-1_34_1.dylib 1.34.0
%n (>= 1.34.1-1)
( %type_raw[python] = nopython ) %p/lib/libboost_iostreams-mt-1_34_1.dylib
1.34.0 %n (>= 1.34.1-1)
( %type_raw[python] = nopython )
%p/lib/libboost_program_options-mt-1_34_1.dylib 1.34.0 %n (>= 1.34.1-1)
( %type_raw[python] = nopython ) %p/lib/libboost_regex-mt-1_34_1.dylib 1.34.0
%n (>= 1.34.1-1)
( %type_raw[python] = nopython )
%p/lib/libboost_serialization-mt-1_34_1.dylib 1.34.0 %n (>= 1.34.1-1)
( %type_raw[python] = nopython )
%p/lib/libboost_wserialization-mt-1_34_1.dylib 1.34.0 %n (>= 1.34.1-1)
( %type_raw[python] = nopython ) %p/lib/libboost_signals-mt-1_34_1.dylib
1.34.0 %n (>= 1.34.1-1)
( %type_raw[python] = nopython )
%p/lib/libboost_prg_exec_monitor-mt-1_34_1.dylib 1.34.0 %n (>= 1.34.1-1)
( %type_raw[python] = nopython )
%p/lib/libboost_unit_test_framework-mt-1_34_1.dylib 1.34.0 %n (>= 1.34.1-1)
( %type_raw[python] = nopython ) %p/lib/libboost_thread-mt-1_34_1.dylib
1.34.0 %n (>= 1.34.1-1)
( %type_raw[python] = nopython ) %p/lib/libboost_wave-mt-1_34_1.dylib 1.34.0
%n (>= 1.34.1-1)
<<
DocFiles: LICENSE_1_0.txt README
Description: Boost C++ Libraries (shared libs)
DescUsage: <<
The libboost.python libraries are separated out into their own packages,
with different package names according to the python version with which
they are compatible.
The systempython variant uses the system Python framework and install the
libboost.python dylib into %p/lib.
The pythonXY variants use Fink's python packages and install the
libboost.python dylib into %/lib/pythonX.Y/site-packages.
The static libraries and the compile-time dylib symlinks
are installed into %p/lib in all cases.
Thus for linking, the link flag -L%p/lib is sufficient in all cases.
This version does not build the debug versions of the libraries.
If you want these, please contact the maintainer and vote for them.
<<
<<
DocFiles: LICENSE_1_0.txt README
Description: Boost C++ Libraries: static and source libs
DescDetail: <<
The Boost web site provides free peer-reviewed portable C++ source
libraries. The emphasis is on libraries which work well with the
C++ Standard Library. The libraries are intended to be widely useful,
and are in regular use by thousands of programmers across a broad
spectrum of applications.
A further goal is to establish "existing practice" and provide
reference implementations so that Boost libraries are suitable for
eventual standardization. Ten Boost libraries will be included in
the C++ Standards Committee's upcoming C++ Standard Library Technical
Report as a step toward becoming part of a future C++ Standard.
Although Boost was begun by members of the C++ Standards Committee
Library Working Group, participation has expanded to include thousands
of programmers from the C++ community at large.
<<
DescUsage: <<
The libboost.python libraries are separated out into their own packages,
with different package names according to the python version with which
they are compatible.
The nopython variant contains all others except the python libraries
The systempython variant uses the system Python framework and installs the
libboost.python dylib into %p/lib.
The pythonXY variants use Fink's python packages and install the
libboost.python dylib into %/lib/pythonX.Y/site-packages.
The static libraries and the compile-time dylib symlinks
are installed into %p/lib in all cases.
Thus for linking, the link flag -L%p/lib is sufficient in all cases.
This version does not build the debug versions of the libraries.
If you want these, please contact the maintainer and vote for them.
<<
DescPort: <<
Patch to darwin.jam teaches build-jam v2 to use
-install_name and -compatibility_version for the dylibs
and also -flat_namespace -undefined dynamic_lookup that
is needed for the python cylibs.
These are trasnmitted on the bjam command line by the options
--compatibility_version, --current_version and
--undefined
<<
DescPackaging: <<
Earlier versions by Mark Treiber.
libboost.python now in separate packages again.
All the -shlibs splitoffs are compatible with each other;
the other packages are builddendsonly, and the nopython variant
is compatible with any one of the 4 python variants;
these conflict with each other.
No debug versions, makes package 10 times smaller and twice faster to build.
<<
Maintainer: Martin Costabel <[EMAIL PROTECTED]>
Homepage: http://www.boost.org
<<
--- NEW FILE: boost1.34.patch ---
--- boost_1_34_1/tools/build/v2/tools/darwin.jam~ 2007-03-15
05:02:23.000000000 +0100
+++ boost_1_34_1/tools/build/v2/tools/darwin.jam 2007-08-03
21:52:40.000000000 +0200
@@ -12,6 +12,8 @@
import type ;
import common ;
import generators ;
+import os ;
+import option ;
toolset.register darwin ;
import gcc ;
@@ -82,11 +84,16 @@
rule link.dll
{
prepare-framework-path $(<) ;
+ local prefix = [ option.get prefix ] ;
+ LIB_INSTALL_DIR = [ option.get libdir : $(prefix)/lib ] ;
+ VERSIONINFO_COMP = [ option.get compatibility_version ] ;
+ VERSIONINFO_CUR = [ option.get current_version ] ;
+ UNDEFINED = [ option.get undefined ] ;
}
actions link.dll bind LIBRARIES
{
- $(CONFIG_COMMAND) -dynamiclib -L"$(LINKPATH)" -o "$(<)" "$(>)"
"$(LIBRARIES)" -l$(FINDLIBS-SA) -l$(FINDLIBS-ST) $(FRAMEWORK_PATH)
-framework$(_)$(FRAMEWORK:D=:S=) $(OPTIONS) $(USER_OPTIONS)
+ $(CONFIG_COMMAND) -dynamiclib $(UNDEFINED) -L"$(LINKPATH)" -o "$(<)"
"$(>)" "$(LIBRARIES)" -l$(FINDLIBS-SA) -l$(FINDLIBS-ST) $(FRAMEWORK_PATH)
-framework$(_)$(FRAMEWORK:D=:S=) $(OPTIONS) $(USER_OPTIONS) -install_name
$(<:D=$(LIB_INSTALL_DIR):S=.dylib) -compatibility_version $(VERSIONINFO_COMP)
-current_version $(VERSIONINFO_CUR)
}
actions piecemeal archive
--- NEW FILE: spidermonkey.info ---
Package: spidermonkey
Version: 1.7.0
Revision: 1
Epoch: 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 (= %e:%v-%r)
BuildDepends: <<
nspr,
readline5
<<
Source: mirror:custom:js-%v.tar.gz
Source-MD5: 5571134c3863686b623ebe4e6b1f6fe6
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 JS_HAS_FILE_OBJECT=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
Depends: %N-shlibs (= %e:%v-%r)
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: spidermonkey.patch ---
diff -uNr js/src/Makefile.ref js-new/src/Makefile.ref
--- js/src/Makefile.ref 2006-07-26 15:16:47.000000000 -0400
+++ js-new/src/Makefile.ref 2007-11-07 15:04:54.000000000 -0500
@@ -63,11 +63,11 @@
ifdef JS_THREADSAFE
DEFINES += -DJS_THREADSAFE
-INCLUDES += -I$(DIST)/include/nspr
+INCLUDES += [EMAIL PROTECTED]@/include/nspr
ifdef USE_MSVC
OTHER_LIBS += $(DIST)/lib/libnspr$(NSPR_LIBSUFFIX).lib
else
-OTHER_LIBS += -L$(DIST)/lib -lnspr$(NSPR_LIBSUFFIX)
+OTHER_LIBS += [EMAIL PROTECTED]@/lib -lnspr$(NSPR_LIBSUFFIX)
endif
endif
@@ -134,7 +134,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.
@@ -188,6 +188,8 @@
jsstr.h \
jsxdrapi.h \
jsxml.h \
+ jsutil.h \
+ jsprf.h \
$(NULL)
API_HFILES = \
@@ -373,3 +375,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-new/src/config/Darwin.mk
--- js/src/config/Darwin.mk 2007-02-05 11:24:49.000000000 -0500
+++ js-new/src/config/Darwin.mk 2007-11-07 15:06:22.000000000 -0500
@@ -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 -fno-common -pipe
+OS_CFLAGS = -DJS_THREADSAFE -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE
-DPOSIX_SOURCE -DDARWIN
RANLIB = ranlib
-MKSHLIB = $(CC) -dynamiclib $(XMKSHLIBOPTS) -framework System
+MKSHLIB = $(CC) -compatibility_version 1.0 -current_version 1.0 -framework
System -dynamiclib $(XMKSHLIBOPTS) -lm -lplds4 -lplc4 -lnspr4 $(LDFLAGS)
SO_SUFFIX = dylib
@@ -59,7 +59,6 @@
CPU_ARCH = $(shell uname -m)
ifeq (86,$(findstring 86,$(CPU_ARCH)))
CPU_ARCH = x86
-OS_CFLAGS+= -DX86_LINUX
endif
GFX_ARCH = x
@@ -67,14 +66,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-new/src/config/Linux_All.mk
--- js/src/config/Linux_All.mk 2005-05-10 15:53:44.000000000 -0400
+++ js-new/src/config/Linux_All.mk 2007-11-07 15:03:08.000000000 -0500
@@ -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-new/src/config.mk
--- js/src/config.mk 2006-07-27 17:00:57.000000000 -0400
+++ js-new/src/config.mk 2007-11-07 15:03:08.000000000 -0500
@@ -116,6 +116,8 @@
CP = cp
endif
+BUILD_OPT := 1
+
ifdef BUILD_OPT
OPTIMIZER = -O
DEFINES += -UDEBUG -DNDEBUG -UDEBUG_$(USER)
diff -uNr js/src/fdlibm/Makefile.ref js-new/src/fdlibm/Makefile.ref
--- js/src/fdlibm/Makefile.ref 2003-11-14 19:11:04.000000000 -0500
+++ js-new/src/fdlibm/Makefile.ref 2007-11-07 15:03:08.000000000 -0500
@@ -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-new/src/rules.mk
--- js/src/rules.mk 2006-07-06 22:12:02.000000000 -0400
+++ js-new/src/rules.mk 2007-11-07 15:03:08.000000000 -0500
@@ -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 the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
