public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in dev-java/jdbc-mysql/files: 5.1.6-java6-detection.patch
@ 2008-07-08 22:21 Petteri Raty (betelgeuse)
  0 siblings, 0 replies; 2+ messages in thread
From: Petteri Raty (betelgeuse) @ 2008-07-08 22:21 UTC (permalink / raw
  To: gentoo-commits

betelgeuse    08/07/08 22:21:52

  Added:                5.1.6-java6-detection.patch
  Log:
  Version bump. Provides a jdbc4 driver that is always built but optional at runtime so DEPEND on two different JDK versions. Fixes bug #215858.
  (Portage version: 2.2_rc1/cvs/Linux 2.6.25-gentoo-r5 i686)

Revision  Changes    Path
1.1                  dev-java/jdbc-mysql/files/5.1.6-java6-detection.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jdbc-mysql/files/5.1.6-java6-detection.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jdbc-mysql/files/5.1.6-java6-detection.patch?rev=1.1&content-type=text/plain

Index: 5.1.6-java6-detection.patch
===================================================================
Index: build.xml
===================================================================
--- build.xml	(revision 6792)
+++ build.xml	(working copy)
@@ -97,7 +97,7 @@
 		
 	<target name="-compiler-check">
 		<if>
-			<and>	
+			<or>	
 				<not>
 					<or>
 						<equals arg1="${ant.java.version}" arg2="1.4" />
@@ -112,7 +112,7 @@
 						<available file="${com.mysql.jdbc.java6.rtjar}" />
 					</not>
 				</or>
-			</and>
+			</or>
 			<then>
 				<echo>This version of MySQL Connector/J requires a compiler from Java-1.4 or Java-1.5 to be used, set your JAVA_HOME property to point to one of these versions of the JDK.
 							



-- 
gentoo-commits@lists.gentoo.org mailing list



^ permalink raw reply	[flat|nested] 2+ messages in thread

* [gentoo-commits] gentoo-x86 commit in dev-java/jdbc-mysql/files: 5.1.6-java6-detection.patch
@ 2010-02-12 23:07 Vlastimil Babka (caster)
  0 siblings, 0 replies; 2+ messages in thread
From: Vlastimil Babka (caster) @ 2010-02-12 23:07 UTC (permalink / raw
  To: gentoo-commits

caster      10/02/12 23:07:42

  Removed:              5.1.6-java6-detection.patch
  Log:
  Do the same with 5.1.10, might help bug #292876 as well.
  (Portage version: 2.2_rc62/cvs/Linux x86_64)



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2010-02-12 23:07 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-07-08 22:21 [gentoo-commits] gentoo-x86 commit in dev-java/jdbc-mysql/files: 5.1.6-java6-detection.patch Petteri Raty (betelgeuse)
  -- strict thread matches above, loose matches on Subject: below --
2010-02-12 23:07 Vlastimil Babka (caster)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox