diff options
| author |   Tony Vroon <chainsaw@gentoo.org> | 2011-08-17 10:27:06 +0000 |
|---|---|---|
| committer | Tony Vroon <chainsaw@gentoo.org> | 2011-08-17 10:27:06 +0000 |
| commit | fc0eb34f8c2625996c9a134dec9e950476416ef8 (patch) | |
| tree | 76bcd18acf6736bd966fe61f98def3402288229b /net-libs/libpri/files | |
| parent | Latest upstream fixes (diff) | |
| download | gentoo-2-fc0eb34f8c2625996c9a134dec9e950476416ef8.tar.gz gentoo-2-fc0eb34f8c2625996c9a134dec9e950476416ef8.tar.bz2 gentoo-2-fc0eb34f8c2625996c9a134dec9e950476416ef8.zip | |
Incorporate USE="static-libs" functionality and bump to EAPI 4 as suggested by Agostino "ago" Sarubbo in bug #377603. Remove old ebuilds & patches.
(Portage version: 2.1.10.11/cvs/Linux x86_64)
Diffstat (limited to 'net-libs/libpri/files')
7 files changed, 0 insertions, 190 deletions
diff --git a/net-libs/libpri/files/libpri-1.4.11.1-multilib.patch b/net-libs/libpri/files/libpri-1.4.11.1-multilib.patch deleted file mode 100644 index b95b9702d9f8..000000000000 --- a/net-libs/libpri/files/libpri-1.4.11.1-multilib.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff -uNr libpri-1.4.11.ORIG/Makefile libpri-1.4.11/Makefile ---- libpri-1.4.11.ORIG/Makefile 2009-03-10 18:08:07.000000000 +0000 -+++ libpri-1.4.11/Makefile 2009-03-10 18:11:24.000000000 +0000 -@@ -86,7 +86,7 @@ - CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS) $(LIBPRI_OPT) - 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 XGNUX)) -@@ -135,27 +135,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 diff --git a/net-libs/libpri/files/libpri-1.4.11.1-respect-cflags.patch b/net-libs/libpri/files/libpri-1.4.11.1-respect-cflags.patch deleted file mode 100644 index b6a4db487747..000000000000 --- a/net-libs/libpri/files/libpri-1.4.11.1-respect-cflags.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -uNr libpri-1.4.11.ORIG/Makefile libpri-1.4.11/Makefile ---- libpri-1.4.11.ORIG/Makefile 2009-03-10 17:43:45.000000000 +0000 -+++ libpri-1.4.11/Makefile 2009-03-10 17:44:00.000000000 +0000 -@@ -83,7 +83,7 @@ - rose_qsig_mwi.lo \ - rose_qsig_name.lo \ - version.lo --CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS) $(LIBPRI_OPT) -+CFLAGS+=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS) $(LIBPRI_OPT) - INSTALL_PREFIX=$(DESTDIR) - INSTALL_BASE=/usr - libdir?=$(INSTALL_BASE)/lib -@@ -108,16 +108,7 @@ - export PRIVERSION - - 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 --LIBPRI_OPT = -mtune=$(PROC) -O3 -pipe -fomit-frame-pointer -mcpu=v8 --else - LIBPRI_OPT = -O2 --endif - - ifeq ($(CPUARCH),i686) - CFLAGS += -m32 diff --git a/net-libs/libpri/files/libpri-1.4.11.1-respect-ldflags.patch b/net-libs/libpri/files/libpri-1.4.11.1-respect-ldflags.patch deleted file mode 100644 index 778496faef2b..000000000000 --- a/net-libs/libpri/files/libpri-1.4.11.1-respect-ldflags.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr libpri-1.4.11.ORIG/Makefile libpri-1.4.11/Makefile ---- libpri-1.4.11.ORIG/Makefile 2009-12-08 22:55:12.729738494 +0000 -+++ libpri-1.4.11/Makefile 2009-12-08 22:55:58.645775496 +0000 -@@ -186,7 +186,7 @@ - ranlib $(STATIC_LIBRARY) - - $(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS) -- $(CC) -shared $(SOFLAGS) -o $@ $(DYNAMIC_OBJS) -+ $(CC) -shared $(SOFLAGS) $(LDFLAGS) -o $@ $(DYNAMIC_OBJS) - $(LDCONFIG) $(LDCONFIG_FLAGS) . - ln -sf libpri.so.$(SONAME) libpri.so - diff --git a/net-libs/libpri/files/libpri-1.4.11.1-werror-is-ill-advised.patch b/net-libs/libpri/files/libpri-1.4.11.1-werror-is-ill-advised.patch deleted file mode 100644 index c0e2d9893b35..000000000000 --- a/net-libs/libpri/files/libpri-1.4.11.1-werror-is-ill-advised.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr libpri-1.4.11.1.ORIG//Makefile libpri-1.4.11.1/Makefile ---- libpri-1.4.11.1.ORIG//Makefile 2010-06-07 10:59:44.000000000 +0100 -+++ libpri-1.4.11.1/Makefile 2010-06-07 10:59:52.000000000 +0100 -@@ -83,7 +83,7 @@ - rose_qsig_mwi.lo \ - rose_qsig_name.lo \ - version.lo --CFLAGS+=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS) $(LIBPRI_OPT) -+CFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS) $(LIBPRI_OPT) - INSTALL_PREFIX=$(DESTDIR) - INSTALL_BASE=/usr - LIBDIR=$(INSTALL_PREFIX)$(INSTALL_BASE)/lib diff --git a/net-libs/libpri/files/libpri-1.4.12-released-respect-cflags.patch b/net-libs/libpri/files/libpri-1.4.12-released-respect-cflags.patch deleted file mode 100644 index 560bd34bcff0..000000000000 --- a/net-libs/libpri/files/libpri-1.4.12-released-respect-cflags.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- libpri-1.4.12/Makefile.orig 2011-07-07 16:18:34.185504616 +0200 -+++ libpri-1.4.12/Makefile 2011-07-07 16:32:09.095312715 +0200 -@@ -90,7 +90,7 @@ - rose_qsig_mwi.lo \ - rose_qsig_name.lo \ - version.lo --CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_OPT) $(COVERAGE_CFLAGS) -+CFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_OPT) $(COVERAGE_CFLAGS) - INSTALL_PREFIX=$(DESTDIR) - INSTALL_BASE=/usr - LIBDIR=$(INSTALL_PREFIX)$(INSTALL_BASE)/lib -@@ -124,20 +124,12 @@ - - 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 --LIBPRI_OPT = -mtune=$(PROC) -O3 -pipe -fomit-frame-pointer -mcpu=v8 -+ifneq ($(CODE_COVERAGE),) -+ LIBPRI_OPT= -+ COVERAGE_CFLAGS=-ftest-coverage -fprofile-arcs -+ COVERAGE_LDFLAGS=-ftest-coverage -fprofile-arcs - else -- ifneq ($(CODE_COVERAGE),) -- LIBPRI_OPT= -- COVERAGE_CFLAGS=-ftest-coverage -fprofile-arcs -- COVERAGE_LDFLAGS=-ftest-coverage -fprofile-arcs -- else -- LIBPRI_OPT=-O2 -- endif -+ LIBPRI_OPT= - endif - - ifeq ($(CPUARCH),i686) diff --git a/net-libs/libpri/files/libpri-1.4.12-respect-cflags.patch b/net-libs/libpri/files/libpri-1.4.12-respect-cflags.patch deleted file mode 100644 index bad39bd62471..000000000000 --- a/net-libs/libpri/files/libpri-1.4.12-respect-cflags.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- libpri-1.4.12-beta3/Makefile.orig 2010-11-23 22:06:06.768618707 +0100 -+++ libpri-1.4.12-beta3/Makefile 2010-11-23 22:07:41.328444833 +0100 -@@ -93,7 +93,7 @@ - rose_qsig_mwi.lo \ - rose_qsig_name.lo \ - version.lo --CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS) $(LIBPRI_OPT) $(COVERAGE_CFLAGS) -+CFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -fPIC $(ALERTING) $(LIBPRI_COUNTERS) $(LIBPRI_OPT) $(COVERAGE_CFLAGS) - INSTALL_PREFIX=$(DESTDIR) - INSTALL_BASE=/usr - LIBDIR=$(INSTALL_PREFIX)$(INSTALL_BASE)/lib -@@ -127,20 +127,12 @@ - - 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 --LIBPRI_OPT = -mtune=$(PROC) -O3 -pipe -fomit-frame-pointer -mcpu=v8 -+ifneq ($(CODE_COVERAGE),) -+ LIBPRI_OPT= -+ COVERAGE_CFLAGS=-ftest-coverage -fprofile-arcs -+ COVERAGE_LDFLAGS=-ftest-coverage -fprofile-arcs - else -- ifneq ($(CODE_COVERAGE),) -- LIBPRI_OPT= -- COVERAGE_CFLAGS=-ftest-coverage -fprofile-arcs -- COVERAGE_LDFLAGS=-ftest-coverage -fprofile-arcs -- else -- LIBPRI_OPT=-O2 -- endif -+ LIBPRI_OPT= - endif - - ifeq ($(CPUARCH),i686) diff --git a/net-libs/libpri/files/libpri-1.4.12-respect-ldflags.patch b/net-libs/libpri/files/libpri-1.4.12-respect-ldflags.patch deleted file mode 100644 index 14ad22e83191..000000000000 --- a/net-libs/libpri/files/libpri-1.4.12-respect-ldflags.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libpri-1.4.12-beta3/Makefile.orig 2010-11-23 22:08:35.749769167 +0100 -+++ libpri-1.4.12-beta3/Makefile 2010-11-23 22:10:01.036710213 +0100 -@@ -211,7 +211,7 @@ - ranlib $(STATIC_LIBRARY) - - $(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS) -- $(CC) $(SOFLAGS) -o $@ $(DYNAMIC_OBJS) -+ $(CC) $(SOFLAGS) $(LDFLAGS) -o $@ $(DYNAMIC_OBJS) - $(LDCONFIG) $(LDCONFIG_FLAGS) . - ln -sf libpri.so.$(SONAME) libpri.so - |