summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTony Vroon <chainsaw@gentoo.org>2017-09-19 10:40:56 +0100
committerTony Vroon <chainsaw@gentoo.org>2017-09-19 10:42:39 +0100
commit5faccaea1a242f29fd22a9e2512fac0214f178e9 (patch)
tree68054ca6b8d855ce58aad8a2772682ea56592466 /net-libs/libpri/files/libpri-1.6.0-respect-user-flags.patch
parentdev-python/dulwich: remove old versions, thanks sbraz (diff)
downloadgentoo-5faccaea1a242f29fd22a9e2512fac0214f178e9.tar.gz
gentoo-5faccaea1a242f29fd22a9e2512fac0214f178e9.tar.bz2
gentoo-5faccaea1a242f29fd22a9e2512fac0214f178e9.zip
net-libs/libpri: Version bump to 1.6.0
Package-Manager: Portage-2.3.8, Repoman-2.3.1
Diffstat (limited to 'net-libs/libpri/files/libpri-1.6.0-respect-user-flags.patch')
-rw-r--r--net-libs/libpri/files/libpri-1.6.0-respect-user-flags.patch53
1 files changed, 53 insertions, 0 deletions
diff --git a/net-libs/libpri/files/libpri-1.6.0-respect-user-flags.patch b/net-libs/libpri/files/libpri-1.6.0-respect-user-flags.patch
new file mode 100644
index 000000000000..1928e5d871fb
--- /dev/null
+++ b/net-libs/libpri/files/libpri-1.6.0-respect-user-flags.patch
@@ -0,0 +1,53 @@
+diff -uNr libpri-1.6.0.ORIG/Makefile libpri-1.6.0/Makefile
+--- libpri-1.6.0.ORIG/Makefile 2017-09-19 10:37:05.176546588 +0100
++++ libpri-1.6.0/Makefile 2017-09-19 10:37:41.029544605 +0100
+@@ -24,10 +24,6 @@
+ # Uncomment if you want libpri not send PROGRESS_INDICATOR w/ALERTING
+ #ALERTING=-DALERTING_NO_PROGRESS
+
+-CC=gcc
+-GREP=grep
+-AWK=awk
+-
+ OSARCH=$(shell uname -s)
+ PROC?=$(shell uname -m)
+
+@@ -68,7 +64,7 @@
+ $(STATIC_OBJS)
+ CFLAGS ?= -g
+ CFLAGS += $(CPPFLAGS)
+-CFLAGS += -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes
++CFLAGS += -Wall -Wstrict-prototypes -Wmissing-prototypes
+ CFLAGS += -fPIC $(ALERTING) $(LIBPRI_OPT) $(COVERAGE_CFLAGS)
+ INSTALL_PREFIX=$(DESTDIR)
+ INSTALL_BASE=/usr
+@@ -108,17 +104,12 @@
+ #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
+ #This works for even old (2.96) versions of gcc and provides a small boost either way.
+ #A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesnt support it.
+-ifeq ($(PROC),sparc64)
+-PROC=ultrasparc
+-LIBPRI_OPT = -mtune=$(PROC) -O3 -pipe -fomit-frame-pointer -mcpu=v8
+-else
+- ifneq ($(CODE_COVERAGE),)
++ifneq ($(CODE_COVERAGE),)
+ LIBPRI_OPT=
+ COVERAGE_CFLAGS=-ftest-coverage -fprofile-arcs
+ COVERAGE_LDFLAGS=-ftest-coverage -fprofile-arcs
+- else
+- LIBPRI_OPT=-O2
+- endif
++else
++ LIBPRI_OPT=
+ endif
+
+ ifeq ($(CPUARCH),i686)
+@@ -197,7 +188,7 @@
+ ranlib $(STATIC_LIBRARY)
+
+ $(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS)
+- $(CC) $(SOFLAGS) -o $@ $(DYNAMIC_OBJS)
++ $(CC) $(SOFLAGS) $(LDFLAGS) -o $@ $(DYNAMIC_OBJS)
+ $(LDCONFIG) $(LDCONFIG_FLAGS) .
+ ln -sf $(DYNAMIC_LIBRARY) libpri.so
+