/[gentoo-x86]/net-libs/libnatpmp/files/respect-FLAGS-20120821.patch
Gentoo

Contents of /net-libs/libnatpmp/files/respect-FLAGS-20120821.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Mon Aug 27 00:41:24 2012 UTC (19 months, 3 weeks ago) by blueness
Branch: MAIN
Version bump

(Portage version: 2.1.11.9/cvs/Linux x86_64)

1 diff -Naur libnatpmp-20120821.orig/Makefile libnatpmp-20120821/Makefile
2 --- libnatpmp-20120821.orig/Makefile 2012-08-21 13:24:15.000000000 -0400
3 +++ libnatpmp-20120821/Makefile 2012-08-26 20:22:40.000000000 -0400
4 @@ -5,12 +5,13 @@
5 # http://miniupnp.free.fr/libnatpmp.html
6
7 OS = $(shell uname -s)
8 -CC = gcc
9 +CC ?= gcc
10 INSTALL = install
11
12 # APIVERSION is used in soname
13 APIVERSION = 1
14 #LDFLAGS = -Wl,--no-undefined
15 +GENTOO_CFLAGS := $(CFLAGS)
16 CFLAGS = -Os
17 #CFLAGS = -g -O0
18 CFLAGS += -fPIC
19 @@ -32,6 +33,8 @@
20 SONAME = $(SHAREDLIB).$(APIVERSION)
21 endif
22
23 +CFLAGS := $(CFLAGS) $(GENTOO_CFLAGS)
24 +
25 HEADERS = natpmp.h
26
27 EXECUTABLES = testgetgateway natpmpc-shared natpmpc-static
28 @@ -79,19 +82,19 @@
29 testgetgateway: testgetgateway.o getgateway.o
30
31 natpmpc-static: natpmpc.o $(STATICLIB)
32 - $(CC) $(LDFLAGS) -o $@ $^
33 + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
34
35 natpmpc-shared: natpmpc.o $(SHAREDLIB)
36 - $(CC) $(LDFLAGS) -o $@ $^
37 + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
38
39 $(STATICLIB): $(LIBOBJS)
40 $(AR) crs $@ $?
41
42 $(SHAREDLIB): $(LIBOBJS)
43 ifeq ($(OS), Darwin)
44 - $(CC) -dynamiclib -Wl,-install_name,$(SONAME) -o $@ $^
45 + $(CC) $(CFLAGS) $(LDFLAGS) -dynamiclib -Wl,-install_name,$(SONAME) -o $@ $^
46 else
47 - $(CC) -shared -Wl,-soname,$(SONAME) -o $@ $^
48 + $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname,$(SONAME) -o $@ $^
49 endif
50
51 # DO NOT DELETE

  ViewVC Help
Powered by ViewVC 1.1.20