| 1 |
commit: f288d2daecfa21f819a1122caa17731dca518de8 |
| 2 |
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Fri Jul 1 19:56:29 2016 +0000 |
| 4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 3 11:28:40 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f288d2da |
| 7 |
|
| 8 |
app-arch/pbzip2: remove unused patch |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/1812 |
| 11 |
|
| 12 |
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> |
| 13 |
|
| 14 |
app-arch/pbzip2/files/pbzip2-1.1.6-makefile.patch | 62 ----------------------- |
| 15 |
1 file changed, 62 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-arch/pbzip2/files/pbzip2-1.1.6-makefile.patch b/app-arch/pbzip2/files/pbzip2-1.1.6-makefile.patch |
| 18 |
deleted file mode 100644 |
| 19 |
index 72b8795..0000000 |
| 20 |
--- a/app-arch/pbzip2/files/pbzip2-1.1.6-makefile.patch |
| 21 |
+++ /dev/null |
| 22 |
@@ -1,62 +0,0 @@ |
| 23 |
---- Makefile.orig 2011-02-21 00:17:16.334746748 +0200 |
| 24 |
-+++ Makefile 2011-02-21 00:19:16.504881112 +0200 |
| 25 |
-@@ -2,8 +2,6 @@ |
| 26 |
- SHELL = /bin/sh |
| 27 |
- |
| 28 |
- # Compiler to use |
| 29 |
--CC = g++ |
| 30 |
--CFLAGS = -O2 |
| 31 |
- #CFLAGS += -g -Wall |
| 32 |
- #CFLAGS += -ansi |
| 33 |
- #CFLAGS += -pedantic |
| 34 |
-@@ -12,7 +10,7 @@ |
| 35 |
- # Comment out CFLAGS line below for compatability mode for 32bit file sizes |
| 36 |
- # (less than 2GB) and systems that have compilers that treat int as 64bit |
| 37 |
- # natively (ie: modern AIX) |
| 38 |
--CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 |
| 39 |
-+CXXFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 |
| 40 |
- |
| 41 |
- # Uncomment CFLAGS line below if you want to compile pbzip2 without load |
| 42 |
- # average support for systems that do not support it |
| 43 |
-@@ -22,10 +20,10 @@ |
| 44 |
- #CFLAGS += -DPBZIP_DEBUG |
| 45 |
- |
| 46 |
- # Comment out CFLAGS line below to disable pthread semantics in code |
| 47 |
--CFLAGS += -D_POSIX_PTHREAD_SEMANTICS |
| 48 |
-+CXXFLAGS += -D_POSIX_PTHREAD_SEMANTICS |
| 49 |
- |
| 50 |
- # Comment out CFLAGS line below to disable Thread stack size customization |
| 51 |
--CFLAGS += -DUSE_STACKSIZE_CUSTOMIZATION |
| 52 |
-+CXXFLAGS += -DUSE_STACKSIZE_CUSTOMIZATION |
| 53 |
- |
| 54 |
- # Comment out CFLAGS line below to explicity set ignore trailing garbage |
| 55 |
- # default behavior: 0 - disabled; 1 - enabled (ignore garbage by default) |
| 56 |
-@@ -34,11 +32,11 @@ |
| 57 |
- #CFLAGS += -DIGNORE_TRAILING_GARBAGE=1 |
| 58 |
- |
| 59 |
- # On some compilers -pthreads |
| 60 |
--CFLAGS += -pthread |
| 61 |
-+CXXFLAGS += -pthread |
| 62 |
- |
| 63 |
- # External libraries |
| 64 |
--LDFLAGS = -lbz2 |
| 65 |
--LDFLAGS += -lpthread |
| 66 |
-+LIBS = -lbz2 |
| 67 |
-+LIBS += -lpthread |
| 68 |
- |
| 69 |
- # Where you want pbzip2 installed when you do 'make install' |
| 70 |
- PREFIX = /usr |
| 71 |
-@@ -47,11 +45,11 @@ |
| 72 |
- |
| 73 |
- # Standard pbzip2 compile |
| 74 |
- pbzip2: pbzip2.cpp BZ2StreamScanner.cpp ErrorContext.cpp |
| 75 |
-- $(CC) $(CFLAGS) $^ -o pbzip2 $(LDFLAGS) |
| 76 |
-+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $^ $(LIBS) -o pbzip2 |
| 77 |
- |
| 78 |
- # Choose this if you want to compile in a static version of the libbz2 library |
| 79 |
- pbzip2-static: pbzip2.cpp BZ2StreamScanner.cpp ErrorContext.cpp libbz2.a |
| 80 |
-- $(CC) $(CFLAGS) $^ -o pbzip2 -I. -L. $(LDFLAGS) |
| 81 |
-+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $^ $(LIBS) -o pbzip2 -I. -L. |
| 82 |
- |
| 83 |
- # Install the binary pbzip2 program and man page |
| 84 |
- install: pbzip2 |
Archives