[gentoo-commits] gentoo-x86 commit in app-arch/pbzip2/files: pbzip2-1.1.2-makefile.patch

[Mike Frysinger (vapier)]

vapier      11/09/02 21:12:15

  Modified:             pbzip2-1.1.2-makefile.patch
  Log:
  Fix broken USE=static handling and respect env CPPFLAGS.
  
  (Portage version: 2.2.0_alpha51/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  app-arch/pbzip2/files/pbzip2-1.1.2-makefile.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/pbzip2/files/pbzip2-1.1.2-makefile.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/pbzip2/files/pbzip2-1.1.2-makefile.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/pbzip2/files/pbzip2-1.1.2-makefile.patch?r1=1.1&r2=1.2

Index: pbzip2-1.1.2-makefile.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-arch/pbzip2/files/pbzip2-1.1.2-makefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pbzip2-1.1.2-makefile.patch	20 Feb 2011 22:24:38 -0000	1.1
+++ pbzip2-1.1.2-makefile.patch	2 Sep 2011 21:12:15 -0000	1.2
@@ -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