Marcus Meissner
b20146423c
- libaio-optflags.diff: readd -stdlib to allow -fstack-protector-strong builds (unclear why it was not allowedlZZ) - 01_link_libgcc.patch, 02_libdevdir.patch: refreshed OBS-URL: https://build.opensuse.org/request/show/390457 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libaio?expand=0&rev=27
66 lines
2.1 KiB
Diff
66 lines
2.1 KiB
Diff
---
|
|
Makefile | 9 ++++++++-
|
|
src/Makefile | 12 +++++++-----
|
|
2 files changed, 15 insertions(+), 6 deletions(-)
|
|
|
|
Index: libaio-0.3.109/Makefile
|
|
===================================================================
|
|
--- libaio-0.3.109.orig/Makefile
|
|
+++ libaio-0.3.109/Makefile
|
|
@@ -5,9 +5,11 @@ RELEASE=$(shell awk '/Release:/ { print
|
|
CVSTAG = $(NAME)_$(subst .,-,$(VERSION))_$(subst .,-,$(RELEASE))
|
|
RPMBUILD=$(shell `which rpmbuild >&/dev/null` && echo "rpmbuild" || echo "rpm")
|
|
|
|
+DESTDIR=
|
|
prefix=/usr
|
|
includedir=$(prefix)/include
|
|
libdir=$(prefix)/lib
|
|
+libdevdir=$(prefix)/lib
|
|
|
|
pkgname := libaio
|
|
ver := $(shell cat .version)
|
|
@@ -23,7 +25,12 @@ all:
|
|
@$(MAKE) -C src
|
|
|
|
install:
|
|
- @$(MAKE) -C src install prefix=$(prefix) includedir=$(includedir) libdir=$(libdir)
|
|
+ @$(MAKE) -C src install \
|
|
+ DESTDIR=$(DESTDIR) \
|
|
+ prefix=$(prefix) \
|
|
+ includedir=$(includedir) \
|
|
+ libdir=$(libdir) \
|
|
+ libdevdir=$(libdevdir)
|
|
|
|
check:
|
|
@$(MAKE) -C harness check
|
|
Index: libaio-0.3.109/src/Makefile
|
|
===================================================================
|
|
--- libaio-0.3.109.orig/src/Makefile
|
|
+++ libaio-0.3.109/src/Makefile
|
|
@@ -1,6 +1,8 @@
|
|
+DESTDIR=
|
|
prefix=/usr
|
|
includedir=$(prefix)/include
|
|
libdir=$(prefix)/lib
|
|
+libdevdir=$(prefix)/lib
|
|
|
|
ARCH := $(shell uname -m | sed -e s/i.86/i386/)
|
|
CFLAGS := -nostartfiles -Wall -I. -g -fomit-frame-pointer -O2 -fPIC $(OPTFLAGS)
|
|
@@ -51,11 +53,11 @@ $(libname): $(libaio_sobjs) libaio.map
|
|
$(CC) $(SO_CFLAGS) -Wl,--version-script=libaio.map -Wl,-soname=$(soname) -o $@ $(libaio_sobjs) $(LINK_FLAGS)
|
|
|
|
install: $(all_targets)
|
|
- install -D -m 644 libaio.h $(includedir)/libaio.h
|
|
- install -D -m 644 libaio.a $(libdir)/libaio.a
|
|
- install -D -m 755 $(libname) $(libdir)/$(libname)
|
|
- ln -sf $(libname) $(libdir)/$(soname)
|
|
- ln -sf $(libname) $(libdir)/libaio.so
|
|
+ install -D -m 644 libaio.h $(DESTDIR)$(includedir)/libaio.h
|
|
+ install -D -m 644 libaio.a $(DESTDIR)$(libdevdir)/libaio.a
|
|
+ install -D -m 755 $(libname) $(DESTDIR)$(libdir)/$(libname)
|
|
+ ln -sf $(libdir)/$(libname) $(DESTDIR)$(libdir)/$(soname)
|
|
+ ln -sf $(libdir)/$(libname) $(DESTDIR)$(libdevdir)/libaio.so
|
|
|
|
$(libaio_objs): libaio.h
|
|
|