Update of /cvsroot/fink/experimental/rangerrick/patches
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25026/patches
Added Files:
appbundles.patch libtool-framework.patch
Log Message:
still working on this stuff =)
--- NEW FILE: appbundles.patch ---
Index: perlmod/Fink/ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.710
diff -u -r1.710 ChangeLog
--- perlmod/Fink/ChangeLog 30 Sep 2004 04:17:28 -0000 1.710
+++ perlmod/Fink/ChangeLog 4 Oct 2004 21:12:55 -0000
@@ -1,3 +1,9 @@
+2004-09-29 Benjamin Reed <[EMAIL PROTECTED]>
+
+ * PkgVersion.pm, Validation.pm: Implemented AppBundles:
+ which does essentially what JarFiles does, copies an application
+ bundle to a known directory (%p/Applications)
+
2004-09-28 Daniel Macks <[EMAIL PROTECTED]>
* Engine.pm: Implemented 'fink show-deps' (cmd_show_deps() and
Index: perlmod/Fink/PkgVersion.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/PkgVersion.pm,v
retrieving revision 1.303
diff -u -r1.303 PkgVersion.pm
--- perlmod/Fink/PkgVersion.pm 23 Sep 2004 10:01:59 -0000 1.303
+++ perlmod/Fink/PkgVersion.pm 4 Oct 2004 21:12:55 -0000
@@ -39,7 +39,7 @@
use Fink::Bootstrap qw(&get_bsbase);
use Fink::Command qw(mkdir_p rm_f rm_rf symlink_f du_sk);
-use File::Basename qw(&dirname);
+use File::Basename qw(&dirname &basename);
use POSIX qw(uname);
@@ -1973,6 +1973,16 @@
}
}
+ # generate commands to install App bundles
+ if ($self->has_param("AppBundles")) {
+ $install_script .= "\n/usr/bin/install -d -m 755 %i/Applications";
+ for my $bundle (split(/\s+/, $self->param("AppBundles"))) {
+ $bundle =~ s/\'/\\\'/gsi;
+ my $shortname = basename($bundle);
+ $install_script .= "\ncp -pR '$bundle' '%i/Applications/'"
+ }
+ }
+
# generate commands to install jar files
if ($self->has_param("JarFiles")) {
my (@jarfiles, $jarfile, $jarfilelist);
Index: perlmod/Fink/Validation.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/Validation.pm,v
retrieving revision 1.143
diff -u -r1.143 Validation.pm
--- perlmod/Fink/Validation.pm 21 Sep 2004 22:20:13 -0000 1.143
+++ perlmod/Fink/Validation.pm 4 Oct 2004 21:12:55 -0000
@@ -170,6 +170,7 @@
# install phase:
'updatepod',
'installscript',
+ 'appbundles',
'jarfiles',
'docfiles',
'shlibs',
--- NEW FILE: libtool-framework.patch ---
? autom4te.cache
? libltdl/loaders/.deps
? libltdl/loaders/.libs
? tests/cdemo/autom4te.cache
? tests/demo/autom4te.cache
? tests/depdemo/autom4te.cache
? tests/f77demo/autom4te.cache
? tests/mdemo/autom4te.cache
? tests/mdemo2/autom4te.cache
? tests/pdemo/autom4te.cache
? tests/tagdemo/autom4te.cache
Index: ltmain.in
===================================================================
RCS file: /cvsroot/libtool/libtool/Attic/ltmain.in,v
retrieving revision 1.334.2.38
diff -u -r1.334.2.38 ltmain.in
--- ltmain.in 3 Aug 2004 14:55:58 -0000 1.334.2.38
+++ ltmain.in 30 Sep 2004 00:26:24 -0000
@@ -1348,6 +1348,19 @@
prev=
continue
;;
+ framework)
+ case $host in
+ *-*-darwin*)
+ case "$deplibs " in
+ *" $qarg.ltframework "*) ;;
+ *) deplibs="$deplibs $qarg.ltframework" # this is fixed later
+ ;;
+ esac
+ ;;
+ esac
+ prev=
+ continue
+ ;;
*)
eval "$prev=\"\$arg\""
prev=
@@ -1472,7 +1485,7 @@
;;
*-*-rhapsody* | *-*-darwin1.[012])
# Rhapsody C and math libraries are in the System framework
- deplibs="$deplibs -framework System"
+ deplibs="$deplibs System.ltframework"
continue
esac
elif test "X$arg" = "X-lc_r"; then
@@ -1669,6 +1682,11 @@
continue
;;
+ -framework)
+ prev=framework
+ continue
+ ;;
+
# Some other compiler flag.
-* | +*)
# Unknown arguments in both finalize_command and compile_command need
@@ -2052,6 +2070,18 @@
fi
fi
;; # -l
+ *.ltframework)
+ if test "$linkmode,$pass" = "prog,link"; then
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ else
+ deplibs="$deplib $deplibs"
+ if test "$linkmode" = lib ; then
+ newdependency_libs="$deplib $newdependency_libs"
+ fi
+ fi
+ continue
+ ;;
-L*)
case $linkmode in
lib)
@@ -2195,6 +2225,13 @@
*) . ./$lib ;;
esac
+ case $host in
+ *-*-darwin*)
+ # Convert "-framework foo" to "foo.ltframework" in dependency_libs
+ test -n "$dependency_libs" && dependency_libs=`$echo "X$dependency_libs" |
$Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'`
+ ;;
+ esac
+
if test "$linkmode,$pass" = "lib,link" ||
test "$linkmode,$pass" = "prog,scan" ||
{ test "$linkmode" != prog && test "$linkmode" != lib; }; then
@@ -2811,6 +2848,15 @@
*) continue ;;
esac
;;
+
+ *.ltframework)
+ case $host in
+ *-*-darwin*)
+ depdepl="$deplib"
+ ;;
+ esac
+ ;;
+
*) continue ;;
esac
case " $deplibs " in
@@ -3331,7 +3377,7 @@
;;
*-*-rhapsody* | *-*-darwin1.[012])
# Rhapsody C library is in the System framework
- deplibs="$deplibs -framework System"
+ deplibs="$deplibs System.ltframework"
;;
*-*-netbsd*)
# Don't link with libc until the a.out ld.so is fixed.
@@ -3624,7 +3670,7 @@
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library is the System framework
- newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
+ newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
;;
esac
@@ -3670,6 +3716,13 @@
fi
fi
fi
+ # Time to change all our "foo.ltframework" stuff back to "-framework foo"
+ case $host in
+ *-*-darwin*)
+ newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework%
-framework \1%g'`
+ dependency_libs=`$echo "X $dependency_libs" | $Xsed -e 's% \([^
$]*\).ltframework% -framework \1%g'`
+ ;;
+ esac
# Done checking deplibs!
deplibs=$newdeplibs
fi
@@ -4151,18 +4204,21 @@
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library is the System framework
- compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework
System /'`
- finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework
System /'`
+ compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc /
System.ltframework /'`
+ finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc /
System.ltframework /'`
;;
esac
case $host in
- *darwin*)
+ *-*-darwin*)
# Don't allow lazy linking, it breaks C++ global constructors
if test "$tagname" = CXX ; then
compile_command="$compile_command ${wl}-bind_at_load"
finalize_command="$finalize_command ${wl}-bind_at_load"
fi
+ # Time to change all our "foo.ltframework" stuff back to "-framework foo"
+ compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's% \([^
$]*\).ltframework% -framework \1%g'`
+ finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's% \([^
$]*\).ltframework% -framework \1%g'`
;;
esac
-------------------------------------------------------
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
