| 1 |
commit: 9dfbf7a90b70366380cc9daf70d0a90a37078d2c |
| 2 |
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jun 1 13:12:39 2020 +0000 |
| 4 |
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jun 1 13:12:39 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dfbf7a9 |
| 7 |
|
| 8 |
dev-tcltk/tclpython: do not use colon in sed |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/726610 |
| 11 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
| 12 |
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> |
| 13 |
|
| 14 |
dev-tcltk/tclpython/files/tclpython-5.0-gentoo.patch | 4 ++-- |
| 15 |
dev-tcltk/tclpython/tclpython-5.0.ebuild | 11 ++--------- |
| 16 |
2 files changed, 4 insertions(+), 11 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-tcltk/tclpython/files/tclpython-5.0-gentoo.patch b/dev-tcltk/tclpython/files/tclpython-5.0-gentoo.patch |
| 19 |
index 965fe3d8d72..c77339982fd 100644 |
| 20 |
--- a/dev-tcltk/tclpython/files/tclpython-5.0-gentoo.patch |
| 21 |
+++ b/dev-tcltk/tclpython/files/tclpython-5.0-gentoo.patch |
| 22 |
@@ -5,12 +5,12 @@ |
| 23 |
|
| 24 |
TCL_VERSION=$(shell echo 'puts $\$$tcl_version' | tclsh) |
| 25 |
-CFLAGS:= -O2 -Wall -fPIC -DUSE_TCL_STUBS |
| 26 |
-+CFLAGS:= @CFLAGS@ -fPIC -DUSE_TCL_STUBS |
| 27 |
++CFLAGS:= $(MYCFLAGS) -fPIC -DUSE_TCL_STUBS |
| 28 |
CFLAGS+= $(shell $(PYTHON_CONFIG) --includes) |
| 29 |
CFLAGS+= -I/usr/include/tcl$(TCL_VERSION) |
| 30 |
CFLAGS+= -DTCLPYTHON_VERSION=$(PKG_VERSION) |
| 31 |
-LDFLAGS:= -shared -s |
| 32 |
-+LDFLAGS:= @LDFLAGS@ -shared |
| 33 |
++LDFLAGS:= $(MYLDFLAGS) -shared |
| 34 |
LDFLAGS+= $(shell $(PYTHON_CONFIG) --libs) |
| 35 |
LDFLAGS+= -ltclstub$(TCL_VERSION) |
| 36 |
|
| 37 |
|
| 38 |
diff --git a/dev-tcltk/tclpython/tclpython-5.0.ebuild b/dev-tcltk/tclpython/tclpython-5.0.ebuild |
| 39 |
index 90df040a57a..2603ce545fd 100644 |
| 40 |
--- a/dev-tcltk/tclpython/tclpython-5.0.ebuild |
| 41 |
+++ b/dev-tcltk/tclpython/tclpython-5.0.ebuild |
| 42 |
@@ -24,16 +24,9 @@ RDEPEND="${DEPEND}" |
| 43 |
|
| 44 |
PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) |
| 45 |
|
| 46 |
-src_prepare() { |
| 47 |
- default |
| 48 |
- sed -i \ |
| 49 |
- -e "s:@CFLAGS@:${CFLAGS}:g" \ |
| 50 |
- -e "s:@LDFLAGS@:${LDFLAGS}:g" \ |
| 51 |
- Makefile || die |
| 52 |
-} |
| 53 |
- |
| 54 |
src_compile() { |
| 55 |
- emake PKG_NAME=tclpython3 CC=$(tc-getCC) |
| 56 |
+ emake PKG_NAME=tclpython3 CC=$(tc-getCC) \ |
| 57 |
+ MYCFLAGS="${CFLAGS}" MYLDFLAGS="${LDFLAGS}" |
| 58 |
} |
| 59 |
|
| 60 |
src_test() { |
Archives