diff options
| author | Michael K. Johnson <johnsonm@redhat.com> | 2002-01-21 20:01:51 +0000 |
|---|---|---|
| committer | Michael K. Johnson <johnsonm@redhat.com> | 2002-01-21 20:01:51 +0000 |
| commit | 376d0428c3a51963f8f733259d293549ba88aaad (patch) | |
| tree | acedbbea50e402a2b57ccf01f779620dc4db6f11 | |
| parent | 6b970aa99d099816892762499a68c3a478bf0e31 (diff) | |
| download | libaio-376d0428c3a51963f8f733259d293549ba88aaad.tar.gz | |
ok, the stub needs to be installed on the system
| -rw-r--r-- | libaio.spec | 14 | ||||
| -rw-r--r-- | src/Makefile | 1 | ||||
| -rw-r--r-- | src/lib/src/Makefile | 5 |
3 files changed, 18 insertions, 2 deletions
diff --git a/libaio.spec b/libaio.spec index e7b1e5d..1931885 100644 --- a/libaio.spec +++ b/libaio.spec @@ -35,18 +35,25 @@ make %install [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT -make install prefix=$RPM_BUILD_ROOT/usr +make install prefix=$RPM_BUILD_ROOT/usr root=$RPM_BUILD_ROOT %clean [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT -%post -p /sbin/ldconfig +%post +# if no libredhat-kernel.so is in place, temporarily use our stub +# so that programs will link correctly +if [ ! -f /lib/libredhat-kernel.so ] ; then + ln -sf /lib/kernel/stub/* /lib/ +fi +/sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root) %attr(0755,root,root) /usr/lib/libaio.so.* +%attr(0755,root,root) /lib/kernel/stub/* %doc COPYING TODO %files devel @@ -56,5 +63,8 @@ make install prefix=$RPM_BUILD_ROOT/usr %attr(0644,root,root) /usr/lib/libaio.a %changelog +* Mon Jan 21 2002 Michael K. Johnson <johnsonm@redhat.com> +- Added stub library + * Sun Jan 20 2002 Michael K. Johnson <johnsonm@redhat.com> - Initial packaging diff --git a/src/Makefile b/src/Makefile index a713641..8a7c64f 100644 --- a/src/Makefile +++ b/src/Makefile @@ -39,6 +39,7 @@ $(soname): $(libaio_sobjs) lib/libredhat-kernel.so $(CC) $(SO_CFLAGS) -Wl,--version-script=libaio.map -Wl,-soname=$(soname) -o $@ $^ $(LINK_FLAGS) install: $(all_targets) + @$(MAKE) -C lib/src install install -D -m 644 libaio.h $(prefix)/include/libaio.h install -D -m 644 libaio.a $(prefix)/lib/libaio.a install -D -m 755 $(soname) $(prefix)/lib/$(soname) diff --git a/src/lib/src/Makefile b/src/lib/src/Makefile index 1f3ac8a..474109e 100644 --- a/src/lib/src/Makefile +++ b/src/lib/src/Makefile @@ -1,3 +1,4 @@ +root=/ all: libredhat-kernel.so ASFLAGS=-D__KERNEL__ -D__ASSEMBLY__ -I../include -nostdlib -nostartfiles @@ -21,6 +22,10 @@ libredhat-kernel.so.1: $(so_objs) libredhat-kernel.map libredhat-kernel.so: libredhat-kernel.so.1 ln -sf $< $@ +install: + install -D -m 755 libredhat-kernel.so.1 $(root)/lib/kernel/stub/ + ln -sf libredhat-kernel.so.1 $(root)/lib/kernel/stub/libaio.so + clean: rm -f *.o libredhat-kernel.so myln libredhat-kernel.so.1 |