Check-in [9bdee0a947]
Overview
SHA1:9bdee0a94747ebc4dc09c79a64d5624c2945ed1c
Date: 2010-09-26 04:40:04
User: rkeene
Comment:Added support for i586-mingw32msvc compilation

Added patch to allow use of AR/RANLIB environment variables

Timelines: family | ancestors | descendants | both | trunk
Downloads: Tarball | ZIP archive
Other Links: files | file ages | folders | manifest
Tags And Properties
Context
2010-09-26
04:40
[496446d70e] Comment update (user: rkeene, tags: trunk)
04:40
[9bdee0a947] Added support for i586-mingw32msvc compilation

Added patch to allow use of AR/RANLIB environment variables (user: rkeene, tags: trunk)

04:39
[e3565593fd] Updated to clean up archive files after installation (user: rkeene, tags: trunk)
Changes

Modified mk4tcl/build.sh from [2ffb8472f5] to [354ba5de6f].

54
55
56
57
58
59
60









61
62
63
64
65
66
67
68
69
70
		fi

		echo "Applying: ${patch}"
		${PATCH:-patch} -p1 < "${patch}"
	done

	cd "${BUILDDIR}/unix" || exit 1










	# Build static libraries for linking against Tclkit
	./configure --disable-shared --prefix="${INSTDIR}" --exec-prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}/../generic" ${CONFIGUREEXTRA}
	${MAKE:-make} tcllibdir="${INSTDIR}/lib" || exit 1
	${MAKE:-make} tcllibdir="${INSTDIR}/lib" install

	exit 0
) || exit 1

exit 0







>
>
>
>
>
>
>
>
>



|
|





54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
		fi

		echo "Applying: ${patch}"
		${PATCH:-patch} -p1 < "${patch}"
	done

	cd "${BUILDDIR}/unix" || exit 1

	# If we are building for Win32, we need to define "BUILD_tcl" so that
	# TCL_STORAGE_CLASS gets defined as DLLEXPORT, to make static linking
	# work
	BUILDTYPE="$(basename "${TCLCONFIGDIR}")"
	if [ "${BUILDTYPE}" = "win" ]; then
		CPPFLAGS="${CPPFLAGS} -DBUILD_tcl=1"
		export CPPFLAGS
	fi

	# Build static libraries for linking against Tclkit
	./configure --disable-shared --prefix="${INSTDIR}" --exec-prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}/../generic" ${CONFIGUREEXTRA}
	${MAKE:-make} tcllibdir="${INSTDIR}/lib" AR="${AR:-ar}" RANLIB="${RANLIB:-ranlib}" || exit 1
	${MAKE:-make} tcllibdir="${INSTDIR}/lib" AR="${AR:-ar}" RANLIB="${RANLIB:-ranlib}" install

	exit 0
) || exit 1

exit 0

Added mk4tcl/patches/all/metakit-2.4.9.7-supportranlibandar.diff version [b8881f36d8].



















































































































>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
diff -uNr metakit-2.4.9.7-orig/unix/Makefile.in metakit-2.4.9.7-rsk/unix/Makefile.in
--- metakit-2.4.9.7-orig/unix/Makefile.in	2007-06-15 19:23:25.000000000 -0500
+++ metakit-2.4.9.7-rsk/unix/Makefile.in	2010-02-26 00:13:39.000000000 -0600
@@ -16,6 +16,9 @@
 
 DEMOS   = demo dump myio
 
+AR = ar
+RANLIB = ranlib
+
 LINK_SPECIAL_FLAGS	=	@LINK_SPECIAL_FLAGS@ @LIBS@
 LINK_SPECIAL_FILES	=	@LINK_SPECIAL_FILES@
 
@@ -98,12 +101,12 @@
 			$(srcdir)/../include/mk4str.h \
 			$(srcdir)/../include/mk4str.inl $(DESTDIR)$(includedir)
 	$(INSTALL_PROGRAM) libmk4$(LIBEXT) $(DESTDIR)$(libdir)
-	if [ '${LIBEXT}' = '.a' ]; then ranlib $(DESTDIR)$(libdir)/libmk4.a; fi
+	if [ '${LIBEXT}' = '.a' ]; then $(RANLIB) $(DESTDIR)$(libdir)/libmk4.a; fi
 
 install-tcl: Mk4tcl$(LIBEXT)
 	mkdir -p $(DESTDIR)$(tcllibdir)/Mk4tcl
 	$(INSTALL_PROGRAM) Mk4tcl$(LIBEXT) $(DESTDIR)$(tcllibdir)/Mk4tcl
-	if [ '${LIBEXT}' = '.a' ]; then ranlib $(DESTDIR)$(tcllibdir)/Mk4tcl/Mk4tcl.a; fi
+	if [ '${LIBEXT}' = '.a' ]; then $(RANLIB) $(DESTDIR)$(tcllibdir)/Mk4tcl/Mk4tcl.a; fi
 	echo 'package ifneeded Mk4tcl 2.4.9.7 [list load [file join $$dir Mk4tcl$(LIBEXT)] Mk4tcl]' >$(DESTDIR)$(tcllibdir)/Mk4tcl/pkgIndex.tcl
 
 install-python: Mk4py$(LIBEXT)
@@ -130,22 +133,22 @@
 	cd $(srcdir) && autoconf
 
 libmk4$(LIB_SUFFIX): $(LOBJS)
-	ar rcu $@ $(LOBJS)
-	ranlib $@
+	$(AR) rcu $@ $(LOBJS)
+	$(RANLIB) $@
 
 libmk4$(SHLIB_SUFFIX): $(LOBJS) $(LINK_SPECIAL_FILES)
 	$(SHLIB_LD) -o $@ $(LOBJS) $(LINK_SPECIAL_FLAGS)
 
 Mk4tcl$(LIB_SUFFIX): mk4tcl.o mk4too.o $(LOBJS)
-	ar rcu $@ mk4tcl.o mk4too.o $(LOBJS)
-	ranlib $@
+	$(AR) rcu $@ mk4tcl.o mk4too.o $(LOBJS)
+	$(RANLIB) $@
 
 Mk4tcl$(SHLIB_SUFFIX): mk4tcl.o mk4too.o $(LOBJS) $(LINK_SPECIAL_FILES)
 	$(SHLIB_LD) -o $@ mk4tcl.o mk4too.o $(LOBJS) $(LINK_SPECIAL_FLAGS)
 
 Mk4py$(LIB_SUFFIX): $(PYOBJS) $(LOBJS)
-	ar cru $@ $(PYOBJS) $(LOBJS)
-	ranlib $@
+	$(AR) cru $@ $(PYOBJS) $(LOBJS)
+	$(RANLIB) $@
 
 Mk4py$(SHLIB_SUFFIX): $(PYOBJS) $(LOBJS) $(LINK_SPECIAL_FILES)
 	$(SHLIB_LD) -o $@ $(PYOBJS) $(LOBJS) $(LINK_SPECIAL_FLAGS)