Permalink
Browse files

illumos-extra#7 pbzip2 filesize limited to 2GB

  • Loading branch information...
wesolows committed Sep 27, 2012
1 parent f64f336 commit 0b5988a9e8f535108dab59c817c5e98aff8015da
Showing with 6 additions and 25 deletions.
  1. +2 −1 pbzip2/Makefile
  2. +4 −24 pbzip2/makefile.build
View
@@ -31,8 +31,9 @@ FROB_SENTINEL.64 = /bin/true
OVERRIDES = \
CC="$(GCC)" \
+ CXX="$(GXX)" \
CPPFLAGS="$(CPPFLAGS)" \
- LDFLAGS="$(LDFLAGS.32)"
+ LDFLAGS="$(LDFLAGS)"
include ../Makefile.targ
View
@@ -1,14 +1,12 @@
# Make file for parallel BZIP2
SHELL = /bin/sh
-# Compiler to use
-CC = g++
CFLAGS += -O2
# 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)
-CPPFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+override CPPFLAGS += -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
@@ -18,10 +16,10 @@ CPPFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
#CPPFLAGS += -DPBZIP_DEBUG
# Comment out CFLAGS line below to disable pthread semantics in code
-CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS
+override CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS
# Comment out CFLAGS line below to disable Thread stack size customization
-CPPFLAGS += -DUSE_STACKSIZE_CUSTOMIZATION
+override CPPFLAGS += -DUSE_STACKSIZE_CUSTOMIZATION
# Comment out CFLAGS line below to explicity set ignore trailing garbage
# default behavior: 0 - disabled; 1 - enabled (ignore garbage by default)
@@ -31,28 +29,10 @@ CPPFLAGS += -DUSE_STACKSIZE_CUSTOMIZATION
#CPPFLAGS += -DIGNORE_TRAILING_GARBAGE=1
# External libraries
-LIBS += -lbz2 -lpthread
-
-# Where you want pbzip2 installed when you do 'make install'
-PREFIX = /usr
+override LIBS += -lbz2 -lpthread
all: pbzip2
# Standard pbzip2 compile
pbzip2: pbzip2.cpp BZ2StreamScanner.cpp ErrorContext.cpp
$(CXX) $(CPPFLAGS) $(CFLAGS) $^ -o pbzip2 $(LDFLAGS) $(LIBS)
-
-# Install the binary pbzip2 program and man page
-install: pbzip2
- if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi
- if ( test ! -d $(PREFIX)/man ) ; then mkdir -p $(PREFIX)/man ; fi
- if ( test ! -d $(PREFIX)/man/man1 ) ; then mkdir -p $(PREFIX)/man/man1 ; fi
- cp -f pbzip2 $(PREFIX)/bin/pbzip2
- chmod a+x $(PREFIX)/bin/pbzip2
- ln -s -f $(PREFIX)/bin/pbzip2 $(PREFIX)/bin/pbunzip2
- ln -s -f $(PREFIX)/bin/pbzip2 $(PREFIX)/bin/pbzcat
- cp -f pbzip2.1 $(PREFIX)/man/man1
- chmod a+r $(PREFIX)/man/man1/pbzip2.1
-
-clean:
- rm -f *.o pbzip2

0 comments on commit 0b5988a

Please sign in to comment.