summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-03-20 13:03:20 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-03-20 13:03:20 +0000
commita3311933f3fbdca7779b1ce478105eb095bdb02e (patch)
tree23b2aa78ef7e4f5b8319ecb7c71715bb296e60ee /perl-install
parentd634261666945054c44718d00b9bc2a48e56bbd6 (diff)
downloaddrakx-a3311933f3fbdca7779b1ce478105eb095bdb02e.tar
drakx-a3311933f3fbdca7779b1ce478105eb095bdb02e.tar.gz
drakx-a3311933f3fbdca7779b1ce478105eb095bdb02e.tar.bz2
drakx-a3311933f3fbdca7779b1ce478105eb095bdb02e.tar.xz
drakx-a3311933f3fbdca7779b1ce478105eb095bdb02e.zip
have pcmcia_probe in stage2 (for non pcmcia.img, stage1 doesn't give the parameter any more)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/c/Makefile.PL6
-rw-r--r--perl-install/c/stuff.xs.pm6
-rw-r--r--perl-install/install2.pm2
3 files changed, 12 insertions, 2 deletions
diff --git a/perl-install/c/Makefile.PL b/perl-install/c/Makefile.PL
index 080a755e0..5739da12c 100644
--- a/perl-install/c/Makefile.PL
+++ b/perl-install/c/Makefile.PL
@@ -6,13 +6,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';
+
WriteMakefile(
'NAME' => 'stuff',
'OPTIMIZE' => '-Os',
'MAKEFILE' => 'Makefile_c',
- 'OBJECT' => 'stuff.o smp.o sbus.o silo.o',
+ 'OBJECT' => "stuff.o smp.o sbus.o silo.o $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 `gtk-config --cflags` `glib-config --cflags`', # e.g., '-I/usr/include/other'
+ 'INC' => "-I/usr/include/rpm -I$pcmcia_dir `gtk-config --cflags` `glib-config --cflags`", # e.g., '-I/usr/include/other'
);
diff --git a/perl-install/c/stuff.xs.pm b/perl-install/c/stuff.xs.pm
index 590053618..bcc14f24a 100644
--- a/perl-install/c/stuff.xs.pm
+++ b/perl-install/c/stuff.xs.pm
@@ -78,6 +78,9 @@ void initIMPS2() {
tcflush (fd, TCIFLUSH);
tcdrain(fd);
}
+
+void log_message(const char * s, ...) {}
+
';
print '
@@ -104,6 +107,9 @@ Xtest(display)
';
$ENV{C_DRAKX} and print '
+char *
+pcmcia_probe()
+
void
setMouseLive(display, type, emulate3buttons)
char *display
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 5daeca68e..6b3e17c8e 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -473,6 +473,8 @@ sub main {
eval { $o = $::o = install_any::loadO($o, "patch") } if $patch;
eval { $o = $::o = install_any::loadO($o, $cfg) } if $cfg;
+ $o->{pcmcia} ||= c::pcmcia_probe();
+
eval { modules::load("af_packet") };
map_index {