Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/pps-tools/files/, net-misc/pps-tools/
Date: Wed, 14 Feb 2018 16:35:05
Message-Id: 1518598879.2d40f41f21e25e926e62d451f054fa1dd94e6480.polynomial-c@gentoo
1 commit: 2d40f41f21e25e926e62d451f054fa1dd94e6480
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 14 09:01:19 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 14 09:01:19 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d40f41f
7
8 net-misc/pps-tools: Bump to version 1.0.2
9
10 Package-Manager: Portage-2.3.24, Repoman-2.3.6
11
12 net-misc/pps-tools/Manifest | 1 +
13 .../pps-tools/files/pps-tools-1.0.2-build.patch | 50 ++++++++++++++++++++++
14 net-misc/pps-tools/pps-tools-1.0.2.ebuild | 25 +++++++++++
15 3 files changed, 76 insertions(+)
16
17 diff --git a/net-misc/pps-tools/Manifest b/net-misc/pps-tools/Manifest
18 index 528ecf65b9a..b825b2142ec 100644
19 --- a/net-misc/pps-tools/Manifest
20 +++ b/net-misc/pps-tools/Manifest
21 @@ -1,2 +1,3 @@
22 DIST pps-tools-1.0.1.tar.gz 12695 BLAKE2B 8c05f037b03efc2685bf303f521e168e6c56c203665482fa456278e3580fba8d2fc04935b7f32b70b6ac50c28d4f998a2808f5e3034dcffad4ff1589fd8f2907 SHA512 6fe7eba2a1a073a64d40bcc7aef12981414b43656f05fbd84e3ffadf1a074c5aa8d032b39a37095e6846194558b685092b51799fe724fe50cce8f3cbe163f784
23 +DIST pps-tools-1.0.2.tar.gz 12701 BLAKE2B bc60a9ea94bb57bcc2b7870da433ef04fbbc30e5c4d880b719a8e7fcabba0bef2996c086e6993b879f2515cd0c685659bfed5371904401e35120ae1e9dc0891a SHA512 fa86455ece83700d5a1c522082f78ed324927fb9f53d3cf5f615a566a39e54938a41e82b6d4ae23d57c273fb923f96db4ca2d071199795d020952703afa53fcb
24 DIST pps-tools-git-0.0.20120407.tar.gz 13619 BLAKE2B 9be7aacbcdb1c5ac2e53c66f97ba6c41f30c67b7d229f4f9797260d9b880a921e679e1c6cf847051fab0746cb2d9da0f4450411f4e992e42b0b5314bf6acf7cd SHA512 d2014262b0594959f337c25df859591d0737994decec663389392d3c7e53376ded2485713f6364c4833d8d7c40b4b0c3b88865ab85e481bcc2e81e35931d84de
25
26 diff --git a/net-misc/pps-tools/files/pps-tools-1.0.2-build.patch b/net-misc/pps-tools/files/pps-tools-1.0.2-build.patch
27 new file mode 100644
28 index 00000000000..a62a6bb561c
29 --- /dev/null
30 +++ b/net-misc/pps-tools/files/pps-tools-1.0.2-build.patch
31 @@ -0,0 +1,50 @@
32 +From 5deb13d9d980a595946ff58e4e6d83f9d770ff10 Mon Sep 17 00:00:00 2001
33 +From: Mike Frysinger <vapier@g.o>
34 +Date: Wed, 14 Feb 2018 09:35:34 +0100
35 +Subject: [PATCH] fix up makefile
36 +
37 +Make sure we respect CFLAGS/CPPFLAGS properly.
38 +
39 +Also fix up the depend include so we get reproducible behavior --
40 +the depend file is generated & included first, and we don't get
41 +weird behavior when we run:
42 + git clean -x -d
43 + make
44 + make
45 +---
46 + Makefile | 11 +++++------
47 + 1 file changed, 5 insertions(+), 6 deletions(-)
48 +
49 +diff --git a/Makefile b/Makefile
50 +index 9394668..af3ae56 100644
51 +--- a/Makefile
52 ++++ b/Makefile
53 +@@ -1,8 +1,9 @@
54 + TARGETS = ppstest ppsctl ppswatch ppsldisc
55 +
56 +-CFLAGS += -Wall -O2 -D_GNU_SOURCE
57 +-CFLAGS += -ggdb
58 ++CFLAGS ?= -O2 -ggdb
59 ++CFLAGS += -Wall
60 + CFLAGS += -fPIC
61 ++CPPFLAGS += -D_GNU_SOURCE
62 + LDLIBS += -lm
63 +
64 + # -- Actions section --
65 +@@ -12,11 +13,9 @@ LDLIBS += -lm
66 + all : .depend $(TARGETS)
67 +
68 + .depend depend dep :
69 +- $(CC) $(CFLAGS) -M $(TARGETS:=.c) > .depend
70 ++ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -M $(TARGETS:=.c) > .depend
71 +
72 +-ifeq (.depend,$(wildcard .depend))
73 +-include .depend
74 +-endif
75 ++-include .depend
76 +
77 + install : all
78 + install -m 755 -t $(DESTDIR)/usr/bin ppsfind $(TARGETS)
79 +--
80 +2.16.1
81 +
82
83 diff --git a/net-misc/pps-tools/pps-tools-1.0.2.ebuild b/net-misc/pps-tools/pps-tools-1.0.2.ebuild
84 new file mode 100644
85 index 00000000000..7291f8a36e6
86 --- /dev/null
87 +++ b/net-misc/pps-tools/pps-tools-1.0.2.ebuild
88 @@ -0,0 +1,25 @@
89 +# Copyright 1999-2018 Gentoo Foundation
90 +# Distributed under the terms of the GNU General Public License v2
91 +
92 +EAPI="6"
93 +
94 +inherit toolchain-funcs
95 +
96 +DESCRIPTION="User-space tools for LinuxPPS"
97 +HOMEPAGE="https://github.com/redlab-i/pps-tools"
98 +SRC_URI="https://github.com/redlab-i/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
99 +
100 +LICENSE="GPL-2"
101 +SLOT="0"
102 +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
103 +IUSE=""
104 +
105 +PATCHES=(
106 + "${FILESDIR}"/${PN}-1.0.2-build.patch
107 + "${FILESDIR}"/${PN}-1.0.1-install.patch
108 +)
109 +
110 +src_prepare() {
111 + default
112 + tc-export CC
113 +}