Re: Putting packages up for adoption

[Jan Nijtmans <jan.nijtmans@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 2247 bytes --]

Op zo 22 mrt. 2020 om 23:34 schreef Yaakov Selkowitz:
> A word of caution wrt Tcl/Tk for Cygwin: upstream incorrectly treats
> Cygwin as a Win32 platform, necessitating extensive patches to make it
> comply with *NIX/X11 standards.  These patches CANNOT be dropped
> without breaking compatibility, since Win32 and X11 APIs do not
> interact.  Fortunately, Tcl/Tk moves rather slowly, so the existing
> patches should serve you well for some time.

Yes, I'm aware of that. Of course, I'll be very careful to guarantee
100% binary compatibility.

Still, I have some questions. At first, I noted that the current Tcl
version is 8.6.8, which is two patchlevels behind (released
December 22, 2017, more than 3 years old, while 8.6.10
is released November 21, 2019, 4 months ago).  Work to do!

So, I tried starting with x86_64-w64-mingw32. Here are my remarks.

- There are 7 patches included. Only one of them applies cleanly,
  the others are not really necessary (Please correct me if I'm wrong.
  Let's go through them.
  - tcl-8.5.6-mingw.patch
    This one is wrong. Changing tools for cross-compilations should
    be done by "configure  ...  --host=x86_64-w64-mingw32"
  - tcl-8.6.1-nativezlib.patch
    OK. Tcl provides its own zlib.dll, in case it's not available externally.
    In Cygwin it is available (as "mingw64-x86_64-zlib"), which is prefered.
    (I added "cygautoreconf", so this patch would be part of "configure")
  - tcl-8.6.3-autopath.patch
    Not necessary for building, Only needed when we want to run
    Tcl in a non-standard installed directory.
  - tcl-8.6.5-hidden.patch
    Wrong. This exports some internal symbols, which are not
    supposed to be exported at all.
  - tcl-8-6-5-paralle-make-fix.patch
    Already fixed upstream. Besides, it's for unix/Makefile.in, not for mingw.
  - tcl-mingw-w64-compatibility.patch
    Already fixed upstream:
<https://core.tcl-lang.org/tcl/info/8fbf108ea77e5351>
  - tcl-nativetclsh.patch
    Only needed when running Tcl, not for building the libraries

Further on, I noted the the resulting hints file contains:
    requires: tcl
while I would expect:
    requires: mingw64-x86_64-zlib

Here is my cygport file so far.

Thanks for your feedback!

Regards,
      Jan Nijtmans

[-- Attachment #2: mingw64-x86_64-tcl.cygport --]
[-- Type: application/octet-stream, Size: 2085 bytes --]

CROSS_HOST="x86_64-w64-mingw32"
inherit cross

NAME="mingw64-x86_64-tcl"
VERSION=8.6.10
RELEASE=1
CATEGORY="Devel"
SUMMARY="Tcl interpreter for Win64 toolchain"
DEPEND="mingw64-x86_64-zlib"
DESCRIPTION="This package does NOT contain cygwin binaries.  Instead, it
contains msvcrt-linked binaries (aka 'mingw').  It is for use with the
mingw64-x86_64-gcc cross compiler, and installs into the
/usr/x86_64-w64-mingw32/sys-root/mingw/{lib,include} directories."
HOMEPAGE="https://www.tcl.tk/"
SRC_URI="mirror://sourceforge/tcl/tcl-core${VERSION}-src.tar.gz"
SRC_DIR="tcl${VERSION}"
#http://pkgs.fedoraproject.org/cgit/rpms/mingw-tcl.git/plain/tcl-8.6.3-autopath.patch
#	http://pkgs.fedoraproject.org/cgit/rpms/mingw-tcl.git/plain/tcl-8.6.5-hidden.patch
#	http://pkgs.fedoraproject.org/cgit/rpms/mingw-tcl.git/plain/tcl-8.6.5-parallel-make-fix.patch
#	http://pkgs.fedoraproject.org/cgit/rpms/mingw-tcl.git/plain/tcl-8.5.6-mingw.patch
#	http://pkgs.fedoraproject.org/cgit/rpms/mingw-tcl.git/plain/tcl-nativetclsh.patch
#	http://pkgs.fedoraproject.org/cgit/rpms/mingw-tcl.git/plain/tcl-mingw-w64-compatibility.patch
PATCH_URI="
	http://pkgs.fedoraproject.org/cgit/rpms/mingw-tcl.git/plain/tcl-8.6.1-nativezlib.patch
"

DIFF_EXCLUDES="Makefile tcl.hpj tclConfig.sh"

slot=${PV_MAJ_MIN}

src_compile() {
	lndirs
	cd ${B}/win
	cygautoreconf
	cygconf --enable-64bit --host=x86_64-w64-mingw32
	cygmake -j1 CYGPATH=echo
}

src_install() {
	cd ${B}/win
	USE_DESTDIR=0
	cyginstall

	rm -f ${D}${CROSS_BINDIR}/zlib1.dll

	sed -i \
		-e "s|^\(TCL_BUILD_LIB_SPEC\)='.*|\1='-Wl,${CROSS_LIBDIR}/libtcl${slot//.}.a'|" \
		-e "s|^\(TCL_SRC_DIR\)='.*'|\1='${CROSS_INCLUDEDIR}/tcl${slot}'|" \
		-e "s|^\(TCL_BUILD_STUB_LIB_SPEC\)='.*|\1='-Wl,${CROSS_LIBDIR}/libtclstub${slot//.}.a'|" \
		-e "s|^\(TCL_BUILD_STUB_LIB_PATH\)='.*/win|\1='${CROSS_LIBDIR}|" \
		-e "s|^\(TCL_STUB_LIB_SPEC\)='.*|\1='-Wl,-ltclstub${slot//.}'|" \
		${D}${CROSS_LIBDIR}/tclConfig.sh || error

	# install private headers
	includeinto tcl${slot}/win
	doinclude ${S}/win/*.h
	includeinto tcl${slot}/generic
	doinclude ${S}/generic/*.h
}