| 1 |
blueness 12/08/27 00:41:24 |
| 2 |
|
| 3 |
Added: respect-FLAGS-20120821.patch |
| 4 |
remove-static-lib-20120821.patch |
| 5 |
respect-libdir-20120821.patch |
| 6 |
Log: |
| 7 |
Version bump |
| 8 |
|
| 9 |
(Portage version: 2.1.11.9/cvs/Linux x86_64) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.1 net-libs/libnatpmp/files/respect-FLAGS-20120821.patch |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libnatpmp/files/respect-FLAGS-20120821.patch?rev=1.1&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libnatpmp/files/respect-FLAGS-20120821.patch?rev=1.1&content-type=text/plain |
| 16 |
|
| 17 |
Index: respect-FLAGS-20120821.patch |
| 18 |
=================================================================== |
| 19 |
diff -Naur libnatpmp-20120821.orig/Makefile libnatpmp-20120821/Makefile |
| 20 |
--- libnatpmp-20120821.orig/Makefile 2012-08-21 13:24:15.000000000 -0400 |
| 21 |
+++ libnatpmp-20120821/Makefile 2012-08-26 20:22:40.000000000 -0400 |
| 22 |
@@ -5,12 +5,13 @@ |
| 23 |
# http://miniupnp.free.fr/libnatpmp.html |
| 24 |
|
| 25 |
OS = $(shell uname -s) |
| 26 |
-CC = gcc |
| 27 |
+CC ?= gcc |
| 28 |
INSTALL = install |
| 29 |
|
| 30 |
# APIVERSION is used in soname |
| 31 |
APIVERSION = 1 |
| 32 |
#LDFLAGS = -Wl,--no-undefined |
| 33 |
+GENTOO_CFLAGS := $(CFLAGS) |
| 34 |
CFLAGS = -Os |
| 35 |
#CFLAGS = -g -O0 |
| 36 |
CFLAGS += -fPIC |
| 37 |
@@ -32,6 +33,8 @@ |
| 38 |
SONAME = $(SHAREDLIB).$(APIVERSION) |
| 39 |
endif |
| 40 |
|
| 41 |
+CFLAGS := $(CFLAGS) $(GENTOO_CFLAGS) |
| 42 |
+ |
| 43 |
HEADERS = natpmp.h |
| 44 |
|
| 45 |
EXECUTABLES = testgetgateway natpmpc-shared natpmpc-static |
| 46 |
@@ -79,19 +82,19 @@ |
| 47 |
testgetgateway: testgetgateway.o getgateway.o |
| 48 |
|
| 49 |
natpmpc-static: natpmpc.o $(STATICLIB) |
| 50 |
- $(CC) $(LDFLAGS) -o $@ $^ |
| 51 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ |
| 52 |
|
| 53 |
natpmpc-shared: natpmpc.o $(SHAREDLIB) |
| 54 |
- $(CC) $(LDFLAGS) -o $@ $^ |
| 55 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ |
| 56 |
|
| 57 |
$(STATICLIB): $(LIBOBJS) |
| 58 |
$(AR) crs $@ $? |
| 59 |
|
| 60 |
$(SHAREDLIB): $(LIBOBJS) |
| 61 |
ifeq ($(OS), Darwin) |
| 62 |
- $(CC) -dynamiclib -Wl,-install_name,$(SONAME) -o $@ $^ |
| 63 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -dynamiclib -Wl,-install_name,$(SONAME) -o $@ $^ |
| 64 |
else |
| 65 |
- $(CC) -shared -Wl,-soname,$(SONAME) -o $@ $^ |
| 66 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname,$(SONAME) -o $@ $^ |
| 67 |
endif |
| 68 |
|
| 69 |
# DO NOT DELETE |
| 70 |
|
| 71 |
|
| 72 |
|
| 73 |
1.1 net-libs/libnatpmp/files/remove-static-lib-20120821.patch |
| 74 |
|
| 75 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libnatpmp/files/remove-static-lib-20120821.patch?rev=1.1&view=markup |
| 76 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libnatpmp/files/remove-static-lib-20120821.patch?rev=1.1&content-type=text/plain |
| 77 |
|
| 78 |
Index: remove-static-lib-20120821.patch |
| 79 |
=================================================================== |
| 80 |
diff -Naur libnatpmp-20120821.orig/Makefile libnatpmp-20120821/Makefile |
| 81 |
--- libnatpmp-20120821.orig/Makefile 2012-08-26 20:33:51.000000000 -0400 |
| 82 |
+++ libnatpmp-20120821/Makefile 2012-08-26 20:36:53.000000000 -0400 |
| 83 |
@@ -24,7 +24,6 @@ |
| 84 |
|
| 85 |
OBJS = $(LIBOBJS) testgetgateway.o natpmpc.o |
| 86 |
|
| 87 |
-STATICLIB = libnatpmp.a |
| 88 |
ifeq ($(OS), Darwin) |
| 89 |
SHAREDLIB = libnatpmp.dylib |
| 90 |
SONAME = $(basename $(SHAREDLIB)).$(APIVERSION).dylib |
| 91 |
@@ -38,7 +37,7 @@ |
| 92 |
|
| 93 |
HEADERS = natpmp.h |
| 94 |
|
| 95 |
-EXECUTABLES = testgetgateway natpmpc-shared natpmpc-static |
| 96 |
+EXECUTABLES = testgetgateway natpmpc-shared |
| 97 |
|
| 98 |
INSTALLPREFIX ?= $(PREFIX)/usr |
| 99 |
INSTALLDIRINC = $(INSTALLPREFIX)/include |
| 100 |
@@ -47,9 +46,9 @@ |
| 101 |
|
| 102 |
.PHONY: all clean depend install cleaninstall installpythonmodule |
| 103 |
|
| 104 |
-all: $(STATICLIB) $(SHAREDLIB) $(EXECUTABLES) |
| 105 |
+all: $(SHAREDLIB) $(EXECUTABLES) |
| 106 |
|
| 107 |
-pythonmodule: $(STATICLIB) libnatpmpmodule.c setup.py |
| 108 |
+pythonmodule: libnatpmpmodule.c setup.py |
| 109 |
python setup.py build |
| 110 |
touch $@ |
| 111 |
|
| 112 |
@@ -57,18 +56,17 @@ |
| 113 |
python setup.py install |
| 114 |
|
| 115 |
clean: |
| 116 |
- $(RM) $(OBJS) $(EXECUTABLES) $(STATICLIB) $(SHAREDLIB) |
| 117 |
+ $(RM) $(OBJS) $(EXECUTABLES) $(SHAREDLIB) |
| 118 |
$(RM) pythonmodule |
| 119 |
$(RM) -r build/ dist/ |
| 120 |
|
| 121 |
depend: |
| 122 |
makedepend -f$(MAKEFILE_LIST) -Y $(OBJS:.o=.c) 2>/dev/null |
| 123 |
|
| 124 |
-install: $(HEADERS) $(STATICLIB) $(SHAREDLIB) natpmpc-shared |
| 125 |
+install: $(HEADERS) $(SHAREDLIB) natpmpc-shared |
| 126 |
$(INSTALL) -d $(INSTALLDIRINC) |
| 127 |
$(INSTALL) -m 644 $(HEADERS) $(INSTALLDIRINC) |
| 128 |
$(INSTALL) -d $(INSTALLDIRLIB) |
| 129 |
- $(INSTALL) -m 644 $(STATICLIB) $(INSTALLDIRLIB) |
| 130 |
$(INSTALL) -m 644 $(SHAREDLIB) $(INSTALLDIRLIB)/$(SONAME) |
| 131 |
$(INSTALL) -d $(INSTALLDIRBIN) |
| 132 |
$(INSTALL) -m 755 natpmpc-shared $(INSTALLDIRBIN)/natpmpc |
| 133 |
@@ -78,19 +76,12 @@ |
| 134 |
$(RM) $(addprefix $(INSTALLDIRINC), $(HEADERS)) |
| 135 |
$(RM) $(INSTALLDIRLIB)/$(SONAME) |
| 136 |
$(RM) $(INSTALLDIRLIB)/$(SHAREDLIB) |
| 137 |
- $(RM) $(INSTALLDIRLIB)/$(STATICLIB) |
| 138 |
|
| 139 |
testgetgateway: testgetgateway.o getgateway.o |
| 140 |
|
| 141 |
-natpmpc-static: natpmpc.o $(STATICLIB) |
| 142 |
- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ |
| 143 |
- |
| 144 |
natpmpc-shared: natpmpc.o $(SHAREDLIB) |
| 145 |
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ |
| 146 |
|
| 147 |
-$(STATICLIB): $(LIBOBJS) |
| 148 |
- $(AR) crs $@ $? |
| 149 |
- |
| 150 |
$(SHAREDLIB): $(LIBOBJS) |
| 151 |
ifeq ($(OS), Darwin) |
| 152 |
$(CC) $(CFLAGS) $(LDFLAGS) -dynamiclib -Wl,-install_name,$(SONAME) -o $@ $^ |
| 153 |
|
| 154 |
|
| 155 |
|
| 156 |
1.1 net-libs/libnatpmp/files/respect-libdir-20120821.patch |
| 157 |
|
| 158 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libnatpmp/files/respect-libdir-20120821.patch?rev=1.1&view=markup |
| 159 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libnatpmp/files/respect-libdir-20120821.patch?rev=1.1&content-type=text/plain |
| 160 |
|
| 161 |
Index: respect-libdir-20120821.patch |
| 162 |
=================================================================== |
| 163 |
diff -Naur libnatpmp-20120821.orig/Makefile libnatpmp-20120821/Makefile |
| 164 |
--- libnatpmp-20120821.orig/Makefile 2012-08-26 20:26:27.000000000 -0400 |
| 165 |
+++ libnatpmp-20120821/Makefile 2012-08-26 20:27:07.000000000 -0400 |
| 166 |
@@ -4,6 +4,7 @@ |
| 167 |
# (c) 2007-2011 Thomas Bernard |
| 168 |
# http://miniupnp.free.fr/libnatpmp.html |
| 169 |
|
| 170 |
+GENTOO_LIBDIR ?= lib |
| 171 |
OS = $(shell uname -s) |
| 172 |
CC ?= gcc |
| 173 |
INSTALL = install |
| 174 |
@@ -41,7 +42,7 @@ |
| 175 |
|
| 176 |
INSTALLPREFIX ?= $(PREFIX)/usr |
| 177 |
INSTALLDIRINC = $(INSTALLPREFIX)/include |
| 178 |
-INSTALLDIRLIB = $(INSTALLPREFIX)/lib |
| 179 |
+INSTALLDIRLIB = $(INSTALLPREFIX)/$(GENTOO_LIBDIR) |
| 180 |
INSTALLDIRBIN = $(INSTALLPREFIX)/bin |
| 181 |
|
| 182 |
.PHONY: all clean depend install cleaninstall installpythonmodule |
Archives