From: Krzysztof Pawlik Date: Sat, 14 Apr 2007 21:05:31 +0000 (+0000) Subject: Add a patch to disable looking for JAVA_HOME. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7ecd8bfa89f19c759d5515ca7f837b0c40cae56d;p=gentoo.git Add a patch to disable looking for JAVA_HOME. Package-Manager: portage-2.1.2.3 --- diff --git a/www-apache/mod_caucho/ChangeLog b/www-apache/mod_caucho/ChangeLog index 361927124c1e..4da7ea019bb9 100644 --- a/www-apache/mod_caucho/ChangeLog +++ b/www-apache/mod_caucho/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for www-apache/mod_caucho # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/ChangeLog,v 1.15 2007/04/14 19:49:17 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/ChangeLog,v 1.16 2007/04/14 21:05:31 nelchael Exp $ + + 14 Apr 2007; Krzysiek Pawlik + +files/mod_caucho-3.0.22-java.patch, +files/mod_caucho-3.1.0-java.patch, + mod_caucho-3.0.22.ebuild, mod_caucho-3.1.0.ebuild: + Add a patch to disable looking for JAVA_HOME. 14 Apr 2007; Krzysiek Pawlik mod_caucho-3.0.22.ebuild, mod_caucho-3.1.0.ebuild: diff --git a/www-apache/mod_caucho/Manifest b/www-apache/mod_caucho/Manifest index 41b1383c7fd8..e8e5d003faa1 100644 --- a/www-apache/mod_caucho/Manifest +++ b/www-apache/mod_caucho/Manifest @@ -9,6 +9,10 @@ AUX mod_caucho-3.0.22-gentoo.patch 783 RMD160 186ce598a34264008eeac9ed2b9c0b0943 MD5 ed670b62f8e7eca8ed2b748c6c168458 files/mod_caucho-3.0.22-gentoo.patch 783 RMD160 186ce598a34264008eeac9ed2b9c0b094310ff5a files/mod_caucho-3.0.22-gentoo.patch 783 SHA256 308de706f120962508fadb8e4d5caab504ed2cd49f80d7bca0289b706f075e9c files/mod_caucho-3.0.22-gentoo.patch 783 +AUX mod_caucho-3.0.22-java.patch 3087 RMD160 90f80ac10d94a9896ed039271b3b28b7cb7de6e1 SHA1 c90e81157d09481502bbccbb43773d11c43f0749 SHA256 c70b7c9abc7bb37fbe652910de05de2e6f32496feb43983d6419fd073500e774 +MD5 24060a4a51b49f64e043a8ab282a0427 files/mod_caucho-3.0.22-java.patch 3087 +RMD160 90f80ac10d94a9896ed039271b3b28b7cb7de6e1 files/mod_caucho-3.0.22-java.patch 3087 +SHA256 c70b7c9abc7bb37fbe652910de05de2e6f32496feb43983d6419fd073500e774 files/mod_caucho-3.0.22-java.patch 3087 AUX mod_caucho-3.0.22-ssl.patch 707 RMD160 89025739f8bc910ec584c3c4d3ade5422e3db2e2 SHA1 1acf6ab1a4f945609903986966dc7d29eb655bfe SHA256 f33096f6783a4d06e9d1ba6d77eba7bf32597a5adb1e6e2eb4617ec43f9d0d1e MD5 c013ff79b1e3cf3cf3db58805e8e38dd files/mod_caucho-3.0.22-ssl.patch 707 RMD160 89025739f8bc910ec584c3c4d3ade5422e3db2e2 files/mod_caucho-3.0.22-ssl.patch 707 @@ -17,24 +21,28 @@ AUX mod_caucho-3.1.0-gentoo.patch 779 RMD160 2bd24d536c97b07b5366b5c450be9e0e878 MD5 b2b19809a96fd5e41d11294c9d0c144b files/mod_caucho-3.1.0-gentoo.patch 779 RMD160 2bd24d536c97b07b5366b5c450be9e0e878c1d44 files/mod_caucho-3.1.0-gentoo.patch 779 SHA256 667c97c8fa9c34102303a7096cc271f422e83cc4fc1fd09a1630368babdd9c34 files/mod_caucho-3.1.0-gentoo.patch 779 +AUX mod_caucho-3.1.0-java.patch 3085 RMD160 178506b5c0f363c3f9e03a2c0ff6db8a8327df19 SHA1 710f0d5b5b7ec17620d04749fa172d80e9e03b90 SHA256 4665a94cbd8b48903cd1bb332698ace19107f63fa39800d2c1b15e49dde889f0 +MD5 00ec6a7ceac63802f4c9db7d0c78b853 files/mod_caucho-3.1.0-java.patch 3085 +RMD160 178506b5c0f363c3f9e03a2c0ff6db8a8327df19 files/mod_caucho-3.1.0-java.patch 3085 +SHA256 4665a94cbd8b48903cd1bb332698ace19107f63fa39800d2c1b15e49dde889f0 files/mod_caucho-3.1.0-java.patch 3085 AUX mod_caucho-3.1.0-ssl.patch 707 RMD160 89025739f8bc910ec584c3c4d3ade5422e3db2e2 SHA1 1acf6ab1a4f945609903986966dc7d29eb655bfe SHA256 f33096f6783a4d06e9d1ba6d77eba7bf32597a5adb1e6e2eb4617ec43f9d0d1e MD5 c013ff79b1e3cf3cf3db58805e8e38dd files/mod_caucho-3.1.0-ssl.patch 707 RMD160 89025739f8bc910ec584c3c4d3ade5422e3db2e2 files/mod_caucho-3.1.0-ssl.patch 707 SHA256 f33096f6783a4d06e9d1ba6d77eba7bf32597a5adb1e6e2eb4617ec43f9d0d1e files/mod_caucho-3.1.0-ssl.patch 707 DIST resin-3.0.22-src.tar.gz 5467522 RMD160 093cdcfa8bcd14a30ff54cc9cb8001ace10bbfc6 SHA1 23d4f2fd233033adb0b08f8fcdcb81a1f0aab3fe SHA256 0da5617b6867a0d40e59d2dfe2518158567506fea2c1273d56290c146a64849a DIST resin-3.1.0-src.tar.gz 5708227 RMD160 6e347dc2810b328eddeafb39886bfe146c65f409 SHA1 2f3f7c5d6003424f2f1afc27f38f9f36cc312466 SHA256 735af3cd4ed9962631969d2da4ddea26ab28c3d0fd96d0e831e5a2058ef77440 -EBUILD mod_caucho-3.0.22.ebuild 1222 RMD160 5982dfe9feb6419e7e4465fd9714308cbb1c8cb4 SHA1 8f736469854ae7a7b33e2ca6202b22e47f70895b SHA256 48f97364a677ea94193cebdb9f885584ff90a4e973782fb3212bbe2ae9d3d750 -MD5 ee726ae9587671b76f9a07b797cb3803 mod_caucho-3.0.22.ebuild 1222 -RMD160 5982dfe9feb6419e7e4465fd9714308cbb1c8cb4 mod_caucho-3.0.22.ebuild 1222 -SHA256 48f97364a677ea94193cebdb9f885584ff90a4e973782fb3212bbe2ae9d3d750 mod_caucho-3.0.22.ebuild 1222 -EBUILD mod_caucho-3.1.0.ebuild 1245 RMD160 40ecd2ce901cd90d172628a04324e0309c4686b7 SHA1 4fdd6cc8e3112a6f085f2cca20d2342c43d6d377 SHA256 e70c15cec6aab3f64d4d10c40f5c516e5bd7f236a894861c83582d14c603589f -MD5 06b38ed579fa813bda47f648be7abfd4 mod_caucho-3.1.0.ebuild 1245 -RMD160 40ecd2ce901cd90d172628a04324e0309c4686b7 mod_caucho-3.1.0.ebuild 1245 -SHA256 e70c15cec6aab3f64d4d10c40f5c516e5bd7f236a894861c83582d14c603589f mod_caucho-3.1.0.ebuild 1245 -MISC ChangeLog 2644 RMD160 0cc021d7b6930ad3bf4e11a476bd72496b2a4296 SHA1 1498ad28abd6b11584d3d8a5b183a1803891e406 SHA256 6a90c47c7aabc3b2039f9dacd34ed1134d05bb9fc5cb5d47a3de183c6546283b -MD5 7c288606601264b477745a19080af352 ChangeLog 2644 -RMD160 0cc021d7b6930ad3bf4e11a476bd72496b2a4296 ChangeLog 2644 -SHA256 6a90c47c7aabc3b2039f9dacd34ed1134d05bb9fc5cb5d47a3de183c6546283b ChangeLog 2644 +EBUILD mod_caucho-3.0.22.ebuild 1246 RMD160 bad458fdde146b79dab8517b907584804fe6bd8e SHA1 a074174d81ccc99c55e868e6de02cbc34e70514c SHA256 36e2597015ccdd9627cb1ae1aed83bdbe718965c5d92513128d1581204f36dbd +MD5 079233ffa74ed3f3c7f97ff7da53edc3 mod_caucho-3.0.22.ebuild 1246 +RMD160 bad458fdde146b79dab8517b907584804fe6bd8e mod_caucho-3.0.22.ebuild 1246 +SHA256 36e2597015ccdd9627cb1ae1aed83bdbe718965c5d92513128d1581204f36dbd mod_caucho-3.0.22.ebuild 1246 +EBUILD mod_caucho-3.1.0.ebuild 1269 RMD160 f2d84d1e1dac207ad30f47f68ddd33dc2f5cc24f SHA1 d389260539d40a65ecbcf4b3d48c9ee551dc4d5d SHA256 39044075938a48f2148fbf8034822d79e1ebe09669483c0acc5a2f8e8ff34b1d +MD5 96ebf6721b2a947585ff9f5cb4ad08d8 mod_caucho-3.1.0.ebuild 1269 +RMD160 f2d84d1e1dac207ad30f47f68ddd33dc2f5cc24f mod_caucho-3.1.0.ebuild 1269 +SHA256 39044075938a48f2148fbf8034822d79e1ebe09669483c0acc5a2f8e8ff34b1d mod_caucho-3.1.0.ebuild 1269 +MISC ChangeLog 2874 RMD160 1e04a8de1652f51fcbc4dd31a8ffe16880636b46 SHA1 7e0a3ee6d1c795b6c3a24c07d5584f7cc3df8140 SHA256 2041350d695bd51ddccab94f22042f1d4d706c3c59ad9169e1cd41bf120f9013 +MD5 f42298449f3044778351f9a7bd22c968 ChangeLog 2874 +RMD160 1e04a8de1652f51fcbc4dd31a8ffe16880636b46 ChangeLog 2874 +SHA256 2041350d695bd51ddccab94f22042f1d4d706c3c59ad9169e1cd41bf120f9013 ChangeLog 2874 MISC metadata.xml 245 RMD160 ab2afa1527b94d2776eb4cff88ab06b86f4da8d4 SHA1 e75506fde1ffe1aab92c624c3299957c9819fafe SHA256 2934a1d824233ffc25ba694782ed7386f899e39e3020cc5fa82f5a0e371b1957 MD5 2beccfb509fa2c8b2489d1278d021b4e metadata.xml 245 RMD160 ab2afa1527b94d2776eb4cff88ab06b86f4da8d4 metadata.xml 245 @@ -48,7 +56,7 @@ SHA256 8af0d2e1d33ccff5b8ef7c6cfc0097f92c557d9179a3c1145ea103f7c40a1171 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFGITBigo/w9rxVVVERAhLaAKCNEOjN5axwOEU4ApKYNAirEs2HQgCgtgiu -Z/NKVAe0IDTpX8A+nJgOxbk= -=CrXC +iD8DBQFGIUI+go/w9rxVVVERAjM3AJ98Tp5RuSUCZ6MgSdIzf92acLq7PACfWcWP +rELpP9RwEmGsgqbHI/LnH6I= +=dFuQ -----END PGP SIGNATURE----- diff --git a/www-apache/mod_caucho/files/mod_caucho-3.0.22-java.patch b/www-apache/mod_caucho/files/mod_caucho-3.0.22-java.patch new file mode 100644 index 000000000000..953da239d9e5 --- /dev/null +++ b/www-apache/mod_caucho/files/mod_caucho-3.0.22-java.patch @@ -0,0 +1,126 @@ +--- resin-3.0.22.vanilla/configure.in 2007-04-14 22:51:15.000000000 +0200 ++++ resin-3.0.22/configure.in 2007-04-14 22:54:46.000000000 +0200 +@@ -427,54 +427,6 @@ + fi + fi + # +-# --with-java-home +-# +-AC_ARG_WITH(java-home, +-[ --with-java-home=DIR java home +-], [ +-JAVA_HOME=${withval} +-]) +- +-if test -z "$JAVA_HOME"; then +- java=`which java 2>/dev/null` +- if test $? = "0"; then +- while test -h "$java" +- do +- head=`dirname $java` +- tail=`/bin/ls -l $java | awk '{ print $NF; }'` +- if test -f "$tail"; then +- java=$tail +- else +- java=$head/$tail +- fi +- done +- +- javabin=`dirname $java` +- JAVA_HOME=`cd $javabin/..; pwd` +- +- # we're in $JAVA_HOME/jre +- if test -f "$JAVA_HOME/lib/rt.jar"; then +- JAVA_HOME=`cd $JAVA_HOME/..; pwd` +- elif test -d "/usr/java"; then +- JAVA_HOME=/usr/java +- elif test -f "/System/Library/Frameworks/JavaVM.framework"; then +- JAVA_HOME="/System/Library/Frameworks/JavaVM.framework" +- fi +- elif test -d "/usr/java"; then +- JAVA_HOME=/usr/java +- elif test -f "/System/Library/Frameworks/JavaVM.framework"; then +- JAVA_HOME="/System/Library/Frameworks/JavaVM.framework" +- fi +-fi +- +-echo $ac_n "checking for JAVA_HOME... $JAVA_HOME" +- +-if test ! -d "$JAVA_HOME"; then +- AC_MSG_ERROR([Can't find valid JAVA_HOME ${JAVA_HOME}]) +-fi +- +-AC_SUBST(JAVA_HOME) +-# + # Resin home + # + resin_home=`pwd` +@@ -870,68 +822,6 @@ + AC_SUBST(SSL_LIBS) + + # +-# --with-jni-include +-# +-AC_ARG_WITH(jni-include, +-[ --with-jni-include="-Idir -Idir" jni include string +-], [ +-JNI_INCLUDE=${withval} +-JNI="yes" +-]) +- +-# +-# --enable-jni +-# +-AC_ARG_ENABLE(jni, +-[ --enable-jni Turn on jni], +-[case "${enableval}" in +- yes) JNI=true ;; +- no) JNI="" ;; +- *) AC_MSG_ERROR(bad value ${enableval} for --enable-jni) ;; +- esac],[JNI=""]) +- +-if test -n "$JNI_INCLUDE"; then +- JNI=yes +-elif test -r "$JAVA_HOME/include/jni_md.h"; then +- JNI_INCLUDE="-I$JAVA_HOME/include" +- JNI=yes +- echo "checking for JNI in $JAVA_HOME/include ... found" +-elif test -r "$JAVA_HOME/include/$jni_os/jni_md.h"; then +- JNI_INCLUDE="-I$JAVA_HOME/include -I$JAVA_HOME/include/$jni_os" +- JNI=yes +- echo "checking for JNI in $JAVA_HOME/include/$jni_os ... found" +-elif test -r "/System/Library/Frameworks/JavaVM.framework/Headers/jni_md.h"; then +- # Darwin +- echo "checking for JNI in /System/Library/Frameworks/JavaVM.framework/Headers ... found" +- JNI_INCLUDE="-I/System/Library/Frameworks/JavaVM.framework/Headers" +- JNI=yes +-else +- JNI="" +- AC_MSG_WARN([Can't find JNI directory ${JAVA_HOME}/include/$jni_os]) +-fi +- +-if test -r "$JAVA_HOME/include/jvmti.h"; then +- echo "Using JVMTI for class reloading" +- +- CFLAGS="$CFLAGS -DHAS_JVMTI" +-fi +- +-if test -r "$JAVA_HOME/include/jvmdi.h"; then +- echo "Using JVMDI for class reloading" +- +- CFLAGS="$CFLAGS -DHAS_JVMDI" +-fi +- +-if test -n "$JNI"; then +- plugins="$plugins $resin_plugin resin_os" +-else +- echo "Can't JNI include files in JAVA_HOME: $JAVA_HOME" +-fi +- +-AC_SUBST(JNI) +-AC_SUBST(JNI_INCLUDE) +- +-# + # --enable-ssl + # + AC_ARG_ENABLE(ssl, diff --git a/www-apache/mod_caucho/files/mod_caucho-3.1.0-java.patch b/www-apache/mod_caucho/files/mod_caucho-3.1.0-java.patch new file mode 100644 index 000000000000..a2e185157008 --- /dev/null +++ b/www-apache/mod_caucho/files/mod_caucho-3.1.0-java.patch @@ -0,0 +1,126 @@ +--- resin-3.1.0.vanilla/configure.in 2007-04-14 22:59:47.000000000 +0200 ++++ resin-3.1.0/configure.in 2007-04-14 23:00:30.000000000 +0200 +@@ -434,54 +434,6 @@ + fi + fi + # +-# --with-java-home +-# +-AC_ARG_WITH(java-home, +-[ --with-java-home=DIR java home +-], [ +-JAVA_HOME=${withval} +-]) +- +-if test -z "$JAVA_HOME"; then +- java=`which java 2>/dev/null` +- if test $? = "0"; then +- while test -h "$java" +- do +- head=`dirname $java` +- tail=`/bin/ls -l $java | awk '{ print $NF; }'` +- if test -f "$tail"; then +- java=$tail +- else +- java=$head/$tail +- fi +- done +- +- javabin=`dirname $java` +- JAVA_HOME=`cd $javabin/..; pwd` +- +- # we're in $JAVA_HOME/jre +- if test -f "$JAVA_HOME/lib/rt.jar"; then +- JAVA_HOME=`cd $JAVA_HOME/..; pwd` +- elif test -d "/usr/java"; then +- JAVA_HOME=/usr/java +- elif test -f "/System/Library/Frameworks/JavaVM.framework"; then +- JAVA_HOME="/System/Library/Frameworks/JavaVM.framework" +- fi +- elif test -d "/usr/java"; then +- JAVA_HOME=/usr/java +- elif test -f "/System/Library/Frameworks/JavaVM.framework"; then +- JAVA_HOME="/System/Library/Frameworks/JavaVM.framework" +- fi +-fi +- +-echo $ac_n "checking for JAVA_HOME... $JAVA_HOME" +- +-if test ! -d "$JAVA_HOME"; then +- AC_MSG_ERROR([Can't find valid JAVA_HOME ${JAVA_HOME}]) +-fi +- +-AC_SUBST(JAVA_HOME) +-# + # Resin home + # + resin_home=`pwd` +@@ -792,68 +744,6 @@ + AC_SUBST(SSL_LIBS) + + # +-# --with-jni-include +-# +-AC_ARG_WITH(jni-include, +-[ --with-jni-include="-Idir -Idir" jni include string +-], [ +-JNI_INCLUDE=${withval} +-JNI="yes" +-]) +- +-# +-# --enable-jni +-# +-AC_ARG_ENABLE(jni, +-[ --enable-jni Turn on jni], +-[case "${enableval}" in +- yes) JNI=true ;; +- no) JNI="" ;; +- *) AC_MSG_ERROR(bad value ${enableval} for --enable-jni) ;; +- esac],[JNI=""]) +- +-if test -n "$JNI_INCLUDE"; then +- JNI=yes +-elif test -r "$JAVA_HOME/include/jni_md.h"; then +- JNI_INCLUDE="-I$JAVA_HOME/include" +- JNI=yes +- echo "checking for JNI in $JAVA_HOME/include ... found" +-elif test -r "$JAVA_HOME/include/$jni_os/jni_md.h"; then +- JNI_INCLUDE="-I$JAVA_HOME/include -I$JAVA_HOME/include/$jni_os" +- JNI=yes +- echo "checking for JNI in $JAVA_HOME/include/$jni_os ... found" +-elif test -r "/System/Library/Frameworks/JavaVM.framework/Headers/jni_md.h"; then +- # Darwin +- echo "checking for JNI in /System/Library/Frameworks/JavaVM.framework/Headers ... found" +- JNI_INCLUDE="-I/System/Library/Frameworks/JavaVM.framework/Headers" +- JNI=yes +-else +- JNI="" +- AC_MSG_WARN([Can't find JNI directory ${JAVA_HOME}/include/$jni_os]) +-fi +- +-if test -r "$JAVA_HOME/include/jvmti.h"; then +- echo "Using JVMTI for class reloading" +- +- CFLAGS="$CFLAGS -DHAS_JVMTI" +-fi +- +-if test -r "$JAVA_HOME/include/jvmdi.h"; then +- echo "Using JVMDI for class reloading" +- +- CFLAGS="$CFLAGS -DHAS_JVMDI" +-fi +- +-if test -n "$JNI"; then +- plugins="$plugins $resin_plugin resin_os" +-else +- echo "Can't JNI include files in JAVA_HOME: $JAVA_HOME" +-fi +- +-AC_SUBST(JNI) +-AC_SUBST(JNI_INCLUDE) +- +-# + # --enable-ssl + # + AC_ARG_ENABLE(ssl, diff --git a/www-apache/mod_caucho/mod_caucho-3.0.22.ebuild b/www-apache/mod_caucho/mod_caucho-3.0.22.ebuild index b167a8c196db..071559facf6f 100644 --- a/www-apache/mod_caucho/mod_caucho-3.0.22.ebuild +++ b/www-apache/mod_caucho/mod_caucho-3.0.22.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/mod_caucho-3.0.22.ebuild,v 1.7 2007/04/14 19:49:17 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/mod_caucho-3.0.22.ebuild,v 1.8 2007/04/14 21:05:31 nelchael Exp $ inherit eutils apache-module autotools @@ -27,12 +27,13 @@ src_unpack() { epatch "${FILESDIR}/${P}-gentoo.patch" epatch "${FILESDIR}/${P}-ssl.patch" + epatch "${FILESDIR}/${P}-java.patch" eautoreconf chmod 755 ./configure } src_compile() { - econf --disable-jni --with-apxs=${APXS2} || die "econf failed" + econf --with-apxs=${APXS2} || die "econf failed" emake -j1 -C "${S}/modules/c/src/apache2/" || die "emake failed" } diff --git a/www-apache/mod_caucho/mod_caucho-3.1.0.ebuild b/www-apache/mod_caucho/mod_caucho-3.1.0.ebuild index 29ef8f143a67..ac6f842ac1d1 100644 --- a/www-apache/mod_caucho/mod_caucho-3.1.0.ebuild +++ b/www-apache/mod_caucho/mod_caucho-3.1.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/mod_caucho-3.1.0.ebuild,v 1.5 2007/04/14 19:49:17 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/mod_caucho-3.1.0.ebuild,v 1.6 2007/04/14 21:05:31 nelchael Exp $ inherit eutils apache-module autotools @@ -30,12 +30,13 @@ src_unpack() { epatch "${FILESDIR}/${P}-gentoo.patch" epatch "${FILESDIR}/${P}-ssl.patch" + epatch "${FILESDIR}/${P}-java.patch" eautoreconf chmod 755 ./configure } src_compile() { - econf --disable-jni --with-apxs=${APXS2} || die "econf failed" + econf --with-apxs=${APXS2} || die "econf failed" emake -j1 -C "${S}/modules/c/src/apache2/" || die "emake failed" }