From 6a504236d38b5c41fd7b2b0811a3a77fdcd9281f Mon Sep 17 00:00:00 2001 From: Jay Freeman Date: Sun, 30 Mar 2008 08:48:20 +0000 Subject: Removing now broken Boost build from distribution. git-svn-id: http://svn.telesphoreo.org/trunk@195 514c082c-b64e-11dc-b46d-3d985efe055d --- data/boost/_metadata/description | 1 - data/boost/_metadata/license | 23 ------ data/boost/_metadata/maintainer | 1 - data/boost/_metadata/name | 1 - data/boost/_metadata/priority | 1 - data/boost/_metadata/section | 1 - data/boost/_metadata/version | 1 - data/boost/boost_1_34_1.tar.gz | Bin 16017741 -> 0 bytes data/boost/make.sh | 14 ---- data/boost/port.diff | 162 -------------------------------------- data/boost_/_metadata/description | 1 + data/boost_/_metadata/license | 23 ++++++ data/boost_/_metadata/maintainer | 1 + data/boost_/_metadata/name | 1 + data/boost_/_metadata/priority | 1 + data/boost_/_metadata/section | 1 + data/boost_/_metadata/version | 1 + data/boost_/boost_1_34_1.tar.gz | Bin 0 -> 16017741 bytes data/boost_/make.sh | 14 ++++ data/boost_/port.diff | 162 ++++++++++++++++++++++++++++++++++++++ 20 files changed, 205 insertions(+), 205 deletions(-) delete mode 100644 data/boost/_metadata/description delete mode 100644 data/boost/_metadata/license delete mode 120000 data/boost/_metadata/maintainer delete mode 100644 data/boost/_metadata/name delete mode 100644 data/boost/_metadata/priority delete mode 100644 data/boost/_metadata/section delete mode 100644 data/boost/_metadata/version delete mode 100644 data/boost/boost_1_34_1.tar.gz delete mode 100644 data/boost/make.sh delete mode 100644 data/boost/port.diff create mode 100644 data/boost_/_metadata/description create mode 100644 data/boost_/_metadata/license create mode 120000 data/boost_/_metadata/maintainer create mode 100644 data/boost_/_metadata/name create mode 100644 data/boost_/_metadata/priority create mode 100644 data/boost_/_metadata/section create mode 100644 data/boost_/_metadata/version create mode 100644 data/boost_/boost_1_34_1.tar.gz create mode 100644 data/boost_/make.sh create mode 100644 data/boost_/port.diff (limited to 'data') diff --git a/data/boost/_metadata/description b/data/boost/_metadata/description deleted file mode 100644 index 632f0918d..000000000 --- a/data/boost/_metadata/description +++ /dev/null @@ -1 +0,0 @@ -soon-to-be-standardized C++ class library diff --git a/data/boost/_metadata/license b/data/boost/_metadata/license deleted file mode 100644 index 36b7cd93c..000000000 --- a/data/boost/_metadata/license +++ /dev/null @@ -1,23 +0,0 @@ -Boost Software License - Version 1.0 - August 17th, 2003 - -Permission is hereby granted, free of charge, to any person or organization -obtaining a copy of the software and accompanying documentation covered by -this license (the "Software") to use, reproduce, display, distribute, -execute, and transmit the Software, and to prepare derivative works of the -Software, and to permit third-parties to whom the Software is furnished to -do so, all subject to the following: - -The copyright notices in the Software and this entire statement, including -the above license grant, this restriction and the following disclaimer, -must be included in all copies of the Software, in whole or in part, and -all derivative works of the Software, unless such copies or derivative -works are solely in the form of machine-executable object code generated by -a source language processor. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -DEALINGS IN THE SOFTWARE. diff --git a/data/boost/_metadata/maintainer b/data/boost/_metadata/maintainer deleted file mode 120000 index 0fa66e077..000000000 --- a/data/boost/_metadata/maintainer +++ /dev/null @@ -1 +0,0 @@ -../../../people/saurik \ No newline at end of file diff --git a/data/boost/_metadata/name b/data/boost/_metadata/name deleted file mode 100644 index 68c56d494..000000000 --- a/data/boost/_metadata/name +++ /dev/null @@ -1 +0,0 @@ -Boost diff --git a/data/boost/_metadata/priority b/data/boost/_metadata/priority deleted file mode 100644 index 134d9bc32..000000000 --- a/data/boost/_metadata/priority +++ /dev/null @@ -1 +0,0 @@ -optional diff --git a/data/boost/_metadata/section b/data/boost/_metadata/section deleted file mode 100644 index e0eb96881..000000000 --- a/data/boost/_metadata/section +++ /dev/null @@ -1 +0,0 @@ -Development diff --git a/data/boost/_metadata/version b/data/boost/_metadata/version deleted file mode 100644 index a95a46d9f..000000000 --- a/data/boost/_metadata/version +++ /dev/null @@ -1 +0,0 @@ -1.34.1 diff --git a/data/boost/boost_1_34_1.tar.gz b/data/boost/boost_1_34_1.tar.gz deleted file mode 100644 index da01fdb6b..000000000 Binary files a/data/boost/boost_1_34_1.tar.gz and /dev/null differ diff --git a/data/boost/make.sh b/data/boost/make.sh deleted file mode 100644 index 75f76d8a4..000000000 --- a/data/boost/make.sh +++ /dev/null @@ -1,14 +0,0 @@ -shopt -s extglob -tar -zxvf "${PKG_DATA}/boost_1_34_1.tar.gz" -cd boost_1_34_1 -pkg:patch -./configure --prefix=/usr --without-icu --without-libraries=python -echo 'using darwin ;' >user-config.jam -make -make install PREFIX="${PKG_DEST}/usr" -rm -f "${PKG_DEST}"/usr/lib/*-d?(-+([0-9_])).@(a|dylib) -for na in "${PKG_DEST}"/usr/lib/*-+([0-9_]).a; do - a=${na/-+([0-9_]).a/.a} - rm -f "$a" - ln -s "$(basename "$na")" "$a" -done diff --git a/data/boost/port.diff b/data/boost/port.diff deleted file mode 100644 index c1747eeb4..000000000 --- a/data/boost/port.diff +++ /dev/null @@ -1,162 +0,0 @@ -diff -ru boost_1_34_1/boost/test/impl/execution_monitor.ipp boost_1_34_1+iPhone/boost/test/impl/execution_monitor.ipp ---- boost_1_34_1/boost/test/impl/execution_monitor.ipp 2006-02-22 16:14:45.000000000 +0000 -+++ boost_1_34_1+iPhone/boost/test/impl/execution_monitor.ipp 2007-12-29 13:59:38.000000000 +0000 -@@ -85,7 +85,9 @@ - - # include - # include -+extern "C" { - # include -+} - - #else - -diff -ru boost_1_34_1/configure boost_1_34_1+iPhone/configure ---- boost_1_34_1/configure 2007-05-09 22:09:39.000000000 +0000 -+++ boost_1_34_1+iPhone/configure 2007-12-29 14:31:08.000000000 +0000 -@@ -339,8 +339,8 @@ - @cd status && ../\$(BJAM) \$(BJAM_CONFIG) --user-config=../user-config.jam || echo "Some Boost regression tests failed. This is normal for many compilers." - - install: .dummy -- @echo "\$(BJAM) \$(BJAM_CONFIG) --user-config=user-config.jam --prefix=\$(PREFIX) --exec-prefix=\$(EPREFIX) --libdir=\$(LIBDIR) --includedir=\$(INCLUDEDIR) \$(LIBS) install" -- @\$(BJAM) \$(BJAM_CONFIG) --user-config=user-config.jam --prefix=\$(PREFIX) --exec-prefix=\$(EPREFIX) --libdir=\$(LIBDIR) --includedir=\$(INCLUDEDIR) \$(LIBS) install || echo "Not all Boost libraries built properly." -+ @echo "\$(BJAM) \$(BJAM_CONFIG) --user-config=user-config.jam --prefix=\$(PREFIX) \$(LIBS) install" -+ @\$(BJAM) \$(BJAM_CONFIG) --user-config=user-config.jam --prefix=\$(PREFIX) \$(LIBS) install || echo "Not all Boost libraries built properly." - - .dummy: - -diff -ru boost_1_34_1/libs/serialization/build/Jamfile.v2 boost_1_34_1+iPhone/libs/serialization/build/Jamfile.v2 ---- boost_1_34_1/libs/serialization/build/Jamfile.v2 2006-03-06 08:20:39.000000000 +0000 -+++ boost_1_34_1+iPhone/libs/serialization/build/Jamfile.v2 2007-12-29 13:50:00.000000000 +0000 -@@ -60,11 +60,3 @@ - : - : shared:BOOST_SERIALIZATION_DYN_LINK=1 - ; -- --lib boost_wserialization -- : $(WSOURCES).cpp boost_serialization -- : msvc:/Gy -- shared:BOOST_WSERIALIZATION_DYN_LINK=1 -- : -- : shared:BOOST_SERIALIZATION_DYN_LINK=1 -- ; -diff -ru boost_1_34_1/tools/build/v2/test/BoostBuild.py boost_1_34_1+iPhone/tools/build/v2/test/BoostBuild.py ---- boost_1_34_1/tools/build/v2/test/BoostBuild.py 2006-11-10 07:41:29.000000000 +0000 -+++ boost_1_34_1+iPhone/tools/build/v2/test/BoostBuild.py 2007-12-29 09:35:11.000000000 +0000 -@@ -43,8 +43,7 @@ - if toolset in ["gcc"]: - suffixes['.lib'] = '.a' # static libs have '.a' suffix with mingw... - suffixes['.obj'] = '.o' -- if os.__dict__.has_key('uname') and os.uname()[0] == 'Darwin': -- suffixes['.dll'] = '.dylib' -+ suffixes['.dll'] = '.dylib' - - def re_remove(sequence,regex): - me = re.compile(regex) -diff -ru boost_1_34_1/tools/build/v2/tools/darwin.jam boost_1_34_1+iPhone/tools/build/v2/tools/darwin.jam ---- boost_1_34_1/tools/build/v2/tools/darwin.jam 2007-03-15 04:02:23.000000000 +0000 -+++ boost_1_34_1+iPhone/tools/build/v2/tools/darwin.jam 2007-12-29 13:45:29.000000000 +0000 -@@ -31,7 +31,7 @@ - rule init ( version ? : command * : options * ) - { - local condition = [ common.check-init-parameters darwin : version $(version) ] ; -- local command = [ common.get-invocation-command darwin : g++ : $(command) ] ; -+ local command = [ common.get-invocation-command darwin : arm-apple-darwin-g++ : $(command) ] ; - - common.handle-options darwin : $(condition) : $(command) : $(options) ; - -@@ -42,6 +42,7 @@ - flags darwin.compile.c++ OPTIONS : -fcoalesce-templates ; - } - -+ #flags darwin.compile.c++ OPTIONS : -v ; - gcc.init-link-flags darwin darwin $(condition) ; - - flags darwin.link NEED_STRIP $(condition)/off : "" ; -@@ -86,7 +87,7 @@ - - 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 -single_module -L"$(LINKPATH)" -o "$(<)" "$(>)" "$(LIBRARIES)" -l$(FINDLIBS-SA) -l$(FINDLIBS-ST) $(FRAMEWORK_PATH) -framework$(_)$(FRAMEWORK:D=:S=) $(OPTIONS) $(USER_OPTIONS) - } - - actions piecemeal archive -diff -ru boost_1_34_1/tools/build/v2/tools/gcc.jam boost_1_34_1+iPhone/tools/build/v2/tools/gcc.jam ---- boost_1_34_1/tools/build/v2/tools/gcc.jam 2007-06-12 04:47:49.000000000 +0000 -+++ boost_1_34_1+iPhone/tools/build/v2/tools/gcc.jam 2007-12-29 09:30:15.000000000 +0000 -@@ -62,7 +62,7 @@ - { - # Information about the gcc command... - # The command. -- local command = [ common.get-invocation-command gcc : g++ : $(command) ] ; -+ local command = [ common.get-invocation-command gcc : arm-apple-darwin-g++ : $(command) ] ; - # The root directory of the tool install. - local root = [ feature.get-values : $(options) ] ; - # The bin directory where to find the command to execute. -@@ -109,17 +109,7 @@ - common.handle-options gcc : $(condition) : $(command) : $(options) ; - - local linker = [ feature.get-values : $(options) ] ; -- if ! $(linker) { -- -- if [ os.name ] = OSF -- { -- linker = osf ; -- } -- else -- { -- linker = gnu ; -- } -- } -+ linker = darwin ; - init-link-flags gcc $(linker) $(condition) ; - - -@@ -310,14 +300,6 @@ - # to implement and will increase target path length even more. - flags gcc.compile OPTIONS shared : -fPIC ; - } --if [ os.name ] != NT && [ os.name ] != OSF --{ -- # OSF does have an option called -soname but it doesn't seem to work as -- # expected, therefore it has been disabled. -- -- HAVE_SONAME = "" ; -- SONAME_OPTION = -h ; --} - - - -@@ -629,7 +611,7 @@ - # Differ from 'link' above only by -shared. - actions link.dll bind LIBRARIES - { -- "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,"$(RPATH)" "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) -shared $(START-GROUP) "$(>)" "$(LIBRARIES)" -l$(FINDLIBS-ST) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS) -+ "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,"$(RPATH)" "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) -dynamiclib $(START-GROUP) "$(>)" "$(LIBRARIES)" -l$(FINDLIBS-ST) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS) - } - - # Set up threading support. It's somewhat contrived, so perform it at the end, -diff -ru boost_1_34_1/tools/jam/src/jam.c boost_1_34_1+iPhone/tools/jam/src/jam.c ---- boost_1_34_1/tools/jam/src/jam.c 2005-11-15 05:44:03.000000000 +0000 -+++ boost_1_34_1+iPhone/tools/jam/src/jam.c 2007-12-29 09:28:28.000000000 +0000 -@@ -375,7 +375,7 @@ - list_new( - list_new( - list_new( L0, -- newstr( u.sysname ) ), -+ newstr( "Darwin" ) ), - newstr( u.nodename ) ), - newstr( u.release ) ), - newstr( u.version ) ), -diff -ru boost_1_34_1/tools/jam/src/jam.h boost_1_34_1+iPhone/tools/jam/src/jam.h ---- boost_1_34_1/tools/jam/src/jam.h 2005-10-16 15:34:27.000000000 +0000 -+++ boost_1_34_1+iPhone/tools/jam/src/jam.h 2007-12-29 09:42:21.000000000 +0000 -@@ -556,4 +556,7 @@ - # define DEBUG_GRAPH ( globs.debug[ 12 ] ) /* debug dependencies */ - # define DEBUG_FATE ( globs.debug[ 13 ] ) /* show changes to fate in make0() */ - -+# undef OSMINOR -+# define OSMINOR "OS=MACOSX" -+ - #endif diff --git a/data/boost_/_metadata/description b/data/boost_/_metadata/description new file mode 100644 index 000000000..632f0918d --- /dev/null +++ b/data/boost_/_metadata/description @@ -0,0 +1 @@ +soon-to-be-standardized C++ class library diff --git a/data/boost_/_metadata/license b/data/boost_/_metadata/license new file mode 100644 index 000000000..36b7cd93c --- /dev/null +++ b/data/boost_/_metadata/license @@ -0,0 +1,23 @@ +Boost Software License - Version 1.0 - August 17th, 2003 + +Permission is hereby granted, free of charge, to any person or organization +obtaining a copy of the software and accompanying documentation covered by +this license (the "Software") to use, reproduce, display, distribute, +execute, and transmit the Software, and to prepare derivative works of the +Software, and to permit third-parties to whom the Software is furnished to +do so, all subject to the following: + +The copyright notices in the Software and this entire statement, including +the above license grant, this restriction and the following disclaimer, +must be included in all copies of the Software, in whole or in part, and +all derivative works of the Software, unless such copies or derivative +works are solely in the form of machine-executable object code generated by +a source language processor. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. diff --git a/data/boost_/_metadata/maintainer b/data/boost_/_metadata/maintainer new file mode 120000 index 000000000..0fa66e077 --- /dev/null +++ b/data/boost_/_metadata/maintainer @@ -0,0 +1 @@ +../../../people/saurik \ No newline at end of file diff --git a/data/boost_/_metadata/name b/data/boost_/_metadata/name new file mode 100644 index 000000000..68c56d494 --- /dev/null +++ b/data/boost_/_metadata/name @@ -0,0 +1 @@ +Boost diff --git a/data/boost_/_metadata/priority b/data/boost_/_metadata/priority new file mode 100644 index 000000000..134d9bc32 --- /dev/null +++ b/data/boost_/_metadata/priority @@ -0,0 +1 @@ +optional diff --git a/data/boost_/_metadata/section b/data/boost_/_metadata/section new file mode 100644 index 000000000..e0eb96881 --- /dev/null +++ b/data/boost_/_metadata/section @@ -0,0 +1 @@ +Development diff --git a/data/boost_/_metadata/version b/data/boost_/_metadata/version new file mode 100644 index 000000000..a95a46d9f --- /dev/null +++ b/data/boost_/_metadata/version @@ -0,0 +1 @@ +1.34.1 diff --git a/data/boost_/boost_1_34_1.tar.gz b/data/boost_/boost_1_34_1.tar.gz new file mode 100644 index 000000000..da01fdb6b Binary files /dev/null and b/data/boost_/boost_1_34_1.tar.gz differ diff --git a/data/boost_/make.sh b/data/boost_/make.sh new file mode 100644 index 000000000..b3ebe3312 --- /dev/null +++ b/data/boost_/make.sh @@ -0,0 +1,14 @@ +shopt -s extglob +pkg:extract +cd * +pkg:patch +./configure --prefix=/usr --without-icu --without-libraries=python +echo 'using darwin ;' >user-config.jam +make +make install PREFIX="${PKG_DEST}/usr" +rm -f "${PKG_DEST}"/usr/lib/*-d?(-+([0-9_])).@(a|dylib) +for na in "${PKG_DEST}"/usr/lib/*-+([0-9_]).a; do + a=${na/-+([0-9_]).a/.a} + rm -f "$a" + ln -s "$(basename "$na")" "$a" +done diff --git a/data/boost_/port.diff b/data/boost_/port.diff new file mode 100644 index 000000000..4a6ab6a9b --- /dev/null +++ b/data/boost_/port.diff @@ -0,0 +1,162 @@ +diff -ru boost_1_34_1/boost/test/impl/execution_monitor.ipp boost_1_34_1+iPhone/boost/test/impl/execution_monitor.ipp +--- boost_1_34_1/boost/test/impl/execution_monitor.ipp 2006-02-22 16:14:45.000000000 +0000 ++++ boost_1_34_1+iPhone/boost/test/impl/execution_monitor.ipp 2007-12-29 13:59:38.000000000 +0000 +@@ -85,7 +85,9 @@ + + # include + # include ++extern "C" { + # include ++} + + #else + +diff -ru boost_1_34_1/configure boost_1_34_1+iPhone/configure +--- boost_1_34_1/configure 2007-05-09 22:09:39.000000000 +0000 ++++ boost_1_34_1+iPhone/configure 2007-12-29 14:31:08.000000000 +0000 +@@ -339,8 +339,8 @@ + @cd status && ../\$(BJAM) \$(BJAM_CONFIG) --user-config=../user-config.jam || echo "Some Boost regression tests failed. This is normal for many compilers." + + install: .dummy +- @echo "\$(BJAM) \$(BJAM_CONFIG) --user-config=user-config.jam --prefix=\$(PREFIX) --exec-prefix=\$(EPREFIX) --libdir=\$(LIBDIR) --includedir=\$(INCLUDEDIR) \$(LIBS) install" +- @\$(BJAM) \$(BJAM_CONFIG) --user-config=user-config.jam --prefix=\$(PREFIX) --exec-prefix=\$(EPREFIX) --libdir=\$(LIBDIR) --includedir=\$(INCLUDEDIR) \$(LIBS) install || echo "Not all Boost libraries built properly." ++ @echo "\$(BJAM) \$(BJAM_CONFIG) --user-config=user-config.jam --prefix=\$(PREFIX) \$(LIBS) install" ++ @\$(BJAM) \$(BJAM_CONFIG) --user-config=user-config.jam --prefix=\$(PREFIX) \$(LIBS) install || echo "Not all Boost libraries built properly." + + .dummy: + +diff -ru boost_1_34_1/libs/serialization/build/Jamfile.v2 boost_1_34_1+iPhone/libs/serialization/build/Jamfile.v2 +--- boost_1_34_1/libs/serialization/build/Jamfile.v2 2006-03-06 08:20:39.000000000 +0000 ++++ boost_1_34_1+iPhone/libs/serialization/build/Jamfile.v2 2007-12-29 13:50:00.000000000 +0000 +@@ -60,11 +60,3 @@ + : + : shared:BOOST_SERIALIZATION_DYN_LINK=1 + ; +- +-lib boost_wserialization +- : $(WSOURCES).cpp boost_serialization +- : msvc:/Gy +- shared:BOOST_WSERIALIZATION_DYN_LINK=1 +- : +- : shared:BOOST_SERIALIZATION_DYN_LINK=1 +- ; +diff -ru boost_1_34_1/tools/build/v2/test/BoostBuild.py boost_1_34_1+iPhone/tools/build/v2/test/BoostBuild.py +--- boost_1_34_1/tools/build/v2/test/BoostBuild.py 2006-11-10 07:41:29.000000000 +0000 ++++ boost_1_34_1+iPhone/tools/build/v2/test/BoostBuild.py 2007-12-29 09:35:11.000000000 +0000 +@@ -43,8 +43,7 @@ + if toolset in ["gcc"]: + suffixes['.lib'] = '.a' # static libs have '.a' suffix with mingw... + suffixes['.obj'] = '.o' +- if os.__dict__.has_key('uname') and os.uname()[0] == 'Darwin': +- suffixes['.dll'] = '.dylib' ++ suffixes['.dll'] = '.dylib' + + def re_remove(sequence,regex): + me = re.compile(regex) +diff -ru boost_1_34_1/tools/build/v2/tools/darwin.jam boost_1_34_1+iPhone/tools/build/v2/tools/darwin.jam +--- boost_1_34_1/tools/build/v2/tools/darwin.jam 2007-03-15 04:02:23.000000000 +0000 ++++ boost_1_34_1+iPhone/tools/build/v2/tools/darwin.jam 2007-12-29 13:45:29.000000000 +0000 +@@ -31,7 +31,7 @@ + rule init ( version ? : command * : options * ) + { + local condition = [ common.check-init-parameters darwin : version $(version) ] ; +- local command = [ common.get-invocation-command darwin : g++ : $(command) ] ; ++ local command = [ common.get-invocation-command darwin : $(PKG_TARG)-g++ : $(command) ] ; + + common.handle-options darwin : $(condition) : $(command) : $(options) ; + +@@ -42,6 +42,7 @@ + flags darwin.compile.c++ OPTIONS : -fcoalesce-templates ; + } + ++ #flags darwin.compile.c++ OPTIONS : -v ; + gcc.init-link-flags darwin darwin $(condition) ; + + flags darwin.link NEED_STRIP $(condition)/off : "" ; +@@ -86,7 +87,7 @@ + + 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 -single_module -L"$(LINKPATH)" -o "$(<)" "$(>)" "$(LIBRARIES)" -l$(FINDLIBS-SA) -l$(FINDLIBS-ST) $(FRAMEWORK_PATH) -framework$(_)$(FRAMEWORK:D=:S=) $(OPTIONS) $(USER_OPTIONS) + } + + actions piecemeal archive +diff -ru boost_1_34_1/tools/build/v2/tools/gcc.jam boost_1_34_1+iPhone/tools/build/v2/tools/gcc.jam +--- boost_1_34_1/tools/build/v2/tools/gcc.jam 2007-06-12 04:47:49.000000000 +0000 ++++ boost_1_34_1+iPhone/tools/build/v2/tools/gcc.jam 2007-12-29 09:30:15.000000000 +0000 +@@ -62,7 +62,7 @@ + { + # Information about the gcc command... + # The command. +- local command = [ common.get-invocation-command gcc : g++ : $(command) ] ; ++ local command = [ common.get-invocation-command gcc : $(PKG_TARG)-g++ : $(command) ] ; + # The root directory of the tool install. + local root = [ feature.get-values : $(options) ] ; + # The bin directory where to find the command to execute. +@@ -109,17 +109,7 @@ + common.handle-options gcc : $(condition) : $(command) : $(options) ; + + local linker = [ feature.get-values : $(options) ] ; +- if ! $(linker) { +- +- if [ os.name ] = OSF +- { +- linker = osf ; +- } +- else +- { +- linker = gnu ; +- } +- } ++ linker = darwin ; + init-link-flags gcc $(linker) $(condition) ; + + +@@ -310,14 +300,6 @@ + # to implement and will increase target path length even more. + flags gcc.compile OPTIONS shared : -fPIC ; + } +-if [ os.name ] != NT && [ os.name ] != OSF +-{ +- # OSF does have an option called -soname but it doesn't seem to work as +- # expected, therefore it has been disabled. +- +- HAVE_SONAME = "" ; +- SONAME_OPTION = -h ; +-} + + + +@@ -629,7 +611,7 @@ + # Differ from 'link' above only by -shared. + actions link.dll bind LIBRARIES + { +- "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,"$(RPATH)" "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) -shared $(START-GROUP) "$(>)" "$(LIBRARIES)" -l$(FINDLIBS-ST) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS) ++ "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,"$(RPATH)" "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) -dynamiclib $(START-GROUP) "$(>)" "$(LIBRARIES)" -l$(FINDLIBS-ST) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS) + } + + # Set up threading support. It's somewhat contrived, so perform it at the end, +diff -ru boost_1_34_1/tools/jam/src/jam.c boost_1_34_1+iPhone/tools/jam/src/jam.c +--- boost_1_34_1/tools/jam/src/jam.c 2005-11-15 05:44:03.000000000 +0000 ++++ boost_1_34_1+iPhone/tools/jam/src/jam.c 2007-12-29 09:28:28.000000000 +0000 +@@ -375,7 +375,7 @@ + list_new( + list_new( + list_new( L0, +- newstr( u.sysname ) ), ++ newstr( "Darwin" ) ), + newstr( u.nodename ) ), + newstr( u.release ) ), + newstr( u.version ) ), +diff -ru boost_1_34_1/tools/jam/src/jam.h boost_1_34_1+iPhone/tools/jam/src/jam.h +--- boost_1_34_1/tools/jam/src/jam.h 2005-10-16 15:34:27.000000000 +0000 ++++ boost_1_34_1+iPhone/tools/jam/src/jam.h 2007-12-29 09:42:21.000000000 +0000 +@@ -556,4 +556,7 @@ + # define DEBUG_GRAPH ( globs.debug[ 12 ] ) /* debug dependencies */ + # define DEBUG_FATE ( globs.debug[ 13 ] ) /* show changes to fate in make0() */ + ++# undef OSMINOR ++# define OSMINOR "OS=MACOSX" ++ + #endif -- cgit v1.2.3