summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-03-20 17:21:57 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-03-20 17:21:57 +0000
commit3daeba5a5b0d0fe47be341139aa5786ce9e288e2 (patch)
tree075deb1612e8ba3eff7aee2bcf4890ef6bea141f
parent23f9db1e651a6e2777decbfa8638d32178846bb2 (diff)
downloaddrakx-backup-do-not-use-3daeba5a5b0d0fe47be341139aa5786ce9e288e2.tar
drakx-backup-do-not-use-3daeba5a5b0d0fe47be341139aa5786ce9e288e2.tar.gz
drakx-backup-do-not-use-3daeba5a5b0d0fe47be341139aa5786ce9e288e2.tar.bz2
drakx-backup-do-not-use-3daeba5a5b0d0fe47be341139aa5786ce9e288e2.tar.xz
drakx-backup-do-not-use-3daeba5a5b0d0fe47be341139aa5786ce9e288e2.zip
fix pcmcia functions only on x86
-rw-r--r--perl-install/c/Makefile.PL7
-rw-r--r--perl-install/c/stuff.xs.pm7
-rw-r--r--perl-install/install_steps_interactive.pm2
3 files changed, 11 insertions, 5 deletions
diff --git a/perl-install/c/Makefile.PL b/perl-install/c/Makefile.PL
index 5739da12c..3e4c79051 100644
--- a/perl-install/c/Makefile.PL
+++ b/perl-install/c/Makefile.PL
@@ -1,4 +1,5 @@
use ExtUtils::MakeMaker;
+use Config;
# See lib/ExtUtils/MakeMaker.pm for details of how to influence
# the contents of the Makefile that is written.
@@ -6,15 +7,15 @@ my $libs = '-lldetect';
$libs .= ' -L/usr/X11R6/lib -lX11 -lgdk -lXxf86misc' if $ENV{C_DRAKX};
$libs .= ' -lrpm -lrpmio -lz' if $ENV{C_RPM};
-my $pcmcia_dir = '../../mdk-stage1/pcmcia';
+my $pcmcia_dir = $Config{archname} =~ /i.86/ ? '../../mdk-stage1/pcmcia' : '';
WriteMakefile(
'NAME' => 'stuff',
'OPTIMIZE' => '-Os',
'MAKEFILE' => 'Makefile_c',
- 'OBJECT' => "stuff.o smp.o sbus.o silo.o $pcmcia_dir/pcmcia_probe.o",
+ 'OBJECT' => "stuff.o smp.o sbus.o silo.o " . ($pcmcia_dir && "$pcmcia_dir/pcmcia_probe.o"),
'VERSION_FROM' => 'stuff.pm', # finds $VERSION
'LIBS' => [$libs], # e.g., '-lm'
'DEFINE' => '', # e.g., '-DHAVE_SOMETHING'
- 'INC' => "-I/usr/include/rpm -I$pcmcia_dir `gtk-config --cflags` `glib-config --cflags`", # e.g., '-I/usr/include/other'
+ 'INC' => "-I/usr/include/rpm `gtk-config --cflags` `glib-config --cflags`" . ($pcmcia_dir && " -I$pcmcia_dir"),
);
diff --git a/perl-install/c/stuff.xs.pm b/perl-install/c/stuff.xs.pm
index bcc14f24a..7a3bc6c2d 100644
--- a/perl-install/c/stuff.xs.pm
+++ b/perl-install/c/stuff.xs.pm
@@ -1,3 +1,5 @@
+use Config;
+
print '
#include "EXTERN.h"
#include "perl.h"
@@ -106,9 +108,12 @@ Xtest(display)
RETVAL
';
-$ENV{C_DRAKX} and print '
+$ENV{C_DRAKX} && $Config{archname} =~ /i.86/ and print '
char *
pcmcia_probe()
+';
+
+$ENV{C_DRAKX} and print '
void
setMouseLive(display, type, emulate3buttons)
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 22a1fb074..874099d14 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -261,7 +261,7 @@ sub selectMouse {
sub setupSCSI {
my ($o, $clicked) = @_;
- if (!$::noauto) {
+ if (!$::noauto && arch() =~ /i.86/) {
if ($o->{pcmcia} ||= !$::testing && c::pcmcia_probe()) {
my $w = $o->wait_message(_("PCMCIA"), _("Configuring PCMCIA cards..."));
modules::configure_pcmcia($o->{pcmcia});