KitCreator
Check-in [b5def69863]
Login
HomeDownloadsSource CodeTicketsWiki
Overview
Comment:Remove obsolete differences that are no longer needed.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | winFixes
Files: files | file ages | folders
SHA1: b5def698630972f7a93952d346066d373f436614
User & Date: mistachkin on 2014-08-28 20:06:23
Other Links: branch diff | manifest | tags
Context
2015-02-09
18:39
Merge updates from trunk. check-in: 5574242e95 user: mistachkin tags: winFixes
2014-08-28
20:06
Remove obsolete differences that are no longer needed. check-in: b5def69863 user: mistachkin tags: winFixes
18:27
Merge updates from trunk. check-in: df02b7cfd1 user: mistachkin tags: winFixes
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified README from [1a63b72891] to [f2f8e3ce68].

︙
166
167
168
169
170
171
172

173
174
175
176
177
178
179

166
167
168
169
170
171
172
173
174
175
176
177
178
179
180








+








		Set this to the name of compiler on the host on which
		the cross compilation is being run.

On Windows we also need this:

	1. RC
		Resource compiler : e.g. i686-pc-mingw32-windres


Kitsh Configure Options:
	1. --enable-kit-storage={zip|mk4|auto}
		Specify which type of storage to use with the Tclkit.  The
		default is to auto-detect.  Auto-detection uses Mk4 if
		available and built statically, otherwise it falls back to Zip.
︙

Modified zlib/build.sh from [d95f997208] to [13b1c7bf71].

︙
13
14
15
16
17
18
19
20
21
22

23
24
25
26
27
28
29

13
14
15
16
17
18
19



20
21
22
23
24
25
26
27








-
-
-
+









ZLIBVERS="1.2.8"
SRC="src/zlib-${ZLIBVERS}.tar.gz"
SRCURL="http://sourceforge.net/projects/libpng/files/zlib/${ZLIBVERS}/zlib-${ZLIBVERS}.tar.gz/download"
BUILDDIR="$(pwd)/build/zlib-${ZLIBVERS}"
OUTDIR="$(pwd)/out"
INSTDIR="$(pwd)/inst"
PATCHSCRIPTDIR="$(pwd)/patchscripts"
PATCHDIR="$(pwd)/patches"
export ZLIBVERS SRC SRCURL BUILDDIR OUTDIR INSTDIR PATCHSCRIPTDIR PATCHDIR
export ZLIBVERS SRC SRCURL BUILDDIR OUTDIR INSTDIR

# Set configure options for this sub-project
LDFLAGS="${LDFLAGS} ${KC_ZLIB_LDFLAGS}"
CFLAGS="${CFLAGS} ${KC_ZLIB_CFLAGS}"
CPPFLAGS="${CPPFLAGS} ${KC_ZLIB_CPPFLAGS}"
LIBS="${LIBS} ${KC_ZLIB_LIBS}"
export LDFLAGS CFLAGS CPPFLAGS LIBS
︙

Deleted zlib/patches/1.2.8/zlib-1.2.8-enable-configure.diff version [2e0d9c8d12]. 

1
2
3
4
5
6
7
8
9
10
11
12
13
14
















-
-
-
-
-
-
-
-
-
-
-
-
-
-

diff -uNr zlib-1.2.8.orig/configure zlib-1.2.8/configure
--- zlib-1.2.8.orig/configure	2013-03-23 22:30:09 -0700
+++ zlib-1.2.8/configure	2013-11-05 00:33:39 -0800
@@ -191,10 +191,6 @@
   CYGWIN* | Cygwin* | cygwin* | OS/2*)
         EXE='.exe' ;;
   MINGW* | mingw*)
-# temporary bypass
-        rm -f $test.[co] $test $test$shared_ext
-        echo "Please use win32/Makefile.gcc instead." | tee -a configure.log
-        leave 1
         LDSHARED=${LDSHARED-"$cc -shared"}
         LDSHAREDLIBC=""
         EXE='.exe' ;;

Powered by Fossil · RSS