commit: 9dfbf7a90b70366380cc9daf70d0a90a37078d2c Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org> AuthorDate: Mon Jun 1 13:12:39 2020 +0000 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> CommitDate: Mon Jun 1 13:12:39 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dfbf7a9
dev-tcltk/tclpython: do not use colon in sed Closes: https://bugs.gentoo.org/726610 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> dev-tcltk/tclpython/files/tclpython-5.0-gentoo.patch | 4 ++-- dev-tcltk/tclpython/tclpython-5.0.ebuild | 11 ++--------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/dev-tcltk/tclpython/files/tclpython-5.0-gentoo.patch b/dev-tcltk/tclpython/files/tclpython-5.0-gentoo.patch index 965fe3d8d72..c77339982fd 100644 --- a/dev-tcltk/tclpython/files/tclpython-5.0-gentoo.patch +++ b/dev-tcltk/tclpython/files/tclpython-5.0-gentoo.patch @@ -5,12 +5,12 @@ TCL_VERSION=$(shell echo 'puts $\$$tcl_version' | tclsh) -CFLAGS:= -O2 -Wall -fPIC -DUSE_TCL_STUBS -+CFLAGS:= @CFLAGS@ -fPIC -DUSE_TCL_STUBS ++CFLAGS:= $(MYCFLAGS) -fPIC -DUSE_TCL_STUBS CFLAGS+= $(shell $(PYTHON_CONFIG) --includes) CFLAGS+= -I/usr/include/tcl$(TCL_VERSION) CFLAGS+= -DTCLPYTHON_VERSION=$(PKG_VERSION) -LDFLAGS:= -shared -s -+LDFLAGS:= @LDFLAGS@ -shared ++LDFLAGS:= $(MYLDFLAGS) -shared LDFLAGS+= $(shell $(PYTHON_CONFIG) --libs) LDFLAGS+= -ltclstub$(TCL_VERSION) diff --git a/dev-tcltk/tclpython/tclpython-5.0.ebuild b/dev-tcltk/tclpython/tclpython-5.0.ebuild index 90df040a57a..2603ce545fd 100644 --- a/dev-tcltk/tclpython/tclpython-5.0.ebuild +++ b/dev-tcltk/tclpython/tclpython-5.0.ebuild @@ -24,16 +24,9 @@ RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) -src_prepare() { - default - sed -i \ - -e "s:@CFLAGS@:${CFLAGS}:g" \ - -e "s:@LDFLAGS@:${LDFLAGS}:g" \ - Makefile || die -} - src_compile() { - emake PKG_NAME=tclpython3 CC=$(tc-getCC) + emake PKG_NAME=tclpython3 CC=$(tc-getCC) \ + MYCFLAGS="${CFLAGS}" MYLDFLAGS="${LDFLAGS}" } src_test() {
