diff options
author | Jeremy Blosser | 2006-04-24 20:39:30 -0500 |
---|---|---|
committer | Jeremy Blosser | 2006-04-24 20:39:30 -0500 |
commit | d8045f664cca485edd7e63631feac76232a5e6e2 (patch) | |
tree | 3f62838212939a2f9887e1a51158f733ba2b9447 /gnu/objc | |
parent | cd235351b4c58ffcc726bf1aaa83703b55fd4286 (diff) |
sync gnu/objc from test
Diffstat (limited to 'gnu/objc')
-rwxr-xr-x | gnu/objc/BUILD | 13 | ||||
-rwxr-xr-x | gnu/objc/DEPENDS | 6 | ||||
-rwxr-xr-x | gnu/objc/DETAILS | 6 | ||||
-rw-r--r-- | gnu/objc/HISTORY | 35 | ||||
-rwxr-xr-x | gnu/objc/POST_RESURRECT | 2 | ||||
-rw-r--r-- | gnu/objc/specs_objc | 2 |
6 files changed, 49 insertions, 15 deletions
diff --git a/gnu/objc/BUILD b/gnu/objc/BUILD index 33dcafa51e..b06e6cdcca 100755 --- a/gnu/objc/BUILD +++ b/gnu/objc/BUILD @@ -1,5 +1,13 @@ -source $DEPENDS_CONFIG/gcc.p && -cd $SOURCE_DIRECTORY.bld && +# take multilib option from GCC +# ignore return value as it is only available on x86_64 +persistent_read gcc GCC_MULTILIB GCC_MULTILIB +# get CFLAGS and LDFLAGS gcc was compiled with, see bug #10087 +persistent_read gcc GCC_CFLAGS CFLAGS && +persistent_read gcc GCC_LDFLAGS LDFLAGS && + +sedit "s/lib64/lib/" gcc/config/i386/linux64.h && + +cd $SOURCE_DIRECTORY.bld && $SOURCE_DIRECTORY/configure \ --host=$HOST \ --prefix=${INSTALL_ROOT}/usr \ @@ -8,6 +16,7 @@ $SOURCE_DIRECTORY/configure \ --enable-threads=posix \ --with-system-zlib \ --enable-languages=objc \ + $GCC_MULTILIB \ $OPTS && make CFLAGS="$CFLAGS" BOOT_CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ diff --git a/gnu/objc/DEPENDS b/gnu/objc/DEPENDS index 826e93ed42..6aa97c6122 100755 --- a/gnu/objc/DEPENDS +++ b/gnu/objc/DEPENDS @@ -1 +1,5 @@ -depends gcc +. $GRIMOIRE/libcompat && +depends gcc && +if [[ $VERSION != $(installed_version gcc) ]]; then + force_depends gcc +fi diff --git a/gnu/objc/DETAILS b/gnu/objc/DETAILS index 8a76640431..22be7d6e92 100755 --- a/gnu/objc/DETAILS +++ b/gnu/objc/DETAILS @@ -1,5 +1,7 @@ SPELL=objc - VERSION=3.4.5 + VERSION=4.0.3 + SOURCE_HASH=sha512:c15cb60d4881dde30425c4ce682bc7d9b9363c177e5ca7d2e05dc83181a29c805199ead946eef451fec17a834a5114bff63ea062c4b6de12243c86b2f7389c23 + SOURCE2_HASH=sha512:b1f116c8b943b8994a3112a70d93a19414282d47db84a2b27124530a0a52f283e2f11bc8641a91fff63cc102ebb203b993b4badf81fad4e7dc85253ffc067158 SOURCE=gcc-core-$VERSION.tar.bz2 SOURCE2=gcc-$SPELL-$VERSION.tar.bz2 SOURCE_DIRECTORY=$BUILD_DIRECTORY/gcc-$VERSION @@ -7,8 +9,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/gcc-$VERSION SOURCE_URL[1]=ftp://gcc.gnu.org/pub/gcc/releases/gcc-$VERSION/$SOURCE SOURCE2_URL[0]=$GNU_URL/gcc/gcc-$VERSION/$SOURCE2 SOURCE2_URL[1]=ftp://gcc.gnu.org/pub/gcc/releases/gcc-$VERSION/$SOURCE2 - SOURCE_HASH=sha512:997289b39e5605bac84c2a5d80a4e5dc2d24d4f1c742b494e4fbee4d0f16f64ae9ce860ccdc99c9764a29ec92ad066fd4faf5789fc5d7f49173eace263fe5c01 - SOURCE2_HASH=sha512:8a1a37da5ed9d3214bd50ffe6a83c367772bfd740ad13661a0a6eb84cb3ffb7ee524e795f778e3f5a776757219d8c99564978212ead43f8d22cf8dd476d82ea4 LICENSE[0]=GPL LICENSE[1]=GPL WEB_SITE=http://gcc.gnu.org/ diff --git a/gnu/objc/HISTORY b/gnu/objc/HISTORY index c9647eb93f..2b0afc4760 100644 --- a/gnu/objc/HISTORY +++ b/gnu/objc/HISTORY @@ -1,17 +1,36 @@ -2006-01-23 George Sherwood <george@beernabeer.com> - * DETAILS: Updated to 3.4.5 - * PRE_BUILD: Updated for unpack_file +2006-03-10 David Brown <dmlb2000@gmail.com> + * DETAILS: updated 4.0.3 -2005-11-23 Arwed v. Merkatz <v.merkatz@gmx.net> - * BUILD: source gcc configuration so GCC_MULTILIB is set correctly, - see bug #10119 +2006-03-07 Arwed v. Merkatz <v.merkatz@gmx.net> + * DEPENDS: use force_depends gcc if version doesn't match so it gets + recompiled -2005-06-03 David Brown <dmlb2000@excite.com> - * DETAILS: updated 3.4.4 +2006-02-19 Arwed v. Merkatz <v.merkatz@gmx.net> + * BUILD: persistent_read the CFLAGS and LDFLAGS of gcc and use them, + fixes bug #10087, persistent_read GCC_MULTILIB instead of sourcing + gcc.p + * POST_RESURRECT: setup specs file after resurrection (bug #8726) + +2005-10-02 Sergey Lipnevich <sergey@sourcemage.org> + * DETAILS: upgrade to 4.0.2; + * PRE_BUILD: use unpack_file API. + +2005-09-05 Seth Woolley <seth@tautology.org> + * BUILD: install to lib instead of lib64 on x86_64 + +2005-07-09 Arwed v. Merkatz <v.merkatz@gmx.net> + * DETAILS: updated to 4.0.1 2005-05-18 Arwed v. Merkatz <v.merkatz@gmx.net> * PRE_BUILD: return 1 if the current gcc isn't the same version +2005-04-23 Sergey Lipnevich <sergey@sourcemage.org> + * BUILD: use gcc's configuration for multilib option. + +2005-04-21 Arwed v. Merkatz <v.merkatz@gmx.net> + * DETAILS: updated to 4.0.0 + * specs_objc: updated + 2004-12-01 Eric Sandall <eric@sandall.us> * DETAILS: Updated to 3.4.3 Added LICENSE[1] for objc diff --git a/gnu/objc/POST_RESURRECT b/gnu/objc/POST_RESURRECT new file mode 100755 index 0000000000..b6c486727f --- /dev/null +++ b/gnu/objc/POST_RESURRECT @@ -0,0 +1,2 @@ +local SPECSDIR=${INSTALL_ROOT}/usr/lib/gcc/$HOST/$VERSION && +cat $SPECSDIR/specs-local/* > $SPECSDIR/specs diff --git a/gnu/objc/specs_objc b/gnu/objc/specs_objc index 8b9e19f33e..4f59a15b13 100644 --- a/gnu/objc/specs_objc +++ b/gnu/objc/specs_objc @@ -1,5 +1,5 @@ @objective-c: -%{E|M|MM:%(trad_capable_cpp) -lang-objc %(cpp_options) %(cpp_debug_options)} %{!E:%{!M:%{!MM: %{traditional|ftraditional|traditional-cpp: %eGNU Objective C no longer supports traditional compilation} %{save-temps|no-integrated-cpp:cc1obj -E %(cpp_options) -o %{save-temps:%b.mi} %{!save-temps:%g.mi} \n cc1obj -fpreprocessed %{save-temps:%b.mi} %{!save-temps:%g.mi} %(cc1_options) %{print-objc-runtime-info} %{gen-decls}} %{!save-temps:%{!no-integrated-cpp: cc1obj %(cpp_unique_options) %(cc1_options) %{print-objc-runtime-info} %{gen-decls}}} %{!fsyntax-only:%(invoke_as)}}}} +%{E|M|MM:cc1obj -E %{traditional|ftraditional|traditional-cpp:-traditional-cpp} %(cpp_options) %(cpp_debug_options)} %{!E:%{!M:%{!MM: %{traditional|ftraditional|traditional-cpp: %eGNU Objective C no longer supports traditional compilation} %{save-temps|no-integrated-cpp:cc1obj -E %(cpp_options) -o %{save-temps:%b.mi} %{!save-temps:%g.mi} \n cc1obj -fpreprocessed %{save-temps:%b.mi} %{!save-temps:%g.mi} %(cc1_options) %{print-objc-runtime-info} %{gen-decls}} %{!save-temps:%{!no-integrated-cpp: cc1obj %(cpp_unique_options) %(cc1_options) %{print-objc-runtime-info} %{gen-decls}}} %{!fsyntax-only:%(invoke_as)}}}} @objc-cpp-output: %{!M:%{!MM:%{!E:cc1obj -fpreprocessed %i %(cc1_options) %{print-objc-runtime-info} %{gen-decls} %{!fsyntax-only:%(invoke_as)}}}} |