* [gentoo-commits] gentoo-x86 commit in net-libs/libnatpmp/files: respect-FLAGS-20130911.patch
@ 2013-09-12 17:23 Anthony G. Basile (blueness)
0 siblings, 0 replies; only message in thread
From: Anthony G. Basile (blueness) @ 2013-09-12 17:23 UTC (permalink / raw
To: gentoo-commits
blueness 13/09/12 17:23:56
Added: respect-FLAGS-20130911.patch
Log:
Version bump
(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)
Revision Changes Path
1.1 net-libs/libnatpmp/files/respect-FLAGS-20130911.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libnatpmp/files/respect-FLAGS-20130911.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libnatpmp/files/respect-FLAGS-20130911.patch?rev=1.1&content-type=text/plain
Index: respect-FLAGS-20130911.patch
===================================================================
diff -Naur libnatpmp-20130911.orig/Makefile libnatpmp-20130911/Makefile
--- libnatpmp-20130911.orig/Makefile 2013-09-10 16:15:06.000000000 -0400
+++ libnatpmp-20130911/Makefile 2013-09-12 13:20:29.191447842 -0400
@@ -5,7 +5,7 @@
# http://miniupnp.free.fr/libnatpmp.html
OS = $(shell uname -s)
-CC = gcc
+CC ?= gcc
INSTALL = install
VERSION = $(shell cat VERSION)
@@ -22,6 +22,7 @@
# APIVERSION is used in soname
APIVERSION = 1
#LDFLAGS = -Wl,--no-undefined
+GENTOO_CFLAGS := $(CFLAGS)
CFLAGS = -Os
#CFLAGS = -g -O0
CFLAGS += -fPIC
@@ -52,6 +53,8 @@
endif
endif
+CFLAGS := $(CFLAGS) $(GENTOO_CFLAGS)
+
HEADERS = natpmp.h
EXECUTABLES = testgetgateway natpmpc-shared natpmpc-static
@@ -144,19 +147,19 @@
$(CC) $(LDFLAGS) -o $@ $^ $(EXTRA_LD)
natpmpc-static: natpmpc.o $(STATICLIB)
- $(CC) $(LDFLAGS) -o $@ $^ $(EXTRA_LD)
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRA_LD)
natpmpc-shared: natpmpc.o $(SHAREDLIB)
- $(CC) $(LDFLAGS) -o $@ $^ $(EXTRA_LD)
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRA_LD)
$(STATICLIB): $(LIBOBJS)
$(AR) crs $@ $?
$(SHAREDLIB): $(LIBOBJS)
ifeq ($(OS), Darwin)
- $(CC) -dynamiclib -Wl,-install_name,$(SONAME) -o $@ $^
+ $(CC) $(CFLAGS) $(LDFLAGS) -dynamiclib -Wl,-install_name,$(SONAME) -o $@ $^
else
- $(CC) -shared -Wl,-soname,$(SONAME) -o $@ $^ $(EXTRA_LD)
+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname,$(SONAME) -o $@ $^ $(EXTRA_LD)
endif
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-09-12 17:24 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-12 17:23 [gentoo-commits] gentoo-x86 commit in net-libs/libnatpmp/files: respect-FLAGS-20130911.patch Anthony G. Basile (blueness)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox