diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2001-03-20 13:03:20 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2001-03-20 13:03:20 +0000 |
| commit | a3311933f3fbdca7779b1ce478105eb095bdb02e (patch) | |
| tree | 23b2aa78ef7e4f5b8319ecb7c71715bb296e60ee | |
| parent | d634261666945054c44718d00b9bc2a48e56bbd6 (diff) | |
| download | drakx-backup-do-not-use-a3311933f3fbdca7779b1ce478105eb095bdb02e.tar drakx-backup-do-not-use-a3311933f3fbdca7779b1ce478105eb095bdb02e.tar.gz drakx-backup-do-not-use-a3311933f3fbdca7779b1ce478105eb095bdb02e.tar.bz2 drakx-backup-do-not-use-a3311933f3fbdca7779b1ce478105eb095bdb02e.tar.xz drakx-backup-do-not-use-a3311933f3fbdca7779b1ce478105eb095bdb02e.zip | |
have pcmcia_probe in stage2 (for non pcmcia.img, stage1 doesn't give the parameter any more)
| -rw-r--r-- | perl-install/c/Makefile.PL | 6 | ||||
| -rw-r--r-- | perl-install/c/stuff.xs.pm | 6 | ||||
| -rw-r--r-- | perl-install/install2.pm | 2 |
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 { |