[gentoo-commits] gentoo-x86 commit in net-libs/libpri/files: libpri-1.4.9-respect-cflags.patch libpri-1.4.9-multilib.patch

[gentoo-commits] gentoo-x86 commit in net-libs/libpri/files: libpri-1.4.9-respect-cflags.patch libpri-1.4.9-multilib.patch

[Tony Vroon (chainsaw)]

chainsaw    09/03/10 18:51:15

  Added:                libpri-1.4.9-respect-cflags.patch
                        libpri-1.4.9-multilib.patch
  Log:
  Version bump to 1.4 branch, for use with Asterisk 1.6 which is masked. Patches rebased. BRIstuff failed to build/patch correctly after repeated attempts, so dropped for now.
  (Portage version: 2.1.6.7/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  net-libs/libpri/files/libpri-1.4.9-respect-cflags.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/libpri/files/libpri-1.4.9-respect-cflags.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/libpri/files/libpri-1.4.9-respect-cflags.patch?rev=1.1&content-type=text/plain

Index: libpri-1.4.9-respect-cflags.patch
===================================================================
diff -uNr libpri-1.4.9.ORIG/Makefile libpri-1.4.9/Makefile
--- libpri-1.4.9.ORIG/Makefile	2009-03-10 17:43:45.000000000 +0000
+++ libpri-1.4.9/Makefile	2009-03-10 17:44:00.000000000 +0000
@@ -43,7 +43,7 @@
 DYNAMIC_LIBRARY:=libpri.so.$(SONAME)
 STATIC_OBJS=copy_string.o pri.o q921.o prisched.o q931.o pri_facility.o version.o
 DYNAMIC_OBJS=copy_string.lo pri.lo q921.lo prisched.lo q931.lo pri_facility.lo version.lo
-CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS)
+CFLAGS+=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS)
 INSTALL_PREFIX=$(DESTDIR)
 INSTALL_BASE=/usr
 libdir?=$(INSTALL_BASE)/lib
@@ -69,14 +69,6 @@
 
 PRIVERSION:=$(shell GREP=$(GREP) AWK=$(AWK) build_tools/make_version .)
 
-#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
-CFLAGS += -mtune=$(PROC) -O3 -pipe -fomit-frame-pointer -mcpu=v8
-endif
-
 all: $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)
 
 update:



1.1                  net-libs/libpri/files/libpri-1.4.9-multilib.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/libpri/files/libpri-1.4.9-multilib.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/libpri/files/libpri-1.4.9-multilib.patch?rev=1.1&content-type=text/plain

Index: libpri-1.4.9-multilib.patch
===================================================================
diff -uNr libpri-1.4.9.ORIG/Makefile libpri-1.4.9/Makefile
--- libpri-1.4.9.ORIG/Makefile	2009-03-10 18:08:07.000000000 +0000
+++ libpri-1.4.9/Makefile	2009-03-10 18:11:24.000000000 +0000
@@ -46,7 +46,7 @@
 CFLAGS+=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS)
 INSTALL_PREFIX=$(DESTDIR)
 INSTALL_BASE=/usr
-libdir?=$(INSTALL_BASE)/lib
+LIBDIR=$(INSTALL_PREFIX)$(INSTALL_BASE)/lib
 SOFLAGS:=-Wl,-h$(DYNAMIC_LIBRARY)
 LDCONFIG = /sbin/ldconfig
 ifneq (,$(findstring X$(OSARCH)X, XLinuxX XGNU/kFreeBSDX))
@@ -89,27 +89,27 @@
 	fi
 
 install: $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)
-	mkdir -p $(INSTALL_PREFIX)$(libdir)
+	mkdir -p $(LIBDIR)
 	mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/include
 ifneq (${OSARCH},SunOS)
 	install -m 644 libpri.h $(INSTALL_PREFIX)$(INSTALL_BASE)/include
-	install -m 755 $(DYNAMIC_LIBRARY) $(INSTALL_PREFIX)$(libdir)
-	if [ -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"); then /sbin/restorecon -v $(INSTALL_PREFIX)$(libdir)/$(DYNAMIC_LIBRARY); fi
-	( cd $(INSTALL_PREFIX)$(libdir) ; ln -sf libpri.so.$(SONAME) libpri.so)
-	install -m 644 $(STATIC_LIBRARY) $(INSTALL_PREFIX)$(libdir)
-	if test $$(id -u) = 0; then $(LDCONFIG) $(LDCONFIG_FLAGS) $(INSTALL_PREFIX)$(libdir); fi
+	install -m 755 $(DYNAMIC_LIBRARY) $(LIBDIR)
+	if [ -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"); then /sbin/restorecon -v $(LIBDIR)/$(DYNAMIC_LIBRARY); fi
+	( cd $(LIBDIR) ; ln -sf libpri.so.$(SONAME) libpri.so)
+	install -m 644 $(STATIC_LIBRARY) $(LIBDIR)
+	if test $$(id -u) = 0; then $(LDCONFIG) $(LDCONFIG_FLAGS) $(LIBDIR); fi
 else
 	install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include -m 644 libpri.h
-	install -f $(INSTALL_PREFIX)$(libdir) -m 755 $(DYNAMIC_LIBRARY)
-	( cd $(INSTALL_PREFIX)$(libdir) ; ln -sf libpri.so.$(SONAME) libpri.so)
-	install -f $(INSTALL_PREFIX)$(libdir) -m 644 $(STATIC_LIBRARY)
+	install -f $(LIBDIR) -m 755 $(DYNAMIC_LIBRARY)
+	( cd $(LIBDIR) ; ln -sf libpri.so.$(SONAME) libpri.so)
+	install -f $(LIBDIR) -m 644 $(STATIC_LIBRARY)
 endif
 
 uninstall:
 	@echo "Removing Libpri"
-	rm -f $(INSTALL_PREFIX)$(libdir)/libpri.so.$(SONAME)
-	rm -f $(INSTALL_PREFIX)$(libdir)/libpri.so
-	rm -f $(INSTALL_PREFIX)$(libdir)/libpri.a
+	rm -f $(LIBDIR)/libpri.so.$(SONAME)
+	rm -f $(LIBDIR)/libpri.so
+	rm -f $(LIBDIR)/libpri.a
 	rm -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include/libpri.h
 
 pritest: pritest.o