summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-09-02 21:12:15 +0000
committerMike Frysinger <vapier@gentoo.org>2011-09-02 21:12:15 +0000
commit5d93b2ea6a39de21b5970e4aeb9c928c864a197e (patch)
tree0af1cff48fd4cdf45abe008f910c002a3e9262b8 /app-arch/pbzip2/files
parentmedia-gfx/gimp: Add myself as a backup maintainer (diff)
downloadgentoo-2-5d93b2ea6a39de21b5970e4aeb9c928c864a197e.tar.gz
gentoo-2-5d93b2ea6a39de21b5970e4aeb9c928c864a197e.tar.bz2
gentoo-2-5d93b2ea6a39de21b5970e4aeb9c928c864a197e.zip
Fix broken USE=static handling and respect env CPPFLAGS.
(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)
Diffstat (limited to 'app-arch/pbzip2/files')
-rw-r--r--app-arch/pbzip2/files/pbzip2-1.1.2-makefile.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/app-arch/pbzip2/files/pbzip2-1.1.2-makefile.patch b/app-arch/pbzip2/files/pbzip2-1.1.2-makefile.patch
index 2457f0197be7..cc4cb2b15b72 100644
--- a/app-arch/pbzip2/files/pbzip2-1.1.2-makefile.patch
+++ b/app-arch/pbzip2/files/pbzip2-1.1.2-makefile.patch
@@ -51,12 +51,12 @@
# Standard pbzip2 compile
pbzip2: pbzip2.cpp BZ2StreamScanner.cpp
- $(CC) $(CFLAGS) $^ -o pbzip2 $(LDFLAGS)
-+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $^ $(LIBS) -o pbzip2
++ $(CXX) $(CPPFLAGS) $(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.
++ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $^ $(LIBS) -o pbzip2 -I. -L.
# Install the binary pbzip2 program and man page
install: pbzip2