diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /net-libs/libpri/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.xz |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'net-libs/libpri/files')
5 files changed, 225 insertions, 0 deletions
diff --git a/net-libs/libpri/files/libpri-1.4.12-multilib.patch b/net-libs/libpri/files/libpri-1.4.12-multilib.patch new file mode 100644 index 00000000000..bb30900a0ca --- /dev/null +++ b/net-libs/libpri/files/libpri-1.4.12-multilib.patch @@ -0,0 +1,51 @@ +--- libpri-1.4.12-beta3/Makefile.orig 2010-10-07 06:00:04.000000000 +0200 ++++ libpri-1.4.12-beta3/Makefile 2010-11-23 22:04:59.884448930 +0100 +@@ -96,7 +96,7 @@ + CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS) $(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=-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) +@@ -168,27 +168,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.12-respect-user-flags.patch b/net-libs/libpri/files/libpri-1.4.12-respect-user-flags.patch new file mode 100644 index 00000000000..dd5b28587db --- /dev/null +++ b/net-libs/libpri/files/libpri-1.4.12-respect-user-flags.patch @@ -0,0 +1,47 @@ +diff -uNr libpri-1.4.12.ORIG//Makefile libpri-1.4.12/Makefile +--- libpri-1.4.12.ORIG//Makefile 2011-07-27 10:37:34.247793740 +0100 ++++ libpri-1.4.12/Makefile 2011-07-27 10:38:54.183790788 +0100 +@@ -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 -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) +@@ -216,7 +208,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 + diff --git a/net-libs/libpri/files/libpri-1.4.13-multilib.patch b/net-libs/libpri/files/libpri-1.4.13-multilib.patch new file mode 100644 index 00000000000..22eec7e5005 --- /dev/null +++ b/net-libs/libpri/files/libpri-1.4.13-multilib.patch @@ -0,0 +1,51 @@ +--- 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 new file mode 100644 index 00000000000..963e730c6fd --- /dev/null +++ b/net-libs/libpri/files/libpri-1.4.13-no-static-lib.patch @@ -0,0 +1,35 @@ +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.4.13-respect-user-flags.patch b/net-libs/libpri/files/libpri-1.4.13-respect-user-flags.patch new file mode 100644 index 00000000000..f10303d8059 --- /dev/null +++ b/net-libs/libpri/files/libpri-1.4.13-respect-user-flags.patch @@ -0,0 +1,41 @@ +--- libpri-1.4.13/Makefile.orig 2012-09-26 17:46:23.000000000 +0200 ++++ libpri-1.4.13/Makefile 2012-10-10 08:11:24.000000000 +0200 +@@ -67,7 +67,7 @@ + DYNAMIC_OBJS= \ + $(STATIC_OBJS) + CFLAGS ?= -g +-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 +@@ -107,17 +107,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) +@@ -196,7 +191,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 + |