Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 68197 Details for
Bug 105636
www-servers/tomcat and java5 / java1.5
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
tomcat-5.0.28-r4.ebuild.diff
tomcat-5.0.28-r4.ebuild.diff (text/plain), 2.75 KB, created by
Martin von Gagern
on 2005-09-11 15:04:16 UTC
(
hide
)
Description:
tomcat-5.0.28-r4.ebuild.diff
Filename:
MIME Type:
Creator:
Martin von Gagern
Created:
2005-09-11 15:04:16 UTC
Size:
2.75 KB
patch
obsolete
>--- /usr/portage/www-servers/tomcat/tomcat-5.0.28-r4.ebuild 2005-08-26 16:09:55.000000000 +0200 >+++ tomcat-5.0.28-r4.ebuild 2005-09-11 23:53:06.000000000 +0200 >@@ -24,7 +24,7 @@ > >=dev-java/commons-logging-1.0.4 > >=dev-java/commons-modeler-1.1 > >=dev-java/commons-pool-1.2 >- ~dev-java/jaxen-1.0 >+ dev-java/jaxen > >=dev-java/junit-3.8.1 > dev-java/jmx > >=dev-java/log4j-1.2.8 >@@ -54,6 +54,7 @@ > epatch ${FILESDIR}/${PV}/build.xml-02.patch > epatch ${FILESDIR}/${PV}/gentoo.diff > epatch ${FILESDIR}/${PV}/scripts.patch >+ epatch ${FILESDIR}/${PV}/java5.patch > use jikes && epatch ${FILESDIR}/${PV}/jikes.diff > > # avoid packed jars :-) >@@ -78,7 +79,7 @@ > java-pkg_jar-from servletapi-2.4 > > mkdir -p ../../server/lib && cd ../../server/lib >- java-pkg_jar-from commons-beanutils-1.7 commons-beanutils.jar >+ java-pkg_jar-from commons-beanutils commons-beanutils.jar > java-pkg_jar-from commons-digester > java-pkg_jar-from commons-fileupload > java-pkg_jar-from commons-modeler >@@ -86,9 +87,14 @@ > } > > src_compile(){ >- local antflags="-Dbase.path=${T}" >+ local antflags="-Dbase.path=${T}" jaxen_jar > use jikes && antflags="${antflags} -Dbuild.compiler=jikes" > >+ jaxen_jar=$(java-pkg_getjar jaxen-1.1 jaxen.jar 2>/dev/null) >+ if [ -z "${jaxen_jar}" ]; then >+ jaxen_jar=$(java-pkg_getjar jaxen jaxen-full.jar) >+ fi >+ > antflags="${antflags} -Dactivation.jar=$(java-config -p sun-jaf-bin)" > antflags="${antflags} -Dcommons-collections.jar=$(java-config -p commons-collections)" > antflags="${antflags} -Dcommons-daemon.jar=$(java-config -p commons-daemon)" >@@ -104,10 +110,10 @@ > antflags="${antflags} -Dlog4j.jar=$(java-config -p log4j)" > antflags="${antflags} -Dregexp.jar=$(java-config -p jakarta-regexp-1.3)" > antflags="${antflags} -Dstruts.jar=$(java-pkg_getjar struts struts.jar)" >- antflags="${antflags} -Dcommons-beanutils.jar=$(java-pkg_getjar commons-beanutils-1.7 commons-beanutils.jar)" >+ antflags="${antflags} -Dcommons-beanutils.jar=$(java-pkg_getjar commons-beanutils commons-beanutils.jar)" > antflags="${antflags} -Dcommons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)" > antflags="${antflags} -Dcommons-logging-api.jar=$(java-pkg_getjar commons-logging commons-logging-api.jar)" >- antflags="${antflags} -Djaxen.jar=$(java-pkg_getjar jaxen jaxen-full.jar)" >+ antflags="${antflags} -Djaxen.jar=${jaxen_jar}" > antflags="${antflags} -Djmx.jar=$(java-pkg_getjar jmx jmxri.jar)" > antflags="${antflags} -Djmx-tools.jar=$(java-pkg_getjar jmx jmxtools.jar)" > antflags="${antflags} -Dsaxpath.jar=$(java-pkg_getjar saxpath saxpath.jar)" >@@ -115,6 +121,7 @@ > antflags="${antflags} -Dxml-apis.jar=$(java-pkg_getjar xerces-2 xml-apis.jar)" > antflags="${antflags} -Dstruts.home=/usr/share/struts" > >+ einfo "ant ${antflags}" > ant ${antflags} || die "compile failed" > > }
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 105636
:
68195
|
68196
| 68197 |
68997
|
68998