diff options
| author | Jeremy Katz <katzj@redhat.com> | 2002-03-12 00:16:09 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2002-03-12 00:16:09 +0000 |
| commit | 8a2bb5dc041c7598fef108eac0edddb0eea4f08c (patch) | |
| tree | 24643a43117f2ba33740cbbe139d116b6a5d56eb /isys | |
| parent | c8ff634241cb6406975171fac66f400da7982e19 (diff) | |
| download | anaconda-8a2bb5dc041c7598fef108eac0edddb0eea4f08c.tar.gz anaconda-8a2bb5dc041c7598fef108eac0edddb0eea4f08c.tar.xz anaconda-8a2bb5dc041c7598fef108eac0edddb0eea4f08c.zip | |
merge using zlib for stage2 instead of gzlib
Diffstat (limited to 'isys')
| -rw-r--r-- | isys/Makefile | 4 | ||||
| -rw-r--r-- | isys/cpio.h | 2 | ||||
| -rw-r--r-- | isys/lang.c | 1 | ||||
| -rw-r--r-- | isys/otherinsmod.c | 1 | ||||
| -rw-r--r-- | isys/stubs.h | 23 | ||||
| -rw-r--r-- | isys/uncpio.c | 2 |
6 files changed, 29 insertions, 4 deletions
diff --git a/isys/Makefile b/isys/Makefile index 747f523ab..744ed54a0 100644 --- a/isys/Makefile +++ b/isys/Makefile @@ -10,7 +10,7 @@ OBJECTS = nfsmount.o nfsmount_clnt.o nfsmount_xdr.o imount.o \ SOBJECTS = $(patsubst %.o,%.lo,$(OBJECTS)) SOURCES = $(patsubst %.o,%.c,$(OBJECTS)) isys.c STATICOBJS = otherinsmod.o -LOADLIBES = -lresolv -lpci -lpopt -lpump -lext2fs -L./gzlib -lgunzip +LOADLIBES = -lresolv -lpci -lpopt -lpump -lext2fs -lz PYMODULES = _isys.so SUBDIRS = gzlib DIET = diet @@ -42,7 +42,7 @@ all: subdirs $(PYMODULES) libisys.a $(DIETLIB) $(CC) -c $(CFLAGS) -fPIC -o $@ $< %.do: %.c - $(DIET) $(CC) -c $(CFLAGS) -DDIET=1 "-Du_char=unsigned char" -o $@ $< + $(DIET) $(CC) -c $(CFLAGS) -DGZLIB=1 -DDIET=1 "-Du_char=unsigned char" -o $@ $< _isys.so: isys.lo $(SOBJECTS) gcc -shared -g -o $@ isys.lo $(SOBJECTS) $(LOADLIBES) diff --git a/isys/cpio.h b/isys/cpio.h index 89fd7a884..1caa4e464 100644 --- a/isys/cpio.h +++ b/isys/cpio.h @@ -3,7 +3,7 @@ #include <sys/types.h> -#include "gzlib/gzlib.h" +#include "stubs.h" /* Note the CPIO_CHECK_ERRNO bit is set only if errno is valid. These have to be positive numbers or this setting the high bit stuff is a bad idea. */ diff --git a/isys/lang.c b/isys/lang.c index 32232cffd..8442607d3 100644 --- a/isys/lang.c +++ b/isys/lang.c @@ -11,6 +11,7 @@ #include "linux/kd.h" #include "cpio.h" +#include "stubs.h" int isysLoadFont(char * fontFile) { char font[8192]; diff --git a/isys/otherinsmod.c b/isys/otherinsmod.c index 95c073b72..881946533 100644 --- a/isys/otherinsmod.c +++ b/isys/otherinsmod.c @@ -8,6 +8,7 @@ #include "cpio.h" #include "isys.h" +#include "stubs.h" /* hack */ int combined_insmod_main(int argc, char ** argv); diff --git a/isys/stubs.h b/isys/stubs.h new file mode 100644 index 000000000..b7da85226 --- /dev/null +++ b/isys/stubs.h @@ -0,0 +1,23 @@ +/* we use gzlib when linked against dietlibc, but otherwise, we should use + zlib. it would make more sense to do the defines in the other direction, + but that causes symbol wackiness because both gunzip_open and gzip_open in + gzlib are gzopen from zlib +*/ + +#ifndef ISYS_STUB +#define ISYS_STUB + +#ifndef GZLIB +#include <zlib.h> + +#define gunzip_open(x) gzopen(x, "r") +#define gunzip_close gzclose +#define gunzip_read gzread +#define gzip_write gzwrite + +#else +#include "gzlib/gzlib.h" + +#endif + +#endif diff --git a/isys/uncpio.c b/isys/uncpio.c index a90d0ddc3..a3232c3c0 100644 --- a/isys/uncpio.c +++ b/isys/uncpio.c @@ -19,7 +19,7 @@ #include <utime.h> #include "cpio.h" -#include "gzlib/gzlib.h" +#include "stubs.h" #if MAJOR_IN_SYSMACROS #include <sys/sysmacros.h> |