kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use JAVALIBDIR to find JAR dependencies during the build

Browse source 
PR:		80271
Submitted by:	maintainer
This commit is contained in:
Herve Quiroz 2005-04-23 10:51:59 +00:00
parent 14663c511b
commit 01ed5103c5
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=133990
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
databases/mysql-connector-java/Makefile
View file

@ -25,7 +25,7 @@ USE_JAVA= yes
USE_ANT= yes USE_ANT= yes
JAVA_VERSION= 1.4+ JAVA_VERSION= 1.4+
ALL_TARGET= clean compile-driver ALL_TARGET= clean compile-driver
MAKE_ARGS= -Djavajardir=${JAVAJARDIR} MAKE_ARGS= -Djavalibdir=${JAVALIBDIR}
BUILDDIR= ${WRKDIR}/build-mysql-jdbc/${DISTNAME} BUILDDIR= ${WRKDIR}/build-mysql-jdbc/${DISTNAME}
.else .else

2
databases/mysql-connector-java/files/patch-build.xml
View file

@ -4,7 +4,7 @@
<include name="**/*.jar"/> <include name="**/*.jar"/>
</fileset> </fileset>
+ <fileset dir="${javajardir}"> + <fileset dir="${javalibdir}">
+ <include name="junit.jar"/> + <include name="junit.jar"/>
+ <include name="log4j.jar"/> + <include name="log4j.jar"/>
+ </fileset> + </fileset>

2
databases/mysql-connector-java50/Makefile
View file

@ -25,7 +25,7 @@ USE_JAVA= yes
USE_ANT= yes USE_ANT= yes
JAVA_VERSION= 1.4+ JAVA_VERSION= 1.4+
ALL_TARGET= clean compile-driver ALL_TARGET= clean compile-driver
MAKE_ARGS= -Djavajardir=${JAVAJARDIR} MAKE_ARGS= -Djavalibdir=${JAVALIBDIR}
BUILDDIR= ${WRKDIR}/build-mysql-jdbc/${DISTNAME} BUILDDIR= ${WRKDIR}/build-mysql-jdbc/${DISTNAME}
.else .else

2
databases/mysql-connector-java50/files/patch-build.xml
View file

@ -4,7 +4,7 @@
<include name="**/*.jar"/> <include name="**/*.jar"/>
</fileset> </fileset>
+ <fileset dir="${javajardir}"> + <fileset dir="${javalibdir}">
+ <include name="junit.jar"/> + <include name="junit.jar"/>
+ <include name="log4j.jar"/> + <include name="log4j.jar"/>
+ </fileset> + </fileset>