Update of /cvsroot/fink/experimental/chris01/10.3/crypto/finkinfo
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14839
Modified Files:
svn-ssl.info
Log Message:
Next try to build the javahl jni libs. Still fails.
Index: svn-ssl.info
===================================================================
RCS file: /cvsroot/fink/experimental/chris01/10.3/crypto/finkinfo/svn-ssl.info,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- svn-ssl.info 23 Oct 2004 17:09:40 -0000 1.12
+++ svn-ssl.info 24 Oct 2004 14:22:36 -0000 1.13
@@ -14,7 +14,7 @@
# Dependencies:
Depends: %N-shlibs (= %v-%r), daemonic
-BuildDepends: apr-ssl (>= 0.9.5-15), apr-ssl-common (>= 0.9.5-15), db42-ssl, gdbm3,
expat (>= 1.95.6-2), libxml2 (>= 2.5.10-12), python23 (>= 1:2.3.3-23) | python23-nox
(>= 1:2.3.3-23), fink (>= 0.16.0-1), neon24-ssl (>= 0.24.7-11), openldap-ssl-dev (>=
2.1.22-24), cyrus-sasl2-dev (>= 2.1.15-23), openssl097-dev, swig (>= 1.3.20-2),
texinfo (>= 4.2-22), libiconv-dev (>= 1.9.1-11), apache2-ssl-dev (>= 2.0.50-10),
system-java14-dev, perl581-core, gettext-bin, gettext-dev, io-string-pm
+BuildDepends: apr-ssl (>= 0.9.5-15), apr-ssl-common (>= 0.9.5-15), db42-ssl, gdbm3,
expat (>= 1.95.6-2), libxml2 (>= 2.5.10-12), python23 (>= 1:2.3.3-23) | python23-nox
(>= 1:2.3.3-23), fink (>= 0.16.0-1), neon24-ssl (>= 0.24.7-11), openldap-ssl-dev (>=
2.1.22-24), cyrus-sasl2-dev (>= 2.1.15-23), openssl097-dev, swig (>= 1.3.20-2),
texinfo (>= 4.2-22), libiconv-dev (>= 1.9.1-11), apache2-ssl-dev (>= 2.0.50-10),
system-java14-dev, perl581-core, gettext-bin, gettext-dev, io-string-pm, libtool14 (>=
1.5.10-1), autoconf2.5, automake1.9
# Only needs to be enabled for 'make check-javahl':
#, junit
Conflicts: svn-client, svn-client-ssl (<= 0.26.0-2), apache2 (<< 2.0.47-1)
@@ -39,7 +39,10 @@
rm -rf neon
rm -rf apr
rm -rf apr-util
-
+
+ # recreate configure, since javahl fails otherwise
+ ./autogen.sh
+ perl -pi.bak -e "s/need_relink=yes/need_relink=no/" ac-helpers/ltmain.sh
### Configure shared
perl -pi.bak -e "s/hardcode_direct=yes/hardcode_direct=no/" configure
./configure %c
@@ -74,18 +77,26 @@
### Build swig perl bindings
make swig-pl-lib
(cd subversion/bindings/swig/perl/native && perl5.8.1 Makefile.PL PERL=perl5.8.1
FULLPERL=perl5.8.1 INSTALLDIRS=vendor PREFIX=%p LIB=%p/lib/perl5/5.8.1
INSTALLBIN=%i/bin INSTALLSCRIPT=%i/bin INSTALLPRIVLIB=%p/lib/perl5/5.8.1
INSTALLARCHLIB=%p/lib/perl5/5.8.1/darwin-thread-multi-2level
INSTALLSITELIB=%p/lib/perl5/5.8.1
INSTALLSITEARCH=%p/lib/perl5/5.8.1/darwin-thread-multi-2level
INSTALLMAN1DIR=%p/share/man/man1 INSTALLMAN3DIR=%p/share/man/man3
INSTALLSITEMAN1DIR=%p/share/man/man1 INSTALLSITEMAN3DIR=%p/share/man/man3
INSTALLVENDORMAN1DIR=%p/share/man/man1 INSTALLVENDORMAN3DIR=%p/share/man/man3 && make)
- (cd subversion/bindings/swig/perl/native && make test)
+# (cd subversion/bindings/swig/perl/native && make test)
### Build swig java bindings (they don't build yet!)
#make swig-java-lib
#make swig-java-java
### Build javahl bindings
- make javahl
- # After building libsvnjavahl.dynlib it has to be renamed to libsvnjavahl.jnilib
+ # this makdir should no longer be necessary once svn issue #2032 is released
+ mkdir -p subversion/bindings/java/javahl/classes/org/tigris/subversion/javahl
+ # LT_CXX_LIBADD is set to nothing since otherwise the linker tries to link
+ # to stdc++ which isn't available as a shared lib on Mac OS X. Here we need
+ # bundle and framework for the jni libraries to work.
+ make javahl LT_CXX_LIBADD="" LDFLAGS="--Wl,-framework -Wl,JavaVM"
+# make javahl LT_CXX_LIBADD="" LDFLAGS="-bundle -framework JavaVM"
+# make javahl LDFLAGS="-bundle -framework JavaVM"
+ # On Mac OS X jni libraries have to be named libfoo.jnilib
# We are doing it with a symlink here.
(cd subversion/bindings/java/javahl/native/.libs && ln -s libsvnjavahl-1.dylib
libsvnjavahl-1.jnilib)
### The javahl tests don't work yet without already installed packages
+ # see svn issue #2040 for more info
# make check-javahl
<<
@@ -147,7 +158,9 @@
#make install-swig-java DESTDIR=%d swig_javadir=%p/share/java/svn-swig-java
### Install javahl bindings
- make install-javahl DESTDIR=%d javahl_javadir=%p/share/java/svn-ssl-javahl
javahl_javahdir=%p/include/svn-ssl-javahl
+ # INSTALL_EXTRA_JAVAHL_LIB is set to nothing since it would generate
+ # a symbolic link directly in %p instead of %i
+ make install-javahl INSTALL_EXTRA_JAVAHL_LIB="" DESTDIR=%d
javahl_javadir=%p/share/java/svn-ssl-javahl javahl_javahdir=%p/include/svn-ssl-javahl
#### make a symlink for the jnilib
ln -sf libsvnjavahl-1.dylib %i/lib/libsvnjavahl-1.jnilib
ln -sf %p/lib/libsvnjavahl-1.dylib %i/share/java/svn-ssl-javahl/libsvnjavahl-1.jnilib
-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
