merge similar patches and make it honour better ldflags

Package-Manager: portage-2.2_rc13/cvs/Linux 2.6.27.4 x86_64

5 files changed, 33 insertions, 42 deletions

diff --git a/dev-lang/ocaml/ChangeLog b/dev-lang/ocaml/ChangeLog
index ecdfa8fd2b14..e94fe1852c66 100644
--- a/dev-lang/ocaml/ChangeLog
+++ b/dev-lang/ocaml/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/ocaml
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.150 2008/10/15 16:08:56 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.151 2008/11/07 09:59:10 aballier Exp $
+
+  07 Nov 2008; Alexis Ballier <aballier@gentoo.org>
+  -files/ocaml-3.11.0_beta1-call-ld-with-proper-ldflags.patch,
+  files/ocaml-3.11.0_beta1-configure.patch, ocaml-3.11.0_beta1.ebuild:
+  merge similar patches and make it honour better ldflags
 
 *ocaml-3.11.0_beta1 (15 Oct 2008)
 
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index b40619c38b02..9a58789502df 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -6,8 +6,7 @@ AUX ocaml-3.10.0-call-ld-with-proper-ldflags.patch 1497 RMD160 7eef667019e79f287
 AUX ocaml-3.10.0-configure.patch 5644 RMD160 1a63847a6e632f59fef8ff448b96bc45da15eae5 SHA1 6a030e48dd5fc399b985dd99e21b6c0e6b95a12e SHA256 f42e11db2d184532aa561b0b117f7ce5850bb50981ea997d08eee34f826360ac
 AUX ocaml-3.10.0-exec-stack-fixes.patch 9395 RMD160 00d5e1ac85a090baeaf9b9cba2e277c72bef5792 SHA1 15bc9692307f4781c3d01db7724869f7e9a401d7 SHA256 a260416a0fc1cf05ff3b2dceac83bd00043ee7ad6a8f2487934723f5b9f406da
 AUX ocaml-3.10.2-tk85.patch 2414 RMD160 1b8dc94de1c90264684a300f5f31ffce02e94cec SHA1 98c7a48c167500d3e7d8c34e79124dc0cedc315d SHA256 ba539578fbec539ff481b5fc786612d5e85b01cc2d6eee22a2f9ed340d2d0fd3
-AUX ocaml-3.11.0_beta1-call-ld-with-proper-ldflags.patch 1323 RMD160 b6bd9d0039d8daf03167655a5c398633c9d576b1 SHA1 079024c22e21d39e6dc804de8106cc11c222b6ea SHA256 c5f4d2aa54f9597933c4d5649821e7d947e32cd8367b6f38e7359dc16c0d4785
-AUX ocaml-3.11.0_beta1-configure.patch 562 RMD160 f012deda8e9d954b8dd968dd3feb3ced45ceaadb SHA1 e9f74f67b4a59032cb7347a25fb57e891202075d SHA256 353518154c90851a406f52b173cbc69f512ec593177db4c2bf4dec3ea8f9a061
+AUX ocaml-3.11.0_beta1-configure.patch 1250 RMD160 d34fbe9b23aedfc7c1bee1176b3b172f2da6790a SHA1 5d8cdecd30ec8d32c28882d2bd2e8fb1895cd1c4 SHA256 27350000be48d687440eb69526504d0a3c422623a305da671f8b94b1526be0b4
 AUX ocaml-3.11.0_beta1-exec-stack-fixes.patch 7262 RMD160 1a3d125b775494bf8e0f8d9b85edb101447d5756 SHA1 a0f762f089679f8f273ea0e44998a9c5e364ded7 SHA256 e8d7cded5ebc494df8be81764e80982cba0192d1e010472690ccff75e5d0e03b
 AUX ocaml-rebuild.sh 1253 RMD160 c9a261dc50239cb3cf8ee890bf0fa314903421d9 SHA1 7cfe5d413de41b1ae3761903549c6cb9af9b02b2 SHA256 99abe161795c6b6c7b4a180e3cc850fee2d175f9123858883ae181cc96851cae
 DIST ocaml-3.08.4.tar.bz2 2054019 RMD160 448ed9af56cacb9c32208d064e1c9732a2086bd2 SHA1 d9eb54611d24f9e1c33736f12c7ba87412057cbb SHA256 8d4322791d0dd424f355636ba50934ac17dbefde269736dad0da0683c8888684
@@ -15,13 +14,13 @@ DIST ocaml-3.10.2.tar.bz2 2284860 RMD160 f631230b090dbd9bf9a9f71631cd0347c033cbb
 DIST ocaml-3.11.0+beta1.tar.bz2 2366506 RMD160 bf5e0b6c2346b29ba43a23ac5603c0f09cef2080 SHA1 2d903961dc802d10ad0e07e3e9a44b425e66307b SHA256 a4190b6373d99b98c10fda82057b68785da13e76e141d55e6bfcb937d1956234
 EBUILD ocaml-3.08.4.ebuild 2532 RMD160 4f76d197232320e0450b7c847dc0006c10ff165b SHA1 4ca95ee897d20abb813855194fbd3206baff5813 SHA256 8d0dfe01e1186149e6e545d8227796b6e7976c6d3e6cc04aa8262c3d574ef252
 EBUILD ocaml-3.10.2.ebuild 4446 RMD160 79c3b1bfbfccb7ea3823f8d7f36f9b2280392d5a SHA1 43fabdb80ac1ba267f964a39ba07bc8d208d8c5a SHA256 27680e3e8e19e88e1ea35594771fca0494d5d5b69a515e5a738a743963b0949a
-EBUILD ocaml-3.11.0_beta1.ebuild 4298 RMD160 0bd96ef9c8b0841a059990cb1f3f6943750a8d4a SHA1 2bb7f777ced3025dc12edecb0da228acf3aa4cf0 SHA256 d1acc4a9f883a27470cd3c44a152a76ee935c4a43975974881220f4372076900
-MISC ChangeLog 23775 RMD160 4446bfe142a9d28f1660092b0d24f3e497676174 SHA1 ebaa63e0c91b3e309103524c04fd4d5853ff963b SHA256 86f0913a506e87aa3e90476912d2c6f812d094ca00d065d342fd10c43a84f20a
+EBUILD ocaml-3.11.0_beta1.ebuild 4098 RMD160 b64ffe46935335653e8afeb29d6087dfb42a9812 SHA1 b9baf6b656aeb08e79b2e3a3d3270e6c36e183de SHA256 eae143319e5b901e3ebb1938e41134fb08a3fa20c1c5b292abcc9d54714f1e94
+MISC ChangeLog 24020 RMD160 b15e923124dbb231dafa7ae6f1901f7123ee0acb SHA1 b3edb53c5f9d3f8cae76733607513deafb26911c SHA256 688232d1dcd9268568886a58de56cc2878a19bbf1fe7254015d02eea8524dba1
 MISC metadata.xml 155 RMD160 dfaa057e679b01302a807c75a32a910098b26809 SHA1 94024f83dcacbb53e92be090dd0f994ec93dc90d SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkj2FZ4ACgkQvFcC4BYPU0rT1QCghLOAMEi9YRi84G3COzvYREww
-LJcAoLmvFigqIV3sImmOJZ+KFTbReM9x
-=cb/3
+iEYEARECAAYFAkkUEXQACgkQvFcC4BYPU0qeFQCgtj3pPGyjogJIZCXkE1PmKIVO
+LlQAoMMBBmSNqCrtHR220KAea2VLcUAp
+=tURc
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ocaml/files/ocaml-3.11.0_beta1-call-ld-with-proper-ldflags.patch b/dev-lang/ocaml/files/ocaml-3.11.0_beta1-call-ld-with-proper-ldflags.patch
deleted file mode 100644
index 53e2febe6681..000000000000
--- a/dev-lang/ocaml/files/ocaml-3.11.0_beta1-call-ld-with-proper-ldflags.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-As we now support LDFLAGS in NATIVECCLINKOPTS
-it can happen that -Wl,--foo,--bar option is in that variable
-As ocaml happens to call ld with NATIVECCLINKOPTS
-we have to "translate" it so that ld doesn't bail out with unrecognized option
-Initial patch from Julien Cristau : http://caml.inria.fr/mantis/view.php?id=4142
-Modified a bit to catch comma separated options
-Index: ocaml-3.11.0+beta1/configure
-===================================================================
---- ocaml-3.11.0+beta1.orig/configure
-+++ ocaml-3.11.0+beta1/configure
-@@ -1503,6 +1503,7 @@ fi
- bytecccompopts="$CFLAGS $bytecccompopts"
- bytecclinkopts="$LDFLAGS $bytecclinkopts"
- natdynlinkopts="$LDFLAGS $natdynlinkopts"
-+nativeccrawlinkopts="$RAW_LDFLAGS $nativecclinkopts"
- nativecclinkopts="$LDFLAGS $nativecclinkopts"
- nativecccompopts="$CFLAGS $nativecccompopts"
- nativeccprofopts="$nativecccompopts"
-@@ -1553,7 +1554,7 @@ echo "DEBUGGER=$debugger" >> Makefile
- echo "CC_PROFILE=$cc_profile" >> Makefile
- echo "SYSTHREAD_SUPPORT=$systhread_support" >> Makefile
- echo "PARTIALLD=$partialld" >> Makefile
--echo "PACKLD=\$(PARTIALLD) \$(NATIVECCLINKOPTS) -o " >> Makefile
-+echo "PACKLD=\$(PARTIALLD) $nativeccrawlinkopts -o " >> Makefile
- echo "DLLCCCOMPOPTS=$dllccompopts" >> Makefile
- echo "IFLEXDIR=$iflexdir" >> Makefile
- echo "O=o" >> Makefile
diff --git a/dev-lang/ocaml/files/ocaml-3.11.0_beta1-configure.patch b/dev-lang/ocaml/files/ocaml-3.11.0_beta1-configure.patch
index 31f8620b251e..411904c37a60 100644
--- a/dev-lang/ocaml/files/ocaml-3.11.0_beta1-configure.patch
+++ b/dev-lang/ocaml/files/ocaml-3.11.0_beta1-configure.patch
@@ -2,15 +2,34 @@ Index: ocaml-3.11.0+beta1/configure
 ===================================================================
 --- ocaml-3.11.0+beta1.orig/configure
 +++ ocaml-3.11.0+beta1/configure
-@@ -1494,6 +1494,11 @@ fi
+@@ -245,7 +245,7 @@ esac
+ # Configure the bytecode compiler
+ 
+ bytecc="$cc"
+-mkexe="\$(BYTECC)"
++mkexe="\$(BYTECC) \$(BYTECCLINKOPTS)"
+ bytecccompopts=""
+ bytecclinkopts=""
+ dllccompopts=""
+@@ -1500,6 +1500,12 @@ fi
  
  # Final twiddling of compiler options to work around known bugs
  
 +bytecccompopts="$CFLAGS $bytecccompopts"
 +bytecclinkopts="$LDFLAGS $bytecclinkopts"
 +natdynlinkopts="$LDFLAGS $natdynlinkopts"
++nativeccrawlinkopts="$RAW_LDFLAGS $nativecclinkopts"
 +nativecclinkopts="$LDFLAGS $nativecclinkopts"
 +nativecccompopts="$CFLAGS $nativecccompopts"
  nativeccprofopts="$nativecccompopts"
  case "$buggycc" in
    gcc.2.96)
+@@ -1548,7 +1554,7 @@ echo "DEBUGGER=$debugger" >> Makefile
+ echo "CC_PROFILE=$cc_profile" >> Makefile
+ echo "SYSTHREAD_SUPPORT=$systhread_support" >> Makefile
+ echo "PARTIALLD=$partialld" >> Makefile
+-echo "PACKLD=\$(PARTIALLD) \$(NATIVECCLINKOPTS) -o " >> Makefile
++echo "PACKLD=\$(PARTIALLD) $nativeccrawlinkopts -o " >> Makefile
+ echo "DLLCCCOMPOPTS=$dllccompopts" >> Makefile
+ echo "IFLEXDIR=$iflexdir" >> Makefile
+ echo "O=o" >> Makefile
diff --git a/dev-lang/ocaml/ocaml-3.11.0_beta1.ebuild b/dev-lang/ocaml/ocaml-3.11.0_beta1.ebuild
index 03d73bb5e68e..063188478699 100644
--- a/dev-lang/ocaml/ocaml-3.11.0_beta1.ebuild
+++ b/dev-lang/ocaml/ocaml-3.11.0_beta1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.11.0_beta1.ebuild,v 1.1 2008/10/15 16:08:56 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.11.0_beta1.ebuild,v 1.2 2008/11/07 09:59:10 aballier Exp $
 
 inherit flag-o-matic eutils multilib versionator toolchain-funcs
 
@@ -51,11 +51,6 @@ src_unpack() {
 	# ocaml has automagics on libX11 and gdbm
 	# http://caml.inria.fr/mantis/view.php?id=4278
 	epatch "${FILESDIR}/${PN}-3.10.0-automagic.patch"
-
-	# Call ld with proper flags, different from gcc ones
-	# This happens when calling ocamlc -pack
-	# See comment in the patch
-	epatch "${FILESDIR}/${PN}-3.11.0_beta1-call-ld-with-proper-ldflags.patch"
 }
 
 src_compile() {