Hi Nikita, I've fixed a type in recursive detection of gccross calls. If you would like to know how to reproduce the progrem reply me.
I put all your previous remarc in consideration and forward you the patch in hope you will find time to review and apply the changes. -- Raphael Bossek
Index: ChangeLog
===================================================================
RCS file: /cvsroot/dpkg-cross/dpkg-cross/ChangeLog,v
retrieving revision 1.23
diff -u -r1.23 ChangeLog
--- ChangeLog 19 Oct 2004 20:29:51 -0000 1.23
+++ ChangeLog 27 Oct 2004 19:48:52 -0000
@@ -1,3 +1,9 @@
+2004-10-27 Raphael Bossek <[EMAIL PROTECTED]>
+
+ * gccross: Typo in detection of recursive gccross calls fixed
+ * gccross.sgml: Documentation improvements.
+ * dpkg-buildpackage: Additional GCC sym-links for gccross added
+
2004-10-19 Nikita V. Youshchenko <[EMAIL PROTECTED]>
* cross-compile.example, cross-compile.sgml, dpkg-cross.pl: change
Index: dpkg-buildpackage
===================================================================
RCS file: /cvsroot/dpkg-cross/dpkg-cross/dpkg-buildpackage,v
retrieving revision 1.4
diff -u -r1.4 dpkg-buildpackage
--- dpkg-buildpackage 3 Oct 2004 17:28:57 -0000 1.4
+++ dpkg-buildpackage 27 Oct 2004 19:48:52 -0000
@@ -102,8 +102,9 @@
if ($do_setup) {
$gccrossdir = "/tmp/gccross.$$";
system("rm -rf $gccrossdir && mkdir $gccrossdir");
- symlink("/usr/bin/gccross", "$gccrossdir/" . $crossprefix . "gcc");
- symlink("/usr/bin/gccross", "$gccrossdir/" . $crossprefix . "g++");
+ foreach my $prog_ ("cc", "gcc", "cpp", "c++", "g++") {
+ symlink("/usr/bin/gccross", "$gccrossdir/" . $crossprefix .
$prog_);
+ }
$ENV{'PATH'} = "$gccrossdir:" . $ENV{'PATH'};
}
Index: gccross
===================================================================
RCS file: /cvsroot/dpkg-cross/dpkg-cross/gccross,v
retrieving revision 1.4
diff -u -r1.4 gccross
--- gccross 5 Oct 2004 20:11:20 -0000 1.4
+++ gccross 27 Oct 2004 19:48:52 -0000
@@ -32,7 +32,7 @@
read_config();
# Check for recursive call. Convert ARGV only it call is not recursive
[EMAIL PROTECTED] = split("/", $ENV{'GCCROSS_SKIP_PATH'});
[EMAIL PROTECTED] = split(":", $ENV{'GCCROSS_SKIP_PATH'});
$recursive_ = (scalar(@skip_) > 0);
if ($recursive_ || !get_architecture()) {
@newARGV = @ARGV;
Index: gccross.sgml
===================================================================
RCS file: /cvsroot/dpkg-cross/dpkg-cross/gccross.sgml,v
retrieving revision 1.2
diff -u -r1.2 gccross.sgml
--- gccross.sgml 3 Oct 2004 17:28:57 -0000 1.2
+++ gccross.sgml 27 Oct 2004 19:48:53 -0000
@@ -4,8 +4,10 @@
<!ENTITY man_dpkg-cross
"<citerefentry><refentrytitle>dpkg-cross</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
<!ENTITY man_cross-compile
"<citerefentry><refentrytitle>cross-compile</refentrytitle><manvolnum>5</manvolnum></citerefentry>">
<!ENTITY dpkg-cross "<application>dpkg-cross</application>">
+ <!ENTITY dpkg-buildpackage "<application>dpkg-buildpackage</application>">
<!ENTITY readme-debian
"<filename>/usr/share/doc/dpkg-cross/README.Debian.gz</filename>">
<!ENTITY cross-compile "<filename>cross-compile</filename>">
+ <!ENTITY ARCH "<emphasis>ARCH</emphasis>">
<!ENTITY seealso "&man_dpkg-cross;, &man_cross-compile;, &readme-debian;">
<!ENTITY year "2004">
<!ENTITY username "Raphael Bossek">
@@ -35,10 +37,17 @@
The conversion rules are the same as used by &dpkg-cross; so in most
cases
use of &applname; allows you not to change your
<filename>Makefile</filename>s
to cross-compile your application.</para>
- <para>To use &applname; you have to create symlinks for your
cross-compiler that point to
- &applname;. &applname; identifies your compiler and convert all
calling parameters:
- <informalexample><screen># ln -s /usr/bin/gccross
/usr/local/bin/powerpc-linux-gcc
-# ln -s /usr/bin/gccross /usr/local/bin/powerpc-linux-g++
+ <para>To use &applname; without &dpkg-buildpackage; you have to create
symlinks for
+ your cross-compiler that point to &applname;. &applname; identifies
your compiler
+ and convert all calling parameters based on your configuration.</para>
+ <para>No conversion is done if the architecture is not specified.
&dpkg-buildpackage;
+ set by default the environment variable &ARCH; so you do not have to
worry about
+ this.</para>
+ <para>Using &applname; outside of the Debian build process your have to
choices where
+ the host architecture is specified, &cross-compile; (local and system
wide) or
+ the environment variable &ARCH;</para>
+ <para><informalexample><screen># export ARCH=powerpc
+# for fn in cc cpp gcc g++; do ln -s /usr/bin/gccross
/usr/local/bin/powerpc-linux-$fn; done
# export GCCROSS_PREFIX=/usr/bin/ccache
</screen></informalexample></para>
<para>This example assumes that <emphasis>/usr/local/bin</emphasis> is
in your
Index: debian/changelog
===================================================================
RCS file: /cvsroot/dpkg-cross/dpkg-cross/debian/changelog,v
retrieving revision 1.27
diff -u -r1.27 changelog
--- debian/changelog 19 Oct 2004 20:29:51 -0000 1.27
+++ debian/changelog 27 Oct 2004 19:48:54 -0000
@@ -1,3 +1,10 @@
+dpkg-cross (1.19.2) unstable; urgency=low
+
+ * Typo in detection of recursive gccross calls fixed.
+ * Additional GCC sym-links for gccross added.
+
+ -- Raphael Bossek <[EMAIL PROTECTED]> Wed, 27 Oct 2004 21:44:35 +0200
+
dpkg-cross (1.19.1) unstable; urgency=low
* Changed default crossbase to /usr. In fact, such default has been
pgpkM5vdHFlqd.pgp
Description: PGP signature
