| 1 |
vapier 11/11/02 16:13:48 |
| 2 |
|
| 3 |
Added: pbzip2-1.1.6-makefile.patch |
| 4 |
Log: |
| 5 |
Version bump. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha71/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 app-arch/pbzip2/files/pbzip2-1.1.6-makefile.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/pbzip2/files/pbzip2-1.1.6-makefile.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/pbzip2/files/pbzip2-1.1.6-makefile.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: pbzip2-1.1.6-makefile.patch |
| 16 |
=================================================================== |
| 17 |
--- Makefile.orig 2011-02-21 00:17:16.334746748 +0200 |
| 18 |
+++ Makefile 2011-02-21 00:19:16.504881112 +0200 |
| 19 |
@@ -2,8 +2,6 @@ |
| 20 |
SHELL = /bin/sh |
| 21 |
|
| 22 |
# Compiler to use |
| 23 |
-CC = g++ |
| 24 |
-CFLAGS = -O2 |
| 25 |
#CFLAGS += -g -Wall |
| 26 |
#CFLAGS += -ansi |
| 27 |
#CFLAGS += -pedantic |
| 28 |
@@ -12,7 +10,7 @@ |
| 29 |
# Comment out CFLAGS line below for compatability mode for 32bit file sizes |
| 30 |
# (less than 2GB) and systems that have compilers that treat int as 64bit |
| 31 |
# natively (ie: modern AIX) |
| 32 |
-CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 |
| 33 |
+CXXFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 |
| 34 |
|
| 35 |
# Uncomment CFLAGS line below if you want to compile pbzip2 without load |
| 36 |
# average support for systems that do not support it |
| 37 |
@@ -22,10 +20,10 @@ |
| 38 |
#CFLAGS += -DPBZIP_DEBUG |
| 39 |
|
| 40 |
# Comment out CFLAGS line below to disable pthread semantics in code |
| 41 |
-CFLAGS += -D_POSIX_PTHREAD_SEMANTICS |
| 42 |
+CXXFLAGS += -D_POSIX_PTHREAD_SEMANTICS |
| 43 |
|
| 44 |
# Comment out CFLAGS line below to disable Thread stack size customization |
| 45 |
-CFLAGS += -DUSE_STACKSIZE_CUSTOMIZATION |
| 46 |
+CXXFLAGS += -DUSE_STACKSIZE_CUSTOMIZATION |
| 47 |
|
| 48 |
# Comment out CFLAGS line below to explicity set ignore trailing garbage |
| 49 |
# default behavior: 0 - disabled; 1 - enabled (ignore garbage by default) |
| 50 |
@@ -34,11 +32,11 @@ |
| 51 |
#CFLAGS += -DIGNORE_TRAILING_GARBAGE=1 |
| 52 |
|
| 53 |
# On some compilers -pthreads |
| 54 |
-CFLAGS += -pthread |
| 55 |
+CXXFLAGS += -pthread |
| 56 |
|
| 57 |
# External libraries |
| 58 |
-LDFLAGS = -lbz2 |
| 59 |
-LDFLAGS += -lpthread |
| 60 |
+LIBS = -lbz2 |
| 61 |
+LIBS += -lpthread |
| 62 |
|
| 63 |
# Where you want pbzip2 installed when you do 'make install' |
| 64 |
PREFIX = /usr |
| 65 |
@@ -47,11 +45,11 @@ |
| 66 |
|
| 67 |
# Standard pbzip2 compile |
| 68 |
pbzip2: pbzip2.cpp BZ2StreamScanner.cpp ErrorContext.cpp |
| 69 |
- $(CC) $(CFLAGS) $^ -o pbzip2 $(LDFLAGS) |
| 70 |
+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $^ $(LIBS) -o pbzip2 |
| 71 |
|
| 72 |
# Choose this if you want to compile in a static version of the libbz2 library |
| 73 |
pbzip2-static: pbzip2.cpp BZ2StreamScanner.cpp ErrorContext.cpp libbz2.a |
| 74 |
- $(CC) $(CFLAGS) $^ -o pbzip2 -I. -L. $(LDFLAGS) |
| 75 |
+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $^ $(LIBS) -o pbzip2 -I. -L. |
| 76 |
|
| 77 |
# Install the binary pbzip2 program and man page |
| 78 |
install: pbzip2 |
Archives