From 7fa8a1e3f149eea4c844c47cfe26136ed7614c58 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 15 Apr 2024 12:04:03 +0100 Subject: gentoo auto-resync : 15:04:2024 - 12:04:02 --- net-libs/libpri/files/libpri-1.4.13-multilib.patch | 51 --------------------- .../libpri/files/libpri-1.4.13-no-static-lib.patch | 35 -------------- .../files/libpri-1.6.0-respect-user-flags.patch | 53 ---------------------- 3 files changed, 139 deletions(-) delete mode 100644 net-libs/libpri/files/libpri-1.4.13-multilib.patch delete mode 100644 net-libs/libpri/files/libpri-1.4.13-no-static-lib.patch delete mode 100644 net-libs/libpri/files/libpri-1.6.0-respect-user-flags.patch (limited to 'net-libs/libpri/files') diff --git a/net-libs/libpri/files/libpri-1.4.13-multilib.patch b/net-libs/libpri/files/libpri-1.4.13-multilib.patch deleted file mode 100644 index 22eec7e50059..000000000000 --- a/net-libs/libpri/files/libpri-1.4.13-multilib.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- libpri-1.4.13/Makefile.orig 2012-09-26 17:46:23.000000000 +0200 -+++ libpri-1.4.13/Makefile 2012-10-10 08:04:44.000000000 +0200 -@@ -71,7 +71,7 @@ - CFLAGS += -fPIC $(ALERTING) $(LIBPRI_OPT) $(COVERAGE_CFLAGS) - INSTALL_PREFIX=$(DESTDIR) - INSTALL_BASE=/usr --libdir?=$(INSTALL_BASE)/lib -+LIBDIR=$(INSTALL_PREFIX)$(INSTALL_BASE)/lib - ifneq ($(findstring Darwin,$(OSARCH)),) - SOFLAGS=$(LDFLAGS) -dynamic -bundle -Xlinker -macosx_version_min -Xlinker 10.4 -Xlinker -undefined -Xlinker dynamic_lookup -force_flat_namespace - ifeq ($(shell /usr/bin/sw_vers -productVersion | cut -c1-4),10.6) -@@ -145,27 +145,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 $(DYNAMIC_LIBRARY) 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 $(DYNAMIC_LIBRARY) 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)/$(STATIC_LIBRARY) -- rm -f $(INSTALL_PREFIX)$(libdir)/libpri.so -- rm -f $(INSTALL_PREFIX)$(libdir)/$(DYNAMIC_LIBRARY) -+ 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 $(STATIC_LIBRARY) diff --git a/net-libs/libpri/files/libpri-1.4.13-no-static-lib.patch b/net-libs/libpri/files/libpri-1.4.13-no-static-lib.patch deleted file mode 100644 index 963e730c6fda..000000000000 --- a/net-libs/libpri/files/libpri-1.4.13-no-static-lib.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -uNr libpri-1.4.13.ORIG/Makefile libpri-1.4.13/Makefile ---- libpri-1.4.13.ORIG/Makefile 2012-10-27 13:22:57.902838938 +0100 -+++ libpri-1.4.13/Makefile 2012-10-27 13:23:36.746837229 +0100 -@@ -120,7 +120,7 @@ - SOFLAGS += -m32 - endif - --all: $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY) $(UTILITIES) -+all: $(DYNAMIC_LIBRARY) - - update: - @if [ -d .svn ]; then \ -@@ -139,7 +139,7 @@ - echo "Not under version control"; \ - fi - --install: $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY) -+install: $(DYNAMIC_LIBRARY) - mkdir -p $(LIBDIR) - mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/include - ifneq (${OSARCH},SunOS) -@@ -147,13 +147,11 @@ - 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 $(LIBDIR) -m 755 $(DYNAMIC_LIBRARY) - ( cd $(LIBDIR) ; ln -sf libpri.so.$(SONAME) libpri.so) -- install -f $(LIBDIR) -m 644 $(STATIC_LIBRARY) - endif - - uninstall: 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 deleted file mode 100644 index 1928e5d871fb..000000000000 --- a/net-libs/libpri/files/libpri-1.6.0-respect-user-flags.patch +++ /dev/null @@ -1,53 +0,0 @@ -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 - -- cgit v1.2.3