diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-06-13 10:39:22 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-06-13 10:39:22 +0100 |
| commit | 9452a6e87b6c2c70513bc47a2470bf9f1168920e (patch) | |
| tree | 8ac67e26b45f34d71c5aab3621813b100a0d5f00 /dev-tcltk/tclpython | |
| parent | f516638b7fe9592837389826a6152a7e1b251c54 (diff) | |
gentoo resync : 13.06.2020
Diffstat (limited to 'dev-tcltk/tclpython')
| -rw-r--r-- | dev-tcltk/tclpython/Manifest | 4 | ||||
| -rw-r--r-- | dev-tcltk/tclpython/files/tclpython-5.0-gentoo.patch | 14 | ||||
| -rw-r--r-- | dev-tcltk/tclpython/tclpython-5.0.ebuild | 25 |
3 files changed, 23 insertions, 20 deletions
diff --git a/dev-tcltk/tclpython/Manifest b/dev-tcltk/tclpython/Manifest index 76c4a3e28399..6c96181c84a2 100644 --- a/dev-tcltk/tclpython/Manifest +++ b/dev-tcltk/tclpython/Manifest @@ -1,7 +1,7 @@ AUX tclpython-4.1-python-3.patch 8863 BLAKE2B 6c1c2fa8f29240b6703911fde24519961f740cdac0d331cea7df3fb90fed769319ca0c00422ebe58275be90584c28debdf906f1b8c923e96d0c834a2af621077 SHA512 530d057501ef72e7f28cfff1f0af2076b93739085154fc4d20a5b59b26e33d1418bf694093b05e840055734438232dd9414ba0262720fb4bd2e35249769b24e7 -AUX tclpython-5.0-gentoo.patch 379 BLAKE2B f5f45d701998af7398a074f59bc25cc613b72f2f8825b46d7060fa039e04cfafc649959c451ec31b194ba47dd3f274e6ba20f8a1fd98b8c73392f0f4398257cc SHA512 8e5caec03836fdd8e2c50e49c6142e1349d577d5f73dc673e6bfdeee5b2d50cc20207dd59e75e7639fb780fda217e500104b4332cddca793e6749d047d5246ee +AUX tclpython-5.0-gentoo.patch 856 BLAKE2B cd2efc191b03a24ed9fc7ed69349a8503228de30b9f79d01d81a11b1b166819e202901a6a1f246d0c142ae55fd7589a3c2ad7e81a1cbc7ca5ef486b5424c7292 SHA512 2cf2a99979d7457e5b16c795c86883b81069ecb01b485d52990e1c69ef412dbced3a10dfcfb803b8e1aa0cb0a09221598d7317a19dd20576e4c9fe163d29811f DIST tclpython-4.1.tar.bz2 10580 BLAKE2B 98d4783cc52bc907c21d50ee393e25ee084b449db7c393c16b0b1f0420469bd0904d16dc2a6806b776dad7dabd521e5f2e8cc942c720d9e69750385302355608 SHA512 5f08e7129a7d9afeb1ac6bf1ab1c83ad3bb481593c9516c0653c7b4ba0dfb1b3129a336e64b998cec8ef2d2377a6a366b73c640d25839ab280d5079c0b220d54 DIST tclpython-5.0.tar.gz 19327 BLAKE2B bad25a6eb04dbcd9ca3e9bc81d44f098f31f2acf367ecc32307596d5da3ed95752b3c60d9ee74fc04e21669e0361f0790edad3ad5793c78ece4904beacd92900 SHA512 fe15218fe00e921384dbd9611685b86cb6dfacb515a95545079550aeadaaafc3964e6ef0594a268a3fd900f40d178659e8b7f6f2a6d9aa507b59a8be0bd116af EBUILD tclpython-4.1-r6.ebuild 1279 BLAKE2B 684acb03b7a6d3a5684d16494f3a10d23abfd1da164b528c6dccb78c131bc67554809e318b44604eb4dc07697f5f950dd4634ef8a9c5a0df6d3678fdfb0b6a57 SHA512 addcbf2fb4e252dfdc7915f7df82086c1c62d62f27372e8dbd2b6eccf9d9334d5a89f5b3ae0151666d65974729dbe351d18c1908e2309d471508913ae7daa1f2 -EBUILD tclpython-5.0.ebuild 1260 BLAKE2B 34766b4c2feba32e959202ca17f3ba060cdfb962c79767cb1f536a71ed12da55f011c280427ce97e4ede9bccbc572b93725df9006f37e0ed5ae086cc5b91d807 SHA512 a444ee78eb6b83f1c63b28010b529f9d02a5c28d9160630609455832a94ef5a112a53f5457ae9a4737a90fe0d405b6eae50bd99b0421b07a415a46c1004ca6a1 +EBUILD tclpython-5.0.ebuild 986 BLAKE2B 7c3185aefa88a93b1a110bdc6f3d77b2e3c455c1f6ff8bd2e6d5156f5d4332c4c418b16f8fc0e44b69e76260a3e69d423585022970a73822695ec7c0b81633cc SHA512 ccf66d2ac33fa5984822feeed42b7d922b1291074567fad3a336f1d6e9aa5d031409a41f9c93aebfbddd40adb815a88b3439a08fecd0ffe9f29839d320b7f5d0 MISC metadata.xml 259 BLAKE2B 174c3c7b4292350e73a38b09d473abba172ee6e82ca1b5bcb6815a9927609a7fbac063a19498e7c5deaa32530d10d8c493760ff5b6e489f821410cfeccadf566 SHA512 5943f2c9dc9a55862bae4c01be9e1f27304ffc1ce48d67341b4a19793c0bb11fe3d1a419af924ac360aeeafbce28018971602019a559a8a6c5939e05e3567639 diff --git a/dev-tcltk/tclpython/files/tclpython-5.0-gentoo.patch b/dev-tcltk/tclpython/files/tclpython-5.0-gentoo.patch index 7f4aa0bf5a2e..c77339982fd6 100644 --- a/dev-tcltk/tclpython/files/tclpython-5.0-gentoo.patch +++ b/dev-tcltk/tclpython/files/tclpython-5.0-gentoo.patch @@ -1,5 +1,19 @@ --- a/Makefile 2018-10-28 17:21:20.274137396 +0100 +++ b/Makefile 2018-10-28 17:21:47.696694473 +0100 +@@ -16,11 +16,11 @@ + LIBRARY:= $(PKG_NAME).so.$(PKG_VERSION) + + TCL_VERSION=$(shell echo 'puts $\$$tcl_version' | tclsh) +-CFLAGS:= -O2 -Wall -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:= $(MYLDFLAGS) -shared + LDFLAGS+= $(shell $(PYTHON_CONFIG) --libs) + LDFLAGS+= -ltclstub$(TCL_VERSION) + @@ -62,7 +62,8 @@ $(OUTPUT_DIR)/pkgIndex.tcl:pkg/pkgIndex.tcl cp -t $(dir $@) $^ diff --git a/dev-tcltk/tclpython/tclpython-5.0.ebuild b/dev-tcltk/tclpython/tclpython-5.0.ebuild index 92786421ee10..2603ce545fdb 100644 --- a/dev-tcltk/tclpython/tclpython-5.0.ebuild +++ b/dev-tcltk/tclpython/tclpython-5.0.ebuild @@ -25,30 +25,19 @@ RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) src_compile() { - if python_is_python3; then - PKG_NAME=tclpython3 - else - PKG_NAME=tclpython - fi - emake PKG_NAME=${PKG_NAME} CC=$(tc-getCC) + emake PKG_NAME=tclpython3 CC=$(tc-getCC) \ + MYCFLAGS="${CFLAGS}" MYLDFLAGS="${LDFLAGS}" } src_test() { - emake PKG_NAME=${PKG_NAME} CC=$(tc-getCC) test + emake PKG_NAME=tclpython3 CC=$(tc-getCC) test } src_install() { - if python_is_python3; then - insinto /usr/$(get_libdir) - doins -r build/tclpython3/tclpython3 - fperms 775 /usr/$(get_libdir)/tclpython3/tclpython3.so.${PV} - dosym tclpython3.so.${PV} /usr/$(get_libdir)/tclpython3/tclpython3.so - else - insinto /usr/$(get_libdir) - doins -r build/tclpython/tclpython - fperms 775 /usr/$(get_libdir)/tclpython/tclpython.so.${PV} - dosym tclpython.so.${PV} /usr/$(get_libdir)/tclpython/tclpython3.so - fi + insinto /usr/$(get_libdir) + doins -r build/tclpython3/tclpython3 + fperms 775 /usr/$(get_libdir)/tclpython3/tclpython3.so.${PV} + dosym tclpython3.so.${PV} /usr/$(get_libdir)/tclpython3/tclpython3.so dodoc README.md VERSION.md } |