diff options
| author | Erik Troan <ewt@redhat.com> | 2001-06-20 01:58:01 +0000 |
|---|---|---|
| committer | Erik Troan <ewt@redhat.com> | 2001-06-20 01:58:01 +0000 |
| commit | dbb4861e176cadfb14c48313fd9922d3dbfcefed (patch) | |
| tree | cdd243cceb8d7e4b2aeac075fbb21c5e096d1c66 | |
| parent | e4a41b5a1a08c2bd0e11b8a222d504f09f61b89a (diff) | |
| download | anaconda-dbb4861e176cadfb14c48313fd9922d3dbfcefed.tar.gz anaconda-dbb4861e176cadfb14c48313fd9922d3dbfcefed.tar.xz anaconda-dbb4861e176cadfb14c48313fd9922d3dbfcefed.zip | |
merge from (now defunct) anaconda-dispatch branch
| -rw-r--r-- | stubs/.cvsignore | 2 | ||||
| -rw-r--r-- | stubs/Makefile | 10 | ||||
| -rw-r--r-- | stubs/bzip.c | 13 |
3 files changed, 20 insertions, 5 deletions
diff --git a/stubs/.cvsignore b/stubs/.cvsignore index e7ae61616..7a55762fb 100644 --- a/stubs/.cvsignore +++ b/stubs/.cvsignore @@ -1 +1 @@ -libbz.so.0 +libbz2.so.1 diff --git a/stubs/Makefile b/stubs/Makefile index 05e763054..640f4653e 100644 --- a/stubs/Makefile +++ b/stubs/Makefile @@ -1,14 +1,16 @@ include ../Makefile.inc -all: libbz2.so.0 +LIBBZ = libbz2.so.1 -libbz2.so.0: bzip.c - gcc -fPIC -shared -o libbz2.so.0 bzip.c +all: $(LIBBZ) + +$(LIBBZ): bzip.c + gcc -fPIC -shared -o $(LIBBZ) bzip.c clean: rm -f *.so.* *.o install: - install libbz2.so.0 $(DESTDIR)/$(RUNTIMEDIR) + install $(LIBBZ) $(DESTDIR)/$(RUNTIMEDIR) depend: diff --git a/stubs/bzip.c b/stubs/bzip.c index b4bfda84a..b6f304bf9 100644 --- a/stubs/bzip.c +++ b/stubs/bzip.c @@ -1,5 +1,9 @@ /* empty bzip stubs */ +# define strong_alias(name, aliasname) _strong_alias(name, aliasname) +# define _strong_alias(name, aliasname) \ + extern __typeof (name) aliasname __attribute__ ((alias (#name))); + void * bzdopen(int fd, const char *mode) { return (void *) 0; } @@ -26,3 +30,12 @@ void bzclose(void * b) { int bzflush(void * b) { return 0; } + +strong_alias(bzclose, BZ2_bzclose) +strong_alias(bzdopen, BZ2_bzdopen) +strong_alias(bzerror, BZ2_bzerror) +strong_alias(bzflush, BZ2_bzflush) +strong_alias(bzopen, BZ2_bzopen) +strong_alias(bzread, BZ2_bzread) +strong_alias(bzwrite, BZ2_bzwrite) + |