Gentoo Archives: gentoo-commits

From: "Maciej Mrozowski (reavertm)" <reavertm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-libs/libaio/files: libaio-0.3.109-install.patch
Date: Wed, 25 Aug 2010 21:41:05
Message-Id: 20100825214102.B317720051@flycatcher.gentoo.org
1 reavertm 10/08/25 21:41:02
2
3 Added: libaio-0.3.109-install.patch
4 Log:
5 Version bump, fix bug 325355 (install to /lib), add static-libs support
6
7 (Portage version: 2.2_rc69/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 dev-libs/libaio/files/libaio-0.3.109-install.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libaio/files/libaio-0.3.109-install.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libaio/files/libaio-0.3.109-install.patch?rev=1.1&content-type=text/plain
14
15 Index: libaio-0.3.109-install.patch
16 ===================================================================
17 diff -ru ../libaio-0.3.109/Makefile ./Makefile
18 --- ../libaio-0.3.109/Makefile 2009-10-09 20:17:02.000000000 +0200
19 +++ ./Makefile 2010-08-25 23:04:18.963033260 +0200
20 @@ -5,9 +5,9 @@
21 CVSTAG = $(NAME)_$(subst .,-,$(VERSION))_$(subst .,-,$(RELEASE))
22 RPMBUILD=$(shell `which rpmbuild >&/dev/null` && echo "rpmbuild" || echo "rpm")
23
24 -prefix=/usr
25 +prefix=$(EPREFIX)/usr
26 includedir=$(prefix)/include
27 -libdir=$(prefix)/lib
28 +libdir=$(EPREFIX)/$(LIBDIR)
29
30 pkgname := libaio
31 ver := $(shell cat .version)
32 diff -ru ../libaio-0.3.109/src/Makefile ./src/Makefile
33 --- ../libaio-0.3.109/src/Makefile 2009-10-09 20:17:02.000000000 +0200
34 +++ ./src/Makefile 2010-08-25 23:05:01.047919131 +0200
35 @@ -1,6 +1,4 @@
36 -prefix=/usr
37 -includedir=$(prefix)/include
38 -libdir=$(prefix)/lib
39 +usrlibdir=$(prefix)/$(LIBDIR)
40
41 ARCH := $(shell uname -m | sed -e s/i.86/i386/)
42 CFLAGS := -nostdlib -nostartfiles -Wall -I. -g -fomit-frame-pointer -O2 -fPIC
43 @@ -51,11 +49,11 @@
44 $(CC) $(SO_CFLAGS) -Wl,--version-script=libaio.map -Wl,-soname=$(soname) -o $@ $(libaio_sobjs) $(LINK_FLAGS)
45
46 install: $(all_targets)
47 - install -D -m 644 libaio.h $(includedir)/libaio.h
48 - install -D -m 644 libaio.a $(libdir)/libaio.a
49 - install -D -m 755 $(libname) $(libdir)/$(libname)
50 - ln -sf $(libname) $(libdir)/$(soname)
51 - ln -sf $(libname) $(libdir)/libaio.so
52 + install -D -m 644 libaio.h $(DESTDIR)$(includedir)/libaio.h
53 + install -D -m 644 libaio.a $(DESTDIR)$(usrlibdir)/libaio.a
54 + install -D -m 755 $(libname) $(DESTDIR)$(libdir)/$(libname)
55 + ln -sf $(libname) $(DESTDIR)$(libdir)/$(soname)
56 + ln -sf $(libname) $(DESTDIR)$(libdir)/libaio.so
57
58 $(libaio_objs): libaio.h