Ensure CXX from configure is used to compile prolog kernel. Closes bug #398821

Package-Manager: portage-2.1.10.41/cvs/Linux x86_64

diff --git a/dev-lang/qu-prolog/ChangeLog b/dev-lang/qu-prolog/ChangeLog
index 85060e303b4206a3adcfba8e7dcfd2cfb949a0a5..8e6484890f03f6b323ee1f84033ac3b98d3e75f0 100644 (file)
--- a/dev-lang/qu-prolog/ChangeLog
+++ b/dev-lang/qu-prolog/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/qu-prolog
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/ChangeLog,v 1.83 2011/11/19 18:20:30 keri Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/ChangeLog,v 1.84 2012/01/14 00:05:35 keri Exp $
+
+  14 Jan 2012; <keri@gentoo.org> files/qu-prolog-9.1-cflags.patch:
+  Ensure CXX from configure is used to compile prolog kernel. Closes bug
+  #398821
 
 *qu-prolog-9.1 (19 Nov 2011)
 

diff --git a/dev-lang/qu-prolog/Manifest b/dev-lang/qu-prolog/Manifest
index 83c784ca150c110ee909dc163c44c11e91d14f7e..e81d8a8d93e94f0b9ce65374fa7ec423ef83f3ea 100644 (file)
--- a/dev-lang/qu-prolog/Manifest
+++ b/dev-lang/qu-prolog/Manifest
@@ -8,7 +8,7 @@ AUX qu-prolog-9.0-cerr-ptr.patch 1413 RMD160 7d8f2193c7e71a259300a3e456e72a23044
 AUX qu-prolog-9.0-cflags.patch 822 RMD160 73c963cc2b72dc2775b0934bfdeaaa570cb28173 SHA1 4768e23b470edf2c48199d1a1d04a02c2799b6d2 SHA256 bff31e9e4d6d5edc109dca55370f5feb0c7a2b2cdedcadf11545d493611c39cf
 AUX qu-prolog-9.0-portage.patch 910 RMD160 58f3c985a65cd8b9d1ea516f3dda02935123e79d SHA1 af7e297ffdbf2f49953555ac581e13539c8d9fcf SHA256 d995eef707d64d96f586324d205c872e42ffe8bb0562dee6cf02c6151c382db6
 AUX qu-prolog-9.1-cerr-ptr.patch 1379 RMD160 d87fd5e8178d3858c2a1139cec32678a112a58c4 SHA1 95e38d2afde7cf09d7482b16f6ad1d2723861693 SHA256 dd9ac54f97e84d256f044d7e2f8d5c7470d8e39ab472fd7f55c6007f996234c9
-AUX qu-prolog-9.1-cflags.patch 764 RMD160 fab0b49fcefd59a90b43c7a4abd9432d6d393885 SHA1 76715c5068df0c2680142b29d0b7b9ec917da5fe SHA256 97e52f8a7e06ad56e628261eb36bede4b19e9915851f45ef09f08089a41754fc
+AUX qu-prolog-9.1-cflags.patch 1089 RMD160 bfdd73b8f90df4fadac090951279cf7e6545f9a9 SHA1 466f98b44d92341aa450693377fbdb38cb54bf36 SHA256 67b6cc6c4009b4bfd8578d5006d5d0fc1b6f7a50368ce078a4a97610a559521b
 AUX qu-prolog-9.1-portage.patch 910 RMD160 bca9f39f520d09948c210807f49b2496bc4a970b SHA1 74ad5801698c0c6236168ce4ec106f7289670029 SHA256 d1565bd511cec886a6858db156957388029854c28338bb3d76e494e0ef9c5a95
 DIST qp8.12.tar.gz 1459424 RMD160 d67b99a79e449bea7aefd43b841996373fb88717 SHA1 08e16e10b6ba4053c49a7c733ef955e18d6f941b SHA256 a184a9bf7feae32340c923fb74de84b0154abe665b1708d6fb9ee644cc0ad706
 DIST qp9.0.tar.gz 1460127 RMD160 fe2e6dcde878e2b17e56cddfaf64f956800c58c7 SHA1 291529c79964737990d901948f615d45905cce5a SHA256 0694c8f5c894e86bab252badec4394c37cdd800648c521bae6a2d7ad7470f32c
@@ -16,12 +16,12 @@ DIST qp9.1.tar.gz 1460679 RMD160 63dd1f7fb8c78963b4d62470277bec5e2c54468e SHA1 a
 EBUILD qu-prolog-8.12.ebuild 2223 RMD160 73f751753af88c8ce4ce670612d4c75168cdd7e8 SHA1 25327417c977992ac2d36327e91e7fc68c140c5d SHA256 9401e710d12c44d51a09524c9676d67f82e683d1940b2093b7aa5052126c6e4c
 EBUILD qu-prolog-9.0.ebuild 2223 RMD160 dbe29467f73bf4c8f5b0ebb58768de5bc522102c SHA1 d2bf6d6d68dcc2b55e1c85fc2a453ab4d9266d28 SHA256 cede7069c150963de0f111b637bb5f61bd5436350cc2623e6550f8323d79d2ab
 EBUILD qu-prolog-9.1.ebuild 2223 RMD160 f150f0ff40d928ba1212149b9b1ad45909ab1fa0 SHA1 ad844dcfd206b6eada9a3cdb3b47d2f7f8da9ff7 SHA256 4c11595afa071880afb9c6e903bce413052bf42da6cf02d99974f916d2b87d7a
-MISC ChangeLog 13039 RMD160 242a7655d84c9c819f35103e6a653b94301f04df SHA1 1fd25445a0da3dc2cb5c871ac1560a01029af9a0 SHA256 6cf23be06dec7f23d2231aa3f2a8f7addc8b6254902139595797eab289863692
+MISC ChangeLog 13190 RMD160 253a0589b846cf709ecb470b40167b084a79e4e6 SHA1 946f8afb35b5bce22d380a3a5e03cf995a3e133f SHA256 6672e15c4b885e9fdee7c5709a1ef0cc344373ec687951905d5398484caf314a
 MISC metadata.xml 253 RMD160 ea7e80996ca5a6be3e86029423c98a3d1e73d308 SHA1 8fb0ee89e6a096f996ce4d0f086bfffbd24de7a5 SHA256 6d9eecc1943fb38e5b6a96bb4d1242df633c2f1b890f7f1e701f824e720435d9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk7H83gACgkQrwS/tqE49e2vzwCdGJIs7nyprASz1usDYuH5Vplz
-Md4An1JFHuiEDCOO1bj5Rgk0K2fWGJnW
-=2wxU
+iEYEARECAAYFAk8QxtsACgkQrwS/tqE49e2pvQCgjpeCmo0wFh0UBqRQTfuegRh7
+1q8AoJhPkoZOhlev8z8/eC3Oa297XKvc
+=fHZr
 -----END PGP SIGNATURE-----

diff --git a/dev-lang/qu-prolog/files/qu-prolog-9.1-cflags.patch b/dev-lang/qu-prolog/files/qu-prolog-9.1-cflags.patch
index 606dbd9a6abb47f0a2c87457dd22188d284cd804..f53eb067b1fdb4c90038353606119821169a9724 100644 (file)
--- a/dev-lang/qu-prolog/files/qu-prolog-9.1-cflags.patch
+++ b/dev-lang/qu-prolog/files/qu-prolog-9.1-cflags.patch
@@ -1,5 +1,18 @@
+diff -ur qp9.1.orig/Makefile.in qp9.1/Makefile.in
+--- qp9.1.orig/Makefile.in     2011-08-23 11:17:54.000000000 +1200
++++ qp9.1/Makefile.in  2012-01-14 12:57:16.000000000 +1300
+@@ -23,7 +23,7 @@
+ 
+ export PROLOG         = prolog
+ 
+-
++export CXX=@CXX@
+ 
+ .PHONY: all
+ all:  objects
+diff -ur qp9.1.orig/src/Makefile.in qp9.1/src/Makefile.in
 --- qp9.1.orig/src/Makefile.in 2011-08-23 11:17:54.000000000 +1200
-+++ qp9.1/src/Makefile.in      2011-11-20 07:15:06.000000000 +1300
++++ qp9.1/src/Makefile.in      2012-01-14 12:48:33.000000000 +1300
 @@ -40,7 +40,7 @@
  
  #export DEBUGGING=