| 1 |
chainsaw 11/07/27 09:46:10 |
| 2 |
|
| 3 |
Added: libpri-1.4.12-respect-user-flags.patch |
| 4 |
Log: |
| 5 |
Consolidate flag respect patching and take care to remove spurious -g. As per arch test report by Agostino "ago" Sarubbo in bug #376573. |
| 6 |
|
| 7 |
(Portage version: 2.1.10.7/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 net-libs/libpri/files/libpri-1.4.12-respect-user-flags.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libpri/files/libpri-1.4.12-respect-user-flags.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libpri/files/libpri-1.4.12-respect-user-flags.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: libpri-1.4.12-respect-user-flags.patch |
| 16 |
=================================================================== |
| 17 |
diff -uNr libpri-1.4.12.ORIG//Makefile libpri-1.4.12/Makefile |
| 18 |
--- libpri-1.4.12.ORIG//Makefile 2011-07-27 10:37:34.247793740 +0100 |
| 19 |
+++ libpri-1.4.12/Makefile 2011-07-27 10:38:54.183790788 +0100 |
| 20 |
@@ -90,7 +90,7 @@ |
| 21 |
rose_qsig_mwi.lo \ |
| 22 |
rose_qsig_name.lo \ |
| 23 |
version.lo |
| 24 |
-CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_OPT) $(COVERAGE_CFLAGS) |
| 25 |
+CFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -fPIC $(ALERTING) $(LIBPRI_OPT) $(COVERAGE_CFLAGS) |
| 26 |
INSTALL_PREFIX=$(DESTDIR) |
| 27 |
INSTALL_BASE=/usr |
| 28 |
LIBDIR=$(INSTALL_PREFIX)$(INSTALL_BASE)/lib |
| 29 |
@@ -124,20 +124,12 @@ |
| 30 |
|
| 31 |
PRIVERSION:=$(shell GREP=$(GREP) AWK=$(AWK) build_tools/make_version .) |
| 32 |
|
| 33 |
-#The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only. |
| 34 |
-#This works for even old (2.96) versions of gcc and provides a small boost either way. |
| 35 |
-#A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesnt support it. |
| 36 |
-ifeq ($(PROC),sparc64) |
| 37 |
-PROC=ultrasparc |
| 38 |
-LIBPRI_OPT = -mtune=$(PROC) -O3 -pipe -fomit-frame-pointer -mcpu=v8 |
| 39 |
+ifneq ($(CODE_COVERAGE),) |
| 40 |
+ LIBPRI_OPT= |
| 41 |
+ COVERAGE_CFLAGS=-ftest-coverage -fprofile-arcs |
| 42 |
+ COVERAGE_LDFLAGS=-ftest-coverage -fprofile-arcs |
| 43 |
else |
| 44 |
- ifneq ($(CODE_COVERAGE),) |
| 45 |
- LIBPRI_OPT= |
| 46 |
- COVERAGE_CFLAGS=-ftest-coverage -fprofile-arcs |
| 47 |
- COVERAGE_LDFLAGS=-ftest-coverage -fprofile-arcs |
| 48 |
- else |
| 49 |
- LIBPRI_OPT=-O2 |
| 50 |
- endif |
| 51 |
+ LIBPRI_OPT= |
| 52 |
endif |
| 53 |
|
| 54 |
ifeq ($(CPUARCH),i686) |
| 55 |
@@ -216,7 +208,7 @@ |
| 56 |
ranlib $(STATIC_LIBRARY) |
| 57 |
|
| 58 |
$(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS) |
| 59 |
- $(CC) $(SOFLAGS) -o $@ $(DYNAMIC_OBJS) |
| 60 |
+ $(CC) $(SOFLAGS) $(LDFLAGS) -o $@ $(DYNAMIC_OBJS) |
| 61 |
$(LDCONFIG) $(LDCONFIG_FLAGS) . |
| 62 |
ln -sf libpri.so.$(SONAME) libpri.so |
Archives