Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10006
Modified Files:
svn-swig-pm.info
Log Message:
Added hack (thanks pogma) to fix building with perl 5.10.0.
Index: svn-swig-pm.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel/svn-swig-pm.info,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- svn-swig-pm.info 12 May 2009 01:31:43 -0000 1.42
+++ svn-swig-pm.info 22 May 2009 22:25:01 -0000 1.43
@@ -40,8 +40,22 @@
SetLDFLAGS: -L%p/lib/system-openssl/lib -L%p/lib
GCC: 4.0
NoPerlTests: true
-ConfigureParams: <<
- --libdir=%p/lib/perl5/%type_raw[perl]/lib \
+CompileScript: <<
+#! /bin/sh -ev
+ ### Recreate build-outputs.mk to not include already installed libs
+ ./gen-make.py --installed-libs
libsvn_client,libsvn_delta,libsvn_diff,libsvn_fs,libsvn_fs_base,libsvn_fs_fs,libsvn_fs_util,libsvn_ra,libsvn_ra_neon,libsvn_ra_local,libsvn_ra_svn,libsvn_repos,libsvn_subr,libsvn_wc
+
+ perl -pi -e 's,\...@svn_apr_export_libs\@,-L%p/lib/svn15 $&,'
subversion/bindings/swig/perl/native/Makefile.PL.in
+
+ ### Configure shared
+ export F77=no
+ export RUBY=/usr/bin/false
+ if [ -x %p/bin/perl%type_raw[perl] ]; then
+ export PERL=%p/bin/perl%type_raw[perl]
+ else
+ export PERL=/usr/bin/perl%type_raw[perl]
+ fi
+ ./configure --libdir=%p/lib/perl5/%type_raw[perl]/lib \
--enable-shared \
--disable-static \
--with-neon=%p \
@@ -61,28 +75,23 @@
--without-kwallet \
--without-ctypesgen \
--disable-neon-version-check
-<<
-CompileScript: <<
-#! /bin/sh -ev
- ### Recreate build-outputs.mk to not include already installed libs
- ./gen-make.py --installed-libs
libsvn_client,libsvn_delta,libsvn_diff,libsvn_fs,libsvn_fs_base,libsvn_fs_fs,libsvn_fs_util,libsvn_ra,libsvn_ra_neon,libsvn_ra_local,libsvn_ra_svn,libsvn_repos,libsvn_subr,libsvn_wc
-
- perl -pi -e 's,\...@svn_apr_export_libs\@,-L%p/lib/svn15 $&,'
subversion/bindings/swig/perl/native/Makefile.PL.in
-
- ### Configure shared
- export F77=no
- export RUBY=/usr/bin/false
- if [ -x %p/bin/perl%type_raw[perl] ]; then
- export PERL=%p/bin/perl%type_raw[perl]
- else
- export PERL=/usr/bin/perl%type_raw[perl]
- fi
- ./configure %c
### Build swig perl bindings
+ # MakeMaker generates a bogus ABSPERL if PERL="/usr/bin/arch -%m perl5.10.0"
+ # since it expects a full pathname. Also something is checking if ABSPERL is
+ # a valid filename, which fails obviously. Here we create a wrapper so that we
+ # set ABSPATH to a valid filename while still calling /usr/bin/arch.
+ if [ %type_pkg[perl] -ge 5100 ]; then
+ cat > myperl <<_Eof
+#!/bin/sh
+exec /usr/bin/arch -%m $PERL "\$@"
+_Eof
+ chmod +x myperl; export PERL=`pwd`/myperl
+ fi
+
perl -pi -e 's/-arch i386 -arch ppc//g' Makefile
make libsvn_swig_perl CPPFLAGS='-I$(top_srcdir)/subversion/include
-I$(top_builddir)/subversion -I%p/include/neon -I%p/include/apache2
-I%p/lib/system-openssl/include -I%p/include -DDARWIN
-DSIGPROCMASK_SETS_THREAD_MASK' INCLUDES=''
- (cd subversion/bindings/swig/perl/native && %{default_script}) || exit 1
+ cd subversion/bindings/swig/perl/native && %{default_script} PERL=$PERL
FULLPERL=$PERL ABSPERL=$PERL
<<
InfoTest: <<
TestScript: (cd subversion/bindings/swig/perl/native && make test) || exit 2
------------------------------------------------------------------------------
Register Now for Creativity and Technology (CaT), June 3rd, NYC. CaT
is a gathering of tech-side developers & brand creativity professionals. Meet
the minds behind Google Creative Lab, Visual Complexity, Processing, &
iPhoneDevCamp asthey present alongside digital heavyweights like Barbarian
Group, R/GA, & Big Spaceship. http://www.creativitycat.com
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
