File tree Expand file tree Collapse file tree 3 files changed +2
-53
lines changed Expand file tree Collapse file tree 3 files changed +2
-53
lines changed Original file line number Diff line number Diff line change @@ -22,21 +22,6 @@ if [ -n "${STATIC}" ]; then
22
22
fi
23
23
fi
24
24
25
- patch -p1 << 'EOF '
26
- diff --git a/unix/Makefile.in b/unix/Makefile.in
27
- --- a/unix/Makefile.in
28
- +++ b/unix/Makefile.in
29
- @@ -1813,7 +1813,7 @@ configure-packages:
30
- $$i/configure --with-tcl=../.. \
31
- --with-tclinclude=$(GENERIC_DIR) \
32
- $(PKG_CFG_ARGS) --libdir=$(PACKAGE_DIR) \
33
- - --enable-shared --enable-threads; ) || exit $$?; \
34
- + --enable-shared=no --enable-threads; ) || exit $$?; \
35
- fi; \
36
- fi; \
37
- fi; \
38
- EOF
39
-
40
25
# Remove packages we don't care about and can pull in unwanted symbols.
41
26
rm -rf pkgs/sqlite* pkgs/tdbc*
42
27
@@ -48,12 +33,9 @@ CFLAGS="${CFLAGS}" CPPFLAGS="${CFLAGS}" LDFLAGS="${EXTRA_TARGET_LDFLAGS}" ./conf
48
33
--build=${BUILD_TRIPLE} \
49
34
--host=${TARGET_TRIPLE} \
50
35
--prefix=/tools/deps \
51
- --enable-shared=no \
36
+ --enable-shared \
52
37
--enable-threads
53
38
54
39
make -j ${NUM_CPUS}
55
40
make -j ${NUM_CPUS} install DESTDIR=${ROOT} /out
56
41
make -j ${NUM_CPUS} install-private-headers DESTDIR=${ROOT} /out
57
-
58
- # For some reason libtcl*.a have weird permissions. Fix that.
59
- chmod 644 ${ROOT} /out/tools/deps/lib/libtcl* .a
Original file line number Diff line number Diff line change @@ -31,7 +31,7 @@ CFLAGS="${CFLAGS}" CPPFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" ./configure \
31
31
--host=${TARGET_TRIPLE} \
32
32
--prefix=/tools/deps \
33
33
--with-tcl=${TOOLS_PATH} /deps/lib \
34
- --enable-shared=no \
34
+ --enable-shared \
35
35
--enable-threads \
36
36
${EXTRA_CONFIGURE_FLAGS}
37
37
@@ -53,7 +53,4 @@ touch wish
53
53
make -j ${NUM_CPUS} install DESTDIR=${ROOT} /out
54
54
make -j ${NUM_CPUS} install-private-headers DESTDIR=${ROOT} /out
55
55
56
- # For some reason libtk*.a have weird permissions. Fix that.
57
- chmod 644 /${ROOT} /out/tools/deps/lib/libtk* .a
58
-
59
56
rm ${ROOT} /out/tools/deps/bin/wish*
Original file line number Diff line number Diff line change @@ -681,36 +681,6 @@ _tkinter:
681
681
- tcl8.6
682
682
- tk8.6
683
683
684
- # Without -ObjC, we get a crash: -[TKApplication tkProcessEvent:]: unrecognized selector sent to instance.
685
- # See also https://core.tcl-lang.org/tk/tktview/85f316beb15108ac43b03fa6c8608e31f3ae5f92.
686
- # This is apparently an issue with static linking Objective-C binaries.
687
- linker-args :
688
- - args : ["-ObjC"]
689
- targets :
690
- - .*-apple-darwin
691
- links-conditional :
692
- - name : X11
693
- targets :
694
- - .*-unknown-linux-.*
695
- - name : xcb
696
- targets :
697
- - .*-unknown-linux-.*
698
- - name : Xau
699
- targets :
700
- - .*-unknown-linux-.*
701
- # Many of these are dependencies of libtcl and libtk.
702
- frameworks :
703
- - AppKit
704
- - ApplicationServices
705
- - Carbon
706
- - Cocoa
707
- - CoreFoundation
708
- - CoreServices
709
- - CoreGraphics
710
- - IOKit
711
- - QuartzCore
712
- - UniformTypeIdentifiers
713
-
714
684
_tokenize :
715
685
minimum-python-version : " 3.11"
716
686
config-c-only : true
You can’t perform that action at this time.
0 commit comments