Gentoo Archives: gentoo-commits

From: "Justin Lecher (jlec)" <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-arch/lbzip2/files: 0.22-Makefile.patch 0.21-Makefile.patch
Date: Fri, 19 Feb 2010 09:20:06
Message-Id: E1NiP1o-00066X-OA@stork.gentoo.org
1 jlec 10/02/19 09:20:04
2
3 Added: 0.22-Makefile.patch
4 Removed: 0.21-Makefile.patch
5 Log:
6 Version Bump
7 (Portage version: 2.2_rc62/cvs/Linux i686)
8
9 Revision Changes Path
10 1.1 app-arch/lbzip2/files/0.22-Makefile.patch
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-arch/lbzip2/files/0.22-Makefile.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-arch/lbzip2/files/0.22-Makefile.patch?rev=1.1&content-type=text/plain
14
15 Index: 0.22-Makefile.patch
16 ===================================================================
17 --- Makefile 2009-04-04 00:33:49.000000000 +0200
18 +++ Makefile.new 2009-04-15 21:12:02.886390550 +0200
19 @@ -1,34 +1,27 @@
20 # Makefile,v 1.9 2009-04-03 22:33:49 lacos Exp
21 .POSIX:
22
23 -CC=gcc
24 -CFLAGS=$$($(SHELL) lfs.sh CFLAGS) -D _XOPEN_SOURCE=500 -pipe -ansi -pedantic \
25 - -O2
26 -
27 -
28 -
29 -
30 -LDFLAGS=-s $$($(SHELL) lfs.sh LDFLAGS)
31 -LIBS=-l pthread -l bz2 $$($(SHELL) lfs.sh LIBS)
32 +CFLAGS += -D _XOPEN_SOURCE=500
33 +LIBS=-lpthread -lbz2
34
35 lbzip2: main.o lbzip2.o lbunzip2.o lbunzip2_single.o lacos_rbtree.o
36 - $(CC) -o lbzip2 $(LDFLAGS) main.o lbzip2.o lbunzip2.o \
37 + $(CC) $(CPPFLAGS) $(LDFLAGS) -o lbzip2 main.o lbzip2.o lbunzip2.o \
38 lbunzip2_single.o lacos_rbtree.o $(LIBS)
39
40 main.o: main.c main.h lbunzip2_single.h lbunzip2.h lbzip2.h
41 - $(CC) $(CFLAGS) -c main.c
42 + $(CC) $(CFLAGS) $(CPPFLAGS) -c main.c
43
44 lbzip2.o: lbzip2.c main.h lbzip2.h lacos_rbtree.h
45 - $(CC) $(CFLAGS) -c lbzip2.c
46 + $(CC) $(CFLAGS) $(CPPFLAGS) -c lbzip2.c
47
48 lbunzip2.o: lbunzip2.c main.h lbunzip2.h lacos_rbtree.h
49 - $(CC) $(CFLAGS) -c lbunzip2.c
50 + $(CC) $(CFLAGS) $(CPPFLAGS) -c lbunzip2.c
51
52 lbunzip2_single.o: lbunzip2_single.c main.h lbunzip2_single.h
53 - $(CC) $(CFLAGS) -c lbunzip2_single.c
54 + $(CC) $(CFLAGS) $(CPPFLAGS) -c lbunzip2_single.c
55
56 lacos_rbtree.o: lacos_rbtree.c lacos_rbtree.h
57 - $(CC) $(CFLAGS) -c lacos_rbtree.c
58 + $(CC) $(CFLAGS) $(CPPFLAGS) -c lacos_rbtree.c
59
60 clean:
61 rm -f lbzip2 main.o lbzip2.o lbunzip2.o lbunzip2_single.o \