Check-in [9bdee0a947]
Overview
Comment:Added support for i586-mingw32msvc compilation

Added patch to allow use of AR/RANLIB environment variables

Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:9bdee0a94747ebc4dc09c79a64d5624c2945ed1c
User & Date: rkeene on 2010-09-26 04:40:04
Other Links: manifest | tags
Context
2010-09-26
04:40
Comment update check-in: 496446d70e user: rkeene tags: trunk
04:40
Added support for i586-mingw32msvc compilation

Added patch to allow use of AR/RANLIB environment variables check-in: 9bdee0a947 user: rkeene tags: trunk

04:39
Updated to clean up archive files after installation check-in: e3565593fd user: rkeene tags: trunk
Changes

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

    54     54   		fi
    55     55   
    56     56   		echo "Applying: ${patch}"
    57     57   		${PATCH:-patch} -p1 < "${patch}"
    58     58   	done
    59     59   
    60     60   	cd "${BUILDDIR}/unix" || exit 1
           61  +
           62  +	# If we are building for Win32, we need to define "BUILD_tcl" so that
           63  +	# TCL_STORAGE_CLASS gets defined as DLLEXPORT, to make static linking
           64  +	# work
           65  +	BUILDTYPE="$(basename "${TCLCONFIGDIR}")"
           66  +	if [ "${BUILDTYPE}" = "win" ]; then
           67  +		CPPFLAGS="${CPPFLAGS} -DBUILD_tcl=1"
           68  +		export CPPFLAGS
           69  +	fi
    61     70   
    62     71   	# Build static libraries for linking against Tclkit
    63     72   	./configure --disable-shared --prefix="${INSTDIR}" --exec-prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}/../generic" ${CONFIGUREEXTRA}
    64         -	${MAKE:-make} tcllibdir="${INSTDIR}/lib" || exit 1
    65         -	${MAKE:-make} tcllibdir="${INSTDIR}/lib" install
           73  +	${MAKE:-make} tcllibdir="${INSTDIR}/lib" AR="${AR:-ar}" RANLIB="${RANLIB:-ranlib}" || exit 1
           74  +	${MAKE:-make} tcllibdir="${INSTDIR}/lib" AR="${AR:-ar}" RANLIB="${RANLIB:-ranlib}" install
    66     75   
    67     76   	exit 0
    68     77   ) || exit 1
    69     78   
    70     79   exit 0

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

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