1 |
commit: 9a8ce341be72dd7df418fc472968f1e44851e427 |
2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jul 20 07:39:01 2017 +0000 |
4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jul 20 07:40:38 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a8ce341 |
7 |
|
8 |
app-portage/deltup: respect user's LDFLAGS, use CX, not CC |
9 |
|
10 |
While at it dropped use of unknown command: |
11 |
epatch_user: command not found |
12 |
|
13 |
Package-Manager: Portage-2.3.6, Repoman-2.3.3 |
14 |
|
15 |
...{deltup-0.4.6.ebuild => deltup-0.4.6-r1.ebuild} | 10 +++++----- |
16 |
app-portage/deltup/files/deltup-0.4.6-cxx.patch | 23 ++++++++++++++++++++++ |
17 |
.../deltup/files/deltup-0.4.6-ldflags.patch | 9 +++++++++ |
18 |
3 files changed, 37 insertions(+), 5 deletions(-) |
19 |
|
20 |
diff --git a/app-portage/deltup/deltup-0.4.6.ebuild b/app-portage/deltup/deltup-0.4.6-r1.ebuild |
21 |
similarity index 87% |
22 |
rename from app-portage/deltup/deltup-0.4.6.ebuild |
23 |
rename to app-portage/deltup/deltup-0.4.6-r1.ebuild |
24 |
index cdc06476fff..9c4ebf21a65 100644 |
25 |
--- a/app-portage/deltup/deltup-0.4.6.ebuild |
26 |
+++ b/app-portage/deltup/deltup-0.4.6-r1.ebuild |
27 |
@@ -26,13 +26,13 @@ DEPEND=" |
28 |
RDEPEND="${DEPEND} |
29 |
|| ( dev-util/bdelta =dev-util/xdelta-1* )" |
30 |
|
31 |
-src_prepare () { |
32 |
- default |
33 |
- epatch_user |
34 |
-} |
35 |
+PATCHES=( |
36 |
+ "${FILESDIR}"/${PN}-0.4.6-ldflags.patch |
37 |
+ "${FILESDIR}"/${PN}-0.4.6-cxx.patch |
38 |
+) |
39 |
|
40 |
src_compile () { |
41 |
- emake CC=$(tc-getCXX) |
42 |
+ emake CXX=$(tc-getCXX) |
43 |
} |
44 |
|
45 |
src_install () { |
46 |
|
47 |
diff --git a/app-portage/deltup/files/deltup-0.4.6-cxx.patch b/app-portage/deltup/files/deltup-0.4.6-cxx.patch |
48 |
new file mode 100644 |
49 |
index 00000000000..6a07dc1ee0a |
50 |
--- /dev/null |
51 |
+++ b/app-portage/deltup/files/deltup-0.4.6-cxx.patch |
52 |
@@ -0,0 +1,23 @@ |
53 |
+diff --git a/Makefile b/Makefile |
54 |
+index 6a3aa95..a591a6f 100644 |
55 |
+--- a/Makefile |
56 |
++++ b/Makefile |
57 |
+@@ -7,3 +7,3 @@ CC = g++ |
58 |
+ objfiles=bpatch.o archfunc.o file.o system.o tmpstore.o deltup.o |
59 |
+-libs=-lstdc++ -lz -lbz2 -lcrypto #-lssl |
60 |
++libs=-lz -lbz2 -lcrypto #-lssl |
61 |
+ |
62 |
+@@ -12,3 +12,3 @@ libs=-lstdc++ -lz -lbz2 -lcrypto #-lssl |
63 |
+ %.o : %.cpp |
64 |
+- ${CC} -c $< -o $@ ${CXXFLAGS} #-g #-Wall -pedantic |
65 |
++ ${CXX} -c $< -o $@ ${CXXFLAGS} #-g #-Wall -pedantic |
66 |
+ |
67 |
+@@ -17,6 +17,6 @@ all: deltup |
68 |
+ depend: |
69 |
+- gcc -MM *.cpp > .depend |
70 |
++ ${CXX} -MM *.cpp > .depend |
71 |
+ |
72 |
+ deltup: $(objfiles) |
73 |
+- ${CC} $(objfiles) ${LDFLAGS} -o deltup $(libs) |
74 |
++ ${CXX} $(objfiles) ${LDFLAGS} -o deltup $(libs) |
75 |
+ |
76 |
|
77 |
diff --git a/app-portage/deltup/files/deltup-0.4.6-ldflags.patch b/app-portage/deltup/files/deltup-0.4.6-ldflags.patch |
78 |
new file mode 100644 |
79 |
index 00000000000..0d06255abcd |
80 |
--- /dev/null |
81 |
+++ b/app-portage/deltup/files/deltup-0.4.6-ldflags.patch |
82 |
@@ -0,0 +1,9 @@ |
83 |
+diff --git a/Makefile b/Makefile |
84 |
+index 6a3aa95..6e7c5cf 100644 |
85 |
+--- a/Makefile |
86 |
++++ b/Makefile |
87 |
+@@ -20,3 +20,3 @@ depend: |
88 |
+ deltup: $(objfiles) |
89 |
+- ${CC} $(objfiles) ${CXXFLAGS} -o deltup $(libs) |
90 |
++ ${CC} $(objfiles) ${LDFLAGS} -o deltup $(libs) |
91 |
+ |