pbzip2: update to 1.1.2.
This commit is contained in:
parent
aa5d0c3764
commit
04264bd34a
2 changed files with 66 additions and 9 deletions
|
@ -1,7 +1,57 @@
|
|||
--- Makefile.orig 2009-01-08 22:08:17.000000000 +0100
|
||||
+++ Makefile 2009-09-18 11:14:04.183561770 +0200
|
||||
@@ -15,7 +15,8 @@ CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_
|
||||
#CFLAGS += -DPBZIP_NO_LOADAVG
|
||||
--- Makefile.orig 2011-02-19 11:10:22.000000000 +0100
|
||||
+++ Makefile 2011-02-19 22:27:39.791008472 +0100
|
||||
@@ -2,30 +2,28 @@
|
||||
SHELL = /bin/sh
|
||||
|
||||
# Compiler to use
|
||||
-CC = g++
|
||||
-CFLAGS = -O2
|
||||
-#CFLAGS += -g -Wall
|
||||
-#CFLAGS += -ansi
|
||||
-#CFLAGS += -pedantic
|
||||
-#CFLAGS += -std=c++0x
|
||||
+#CXXFLAGS += -g -Wall
|
||||
+#CXXFLAGS += -ansi
|
||||
+#CXXFLAGS += -pedantic
|
||||
+#CXXFLAGS += -std=c++0x
|
||||
|
||||
# Comment out CFLAGS line below for compatability mode for 32bit file sizes
|
||||
# (less than 2GB) and systems that have compilers that treat int as 64bit
|
||||
# natively (ie: modern AIX)
|
||||
-CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
|
||||
+CXXFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
|
||||
|
||||
# Uncomment CFLAGS line below if you want to compile pbzip2 without load
|
||||
# average support for systems that do not support it
|
||||
-#CFLAGS += -DPBZIP_NO_LOADAVG
|
||||
+#CXXFLAGS += -DPBZIP_NO_LOADAVG
|
||||
|
||||
# Uncomment CFLAGS line below to get debug output
|
||||
-#CFLAGS += -DPBZIP_DEBUG
|
||||
+#CXXFLAGS += -DPBZIP_DEBUG
|
||||
|
||||
# Comment out CFLAGS line below to disable pthread semantics in code
|
||||
-CFLAGS += -D_POSIX_PTHREAD_SEMANTICS
|
||||
+CXXFLAGS += -D_POSIX_PTHREAD_SEMANTICS
|
||||
|
||||
# Comment out CFLAGS line below to disable Thread stack size customization
|
||||
-CFLAGS += -DUSE_STACKSIZE_CUSTOMIZATION
|
||||
+CXXFLAGS += -DUSE_STACKSIZE_CUSTOMIZATION
|
||||
|
||||
# Comment out CFLAGS line below to explicity set ignore trailing garbage
|
||||
# default behavior: 0 - disabled; 1 - enabled (ignore garbage by default)
|
||||
@@ -34,36 +32,32 @@ CFLAGS += -DUSE_STACKSIZE_CUSTOMIZATION
|
||||
#CFLAGS += -DIGNORE_TRAILING_GARBAGE=1
|
||||
|
||||
# On some compilers -pthreads
|
||||
-CFLAGS += -pthread
|
||||
+CXXFLAGS += -pthread
|
||||
|
||||
# External libraries
|
||||
-LDFLAGS = -lbz2
|
||||
-LDFLAGS += -lpthread
|
||||
+LIBS = -lbz2
|
||||
+LIBS += -lpthread
|
||||
|
||||
# Where you want pbzip2 installed when you do 'make install'
|
||||
-PREFIX = /usr
|
||||
|
@ -10,7 +60,15 @@
|
|||
|
||||
all: pbzip2
|
||||
|
||||
@@ -29,15 +30,10 @@ pbzip2-static: pbzip2.cpp libbz2.a
|
||||
# Standard pbzip2 compile
|
||||
pbzip2: pbzip2.cpp BZ2StreamScanner.cpp
|
||||
- $(CC) $(CFLAGS) $^ -o pbzip2 $(LDFLAGS)
|
||||
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $^ $(LIBS) -o pbzip2
|
||||
|
||||
# Choose this if you want to compile in a static version of the libbz2 library
|
||||
pbzip2-static: pbzip2.cpp BZ2StreamScanner.cpp libbz2.a
|
||||
- $(CC) $(CFLAGS) $^ -o pbzip2 -I. -L. $(LDFLAGS)
|
||||
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $^ $(LIBS) -o pbzip2 -I. -L.
|
||||
|
||||
# Install the binary pbzip2 program and man page
|
||||
install: pbzip2
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue