| 1 |
commit: 23e6cad3c576c32f97ad857da284e51a88ae9da1 |
| 2 |
Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jul 3 15:46:30 2021 +0000 |
| 4 |
Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jul 3 15:47:36 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23e6cad3 |
| 7 |
|
| 8 |
sci-electronics/puff: Do not call 'ld' directly |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/799440 |
| 11 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
| 12 |
Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org> |
| 13 |
|
| 14 |
.../puff/files/puff-20100127-Makefile.patch | 19 +++++++++++++++++++ |
| 15 |
.../puff/files/puff-20181104-Makefile.patch | 21 +++++++++++++++++++++ |
| 16 |
sci-electronics/puff/puff-20100127-r1.ebuild | 10 ++++------ |
| 17 |
sci-electronics/puff/puff-20181104.ebuild | 9 ++++----- |
| 18 |
4 files changed, 48 insertions(+), 11 deletions(-) |
| 19 |
|
| 20 |
diff --git a/sci-electronics/puff/files/puff-20100127-Makefile.patch b/sci-electronics/puff/files/puff-20100127-Makefile.patch |
| 21 |
new file mode 100644 |
| 22 |
index 00000000000..025b7237adf |
| 23 |
--- /dev/null |
| 24 |
+++ b/sci-electronics/puff/files/puff-20100127-Makefile.patch |
| 25 |
@@ -0,0 +1,19 @@ |
| 26 |
+--- Makefile.old 2010-01-22 18:02:32.000000000 +0100 |
| 27 |
++++ Makefile 2021-07-03 16:55:59.092249878 +0200 |
| 28 |
+@@ -1,12 +1,13 @@ |
| 29 |
+ X11LIBDIR = /usr/X11R6/lib |
| 30 |
+ PASCALCOMPILER = fpc |
| 31 |
+-CC = gcc |
| 32 |
+-CFLAGS = -O2 -g |
| 33 |
++#CC = gcc |
| 34 |
++#CFLAGS = -O2 -g |
| 35 |
+ |
| 36 |
+ POBJS = puff.o pfart.o pffft.o pfmsc.o pfrw.o pfst.o pfun1.o pfun2.o pfun3.o xgraph.o |
| 37 |
+ |
| 38 |
+ puff: $(POBJS) puff_c.o ppas.sh |
| 39 |
+- sed 's/link.res/link.res puff_c.o \/usr\/lib\/libX11.so/' <ppas.sh >ppasx.sh |
| 40 |
++ sed -i -e 's!^[^[:space:]]\+ -b!$(LD) -b!g' ppas.sh |
| 41 |
++ sed 's/.res/.res $(LDFLAGS) puff_c.o \/usr\/lib64\/libX11.so/' <ppas.sh >ppasx.sh |
| 42 |
+ sh ppasx.sh |
| 43 |
+ |
| 44 |
+ %.o: %.pas |
| 45 |
|
| 46 |
diff --git a/sci-electronics/puff/files/puff-20181104-Makefile.patch b/sci-electronics/puff/files/puff-20181104-Makefile.patch |
| 47 |
new file mode 100644 |
| 48 |
index 00000000000..a874b9173ae |
| 49 |
--- /dev/null |
| 50 |
+++ b/sci-electronics/puff/files/puff-20181104-Makefile.patch |
| 51 |
@@ -0,0 +1,21 @@ |
| 52 |
+# fix lib path for X11 and dont ignore LDFLAGS |
| 53 |
+# respect CC and LD |
| 54 |
+--- Makefile.old 2021-07-03 16:34:49.937098627 +0200 |
| 55 |
++++ Makefile 2021-07-03 16:33:56.615284555 +0200 |
| 56 |
+@@ -1,12 +1,13 @@ |
| 57 |
+ X11LIBDIR = /usr/X11R6/lib |
| 58 |
+ PASCALCOMPILER = fpc |
| 59 |
+-CC = gcc |
| 60 |
+-CFLAGS = -O2 -g |
| 61 |
++#CC = gcc |
| 62 |
++#CFLAGS = -O2 -g |
| 63 |
+ |
| 64 |
+ POBJS = puff.o pfart.o pffft.o pfmsc.o pfrw.o pfst.o pfun1.o pfun2.o pfun3.o xgraph.o |
| 65 |
+ |
| 66 |
+ puff: $(POBJS) puff_c.o ppas.sh |
| 67 |
+- sed 's/link.res/link.res puff_c.o -lX11/' <ppas.sh >ppasx.sh |
| 68 |
++ sed -i -e 's!^[^[:space:]]\+ -b!$(LD) -b!g' ppas.sh |
| 69 |
++ sed 's/.res/.res $(LDFLAGS) puff_c.o -lX11/' <ppas.sh >ppasx.sh |
| 70 |
+ sh ppasx.sh |
| 71 |
+ |
| 72 |
+ %.o: %.pas |
| 73 |
|
| 74 |
diff --git a/sci-electronics/puff/puff-20100127-r1.ebuild b/sci-electronics/puff/puff-20100127-r1.ebuild |
| 75 |
index 1c89266a793..3ec8bccda1f 100644 |
| 76 |
--- a/sci-electronics/puff/puff-20100127-r1.ebuild |
| 77 |
+++ b/sci-electronics/puff/puff-20100127-r1.ebuild |
| 78 |
@@ -20,16 +20,14 @@ DEPEND="${RDEPEND} |
| 79 |
src_prepare() { |
| 80 |
default |
| 81 |
# fix lib path for X11 and dont ignore LDFLAGS |
| 82 |
- sed -i -e "s#lib\\\/#$(get_libdir)\\\/#" \ |
| 83 |
- -e 's/CFLAGS/#CFLAGS/' \ |
| 84 |
- -e 's/CC =/#CC =/' \ |
| 85 |
- -e 's/link.res/.res/g' \ |
| 86 |
- -e 's/.res pu/.res $(LDFLAGS) pu/' Makefile || die |
| 87 |
+ # respect CC and LD |
| 88 |
+ eapply -p0 "${FILESDIR}"/$P-Makefile.patch |
| 89 |
+ eapply_user |
| 90 |
} |
| 91 |
|
| 92 |
src_compile() { |
| 93 |
LDFLAGS="$(raw-ldflags)" |
| 94 |
- emake -j1 CC="$(tc-getCC)" |
| 95 |
+ emake -j1 CC="$(tc-getCC)" LD="$(tc-getLD)" |
| 96 |
} |
| 97 |
|
| 98 |
src_install() { |
| 99 |
|
| 100 |
diff --git a/sci-electronics/puff/puff-20181104.ebuild b/sci-electronics/puff/puff-20181104.ebuild |
| 101 |
index bf281406eae..3ec8bccda1f 100644 |
| 102 |
--- a/sci-electronics/puff/puff-20181104.ebuild |
| 103 |
+++ b/sci-electronics/puff/puff-20181104.ebuild |
| 104 |
@@ -20,15 +20,14 @@ DEPEND="${RDEPEND} |
| 105 |
src_prepare() { |
| 106 |
default |
| 107 |
# fix lib path for X11 and dont ignore LDFLAGS |
| 108 |
- sed -i -e 's/CFLAGS/#CFLAGS/' \ |
| 109 |
- -e 's/CC =/#CC =/' \ |
| 110 |
- -e 's/link.res/.res/g' \ |
| 111 |
- -e 's/.res pu/.res $(LDFLAGS) pu/' Makefile || die |
| 112 |
+ # respect CC and LD |
| 113 |
+ eapply -p0 "${FILESDIR}"/$P-Makefile.patch |
| 114 |
+ eapply_user |
| 115 |
} |
| 116 |
|
| 117 |
src_compile() { |
| 118 |
LDFLAGS="$(raw-ldflags)" |
| 119 |
- emake -j1 CC="$(tc-getCC)" |
| 120 |
+ emake -j1 CC="$(tc-getCC)" LD="$(tc-getLD)" |
| 121 |
} |
| 122 |
|
| 123 |
src_install() { |
Archives