From: <lin...@us...> - 2010-04-26 13:11:18
|
Revision: 7251 http://octave.svn.sourceforge.net/octave/?rev=7251&view=rev Author: lindnerb Date: 2010-04-26 13:11:12 +0000 (Mon, 26 Apr 2010) Log Message: ----------- mingw32: bugfix in uninstall code Modified Paths: -------------- trunk/octave-forge/admin/Windows/mingw32/blas/build-5.sh trunk/octave-forge/admin/Windows/mingw32/cblas/build-5.sh trunk/octave-forge/admin/Windows/mingw32/lapack/build-3.2.1-5.sh trunk/octave-forge/admin/Windows/mingw32/qrupdate/build-1.1.1-5.sh Modified: trunk/octave-forge/admin/Windows/mingw32/blas/build-5.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/blas/build-5.sh 2010-04-26 13:10:12 UTC (rev 7250) +++ trunk/octave-forge/admin/Windows/mingw32/blas/build-5.sh 2010-04-26 13:11:12 UTC (rev 7251) @@ -100,7 +100,7 @@ # Uninstall license file for a in $LICENSE_INSTALL; do - ${RM} ${RM_FLAGS} $PREFIX/$LIC_DIR/$PKG/LICENSE + ${RM} ${RM_FLAGS} $PREFIX/$LIC_DIR/$PKG/$a done uninstall_post; Modified: trunk/octave-forge/admin/Windows/mingw32/cblas/build-5.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/cblas/build-5.sh 2010-04-26 13:10:12 UTC (rev 7250) +++ trunk/octave-forge/admin/Windows/mingw32/cblas/build-5.sh 2010-04-26 13:11:12 UTC (rev 7251) @@ -111,12 +111,12 @@ # Uninstall headers for a in $HEADERS_INSTALL; do - ${RM} ${RM_FLAGS} ${INCLUDE_PATH}/$a + ${RM} ${RM_FLAGS} $PREFIX/$INC_DIR/$a done # Uninstall license file for a in $LICENSE_INSTALL; do - ${RM} ${RM_FLAGS} $PREFIX/$LIC_DIR/$PKG/LICENSE + ${RM} ${RM_FLAGS} $PREFIX/$LIC_DIR/$PKG/$a done uninstall_post; Modified: trunk/octave-forge/admin/Windows/mingw32/lapack/build-3.2.1-5.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/lapack/build-3.2.1-5.sh 2010-04-26 13:10:12 UTC (rev 7250) +++ trunk/octave-forge/admin/Windows/mingw32/lapack/build-3.2.1-5.sh 2010-04-26 13:11:12 UTC (rev 7251) @@ -118,7 +118,7 @@ # Uninstall license file for a in $LICENSE_INSTALL; do - ${RM} ${RM_FLAGS} $PREFIX/$LIC_DIR/$PKG/LICENSE + ${RM} ${RM_FLAGS} $PREFIX/$LIC_DIR/$PKG/$a done uninstall_post; Modified: trunk/octave-forge/admin/Windows/mingw32/qrupdate/build-1.1.1-5.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/qrupdate/build-1.1.1-5.sh 2010-04-26 13:10:12 UTC (rev 7250) +++ trunk/octave-forge/admin/Windows/mingw32/qrupdate/build-1.1.1-5.sh 2010-04-26 13:11:12 UTC (rev 7251) @@ -131,7 +131,7 @@ # Uninstall license file for a in $LICENSE_INSTALL; do - ${RM} ${RM_FLAGS} $PREFIX/$LIC_DIR/$PKG/LICENSE + ${RM} ${RM_FLAGS} $PREFIX/$LIC_DIR/$PKG/$a done uninstall_post; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lin...@us...> - 2010-04-26 13:51:16
|
Revision: 7252 http://octave.svn.sourceforge.net/octave/?rev=7252&view=rev Author: lindnerb Date: 2010-04-26 13:51:07 +0000 (Mon, 26 Apr 2010) Log Message: ----------- mingw32: (gcc-4.5.0) add suitesparse Modified Paths: -------------- trunk/octave-forge/admin/Windows/mingw32/gcc45_common.sh Added Paths: ----------- trunk/octave-forge/admin/Windows/mingw32/suitesparse/build-3.2.0-5.sh trunk/octave-forge/admin/Windows/mingw32/suitesparse/suitesparse-3.2.0-5.patch Modified: trunk/octave-forge/admin/Windows/mingw32/gcc45_common.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/gcc45_common.sh 2010-04-26 13:11:12 UTC (rev 7251) +++ trunk/octave-forge/admin/Windows/mingw32/gcc45_common.sh 2010-04-26 13:51:07 UTC (rev 7252) @@ -102,6 +102,8 @@ $MAKE_FILE \ F77="gfortran -shared-libgcc" \ CC="gcc -shared-libgcc" \ + ${LDFLAGS:+LDFLAGS="$LDFLAGS"} \ + ${FLDFLAGS:+FLDFLAGS="$FLDFLAGS"} \ $MAKE_PARALLEL \ $MAKE_XTRA $* @@ -109,6 +111,8 @@ $MAKE_FILE \ F77="gfortran -shared-libgcc" \ CC="gcc -shared-libgcc" \ + ${LDFLAGS:+LDFLAGS="$LDFLAGS"} \ + ${FLDFLAGS:+FLDFLAGS="$FLDFLAGS"} \ $MAKE_PARALLEL \ $MAKE_XTRA $* fi Added: trunk/octave-forge/admin/Windows/mingw32/suitesparse/build-3.2.0-5.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/suitesparse/build-3.2.0-5.sh (rev 0) +++ trunk/octave-forge/admin/Windows/mingw32/suitesparse/build-3.2.0-5.sh 2010-04-26 13:51:07 UTC (rev 7252) @@ -0,0 +1,266 @@ +#! /usr/bin/sh + +# Name of package +PKG=suitesparse +# Version of Package +VER=3.2.0 +# Release of (this patched) package +REL=5 +# Name&Version of Package +PKGVER=${PKG}-${VER} +# Full name of this patched Package +FULLPKG=${PKGVER}-${REL} + +# Name of source file(s) +SRCFILE=${PKGVER}.tar.gz +# Name of Patch file +PATCHFILE=${FULLPKG}.patch + +# URL(s) of source code file(s) +URL="http://www.cise.ufl.edu/research/sparse/SuiteSparse/SuiteSparse-3.2.0.tar.gz" + +# Top dir of this building process (i.e. where the patch file and source file(s) reside) +TOPDIR=`pwd` +# Directory source code is extraced to (relative to TOPDIR) +SRCDIR=${PKGVER} +# Directory original source code is extracted to (for generating diffs) (relative to TOPDIR) +SRCDIR_ORIG=${SRCDIR}-orig + +# Make file to use (optional) +MAKEFILE= +# Any extra flags to pass make to +MAKE_XTRA= + +# Header files to install +HEADERS_INSTALL= +CHOLMOD_INCLUDES="cholmod_core.h cholmod_io64.h cholmod.h cholmod_supernodal.h cholmod_partition.h cholmod_modify.h cholmod_matrixops.h cholmod_internal.h cholmod_config.h cholmod_cholesky.h cholmod_check.h cholmod_blas.h cholmod_complexity.h cholmod_template.h" +UMFPACK_INCLUDES="umfpack.h umfpack_get_lunz.h umfpack_numeric.h umfpack_report_perm.h umfpack_save_symbolic.h umfpack_transpose.h umfpack_col_to_triplet.h umfpack_get_numeric.h umfpack_qsymbolic.h umfpack_report_status.h umfpack_scale.h umfpack_triplet_to_col.h umfpack_defaults.h umfpack_get_symbolic.h umfpack_report_control.h umfpack_report_symbolic.h umfpack_solve.h umfpack_wsolve.h umfpack_free_numeric.h umfpack_global.h umfpack_report_info.h umfpack_report_triplet.h umfpack_symbolic.h umfpack_free_symbolic.h umfpack_load_numeric.h umfpack_report_matrix.h umfpack_report_vector.h umfpack_tictoc.h umfpack_get_determinant.h umfpack_load_symbolic.h umfpack_report_numeric.h umfpack_save_numeric.h umfpack_timer.h" +AMD_INCLUDES="amd.h amd_internal.h" +CAMD_INCLUDES="camd.h camd_internal.h" +COLAMD_INCLUDES="colamd.h" +CCOLAMD_INCLUDES="ccolamd.h" +CXSPARSE_INCLUDES="cs.h" + +# Additional DIFF Flags for generating diff file +DIFF_FLAGS= + +# load common functions +source ../gcc45_common.sh + +# Directory the lib is built in (set this *after* loading gcc44_common.sh) +BUILDDIR=".build_${BUILD_TARGET}_${FULLPKG}_gcc${GCC_VERSION}${GCC_SYSTEM}" + +# == override resp. specify build actions == + +INC_DIR="include/suitesparse" + +unpack() +{ + unpack_add_ver; +} + +unpack_orig() +{ + unpack_orig_add_ver; +} + +mkdirs_post() +{ + mkdir -vp ${BUILDDIR}/AMD/Lib + mkdir -vp ${BUILDDIR}/CAMD/Lib + mkdir -vp ${BUILDDIR}/CCOLAMD/Lib + mkdir -vp ${BUILDDIR}/COLAMD/Lib + mkdir -vp ${BUILDDIR}/CSparse/Lib + mkdir -vp ${BUILDDIR}/CXSparse/Lib + mkdir -vp ${BUILDDIR}/CHOLMOD/Lib + mkdir -vp ${BUILDDIR}/UMFPACK/Lib + mkdir -vp ${BUILDDIR}/UFconfig +} + +conf() +{ + conf_pre; + + substvars ${SRCDIR}/UFconfig/UFconfig.mk ${BUILDDIR}/UFconfig/UFconfig.mk + ${CP} ${CP_FLAGS} ${SRCDIR}/AMD/Lib/GNUmakefile ${BUILDDIR}/AMD/Lib/GNUmakefile + ${CP} ${CP_FLAGS} ${SRCDIR}/CAMD/Lib/GNUmakefile ${BUILDDIR}/CAMD/Lib/GNUmakefile + ${CP} ${CP_FLAGS} ${SRCDIR}/CCOLAMD/Lib/Makefile ${BUILDDIR}/CCOLAMD/Lib/Makefile + ${CP} ${CP_FLAGS} ${SRCDIR}/CHOLMOD/Lib/Makefile ${BUILDDIR}/CHOLMOD/Lib/Makefile + ${CP} ${CP_FLAGS} ${SRCDIR}/COLAMD/Lib/Makefile ${BUILDDIR}/COLAMD/Lib/Makefile + ${CP} ${CP_FLAGS} ${SRCDIR}/CSparse/Lib/Makefile ${BUILDDIR}/CSparse/Lib/Makefile + ${CP} ${CP_FLAGS} ${SRCDIR}/CXSparse/Lib/Makefile ${BUILDDIR}/CXSparse/Lib/Makefile + ${CP} ${CP_FLAGS} ${SRCDIR}/UMFPACK/Lib/GNUmakefile ${BUILDDIR}/UMFPACK/Lib/GNUmakefile + + conf_post; +} + +build() +{ + build_pre; + ( cd ${BUILDDIR}/AMD/Lib && make_common -f GNUmakefile ); + ( cd ${BUILDDIR}/CAMD/Lib && make_common -f GNUmakefile ); + ( cd ${BUILDDIR}/CCOLAMD/Lib && make_common ); + ( cd ${BUILDDIR}/COLAMD/Lib && make_common ); + ( cd ${BUILDDIR}/CSparse/Lib && make_common ); + ( cd ${BUILDDIR}/CXSparse/Lib && make_common ); + ( cd ${BUILDDIR}/CHOLMOD/Lib && make_common ); + ( cd ${BUILDDIR}/UMFPACK/Lib && make_common -f GNUmakefile ); + build_post; +} + +clean() +{ + clean_pre; + ( cd ${BUILDDIR}/AMD/Lib && make -f GNUmakefile clean ); + ( cd ${BUILDDIR}/CAMD/Lib && make -f GNUmakefile clean ); + ( cd ${BUILDDIR}/CCOLAMD/Lib && make clean ); + ( cd ${BUILDDIR}/COLAMD/Lib && make clean ); + ( cd ${BUILDDIR}/CSparse/Lib && make clean ); + ( cd ${BUILDDIR}/CXSparse/Lib && make clean ); + ( cd ${BUILDDIR}/CHOLMOD/Lib && make clean ); + ( cd ${BUILDDIR}/UMFPACK/Lib && make -f GNUmakefile clean ); + clean_post +} + +install_lib_core() +{ + ${CP} ${CP_FLAGS} ${BUILDDIR}/$1/lib/$1.dll $PREFIX/$BIN_DIR + ${CP} ${CP_FLAGS} ${BUILDDIR}/$1/lib/lib$1.dll.a $PREFIX/$LIB_DIR + ${CP} ${CP_FLAGS} ${BUILDDIR}/$1/lib/lib$1.a $PREFIX/$STATICLIB_DIR +} + +uninstall_lib_core() +{ + ${RM} ${RM_FLAGS} $PREFIX/$BIN_DIR/$1.dll + ${RM} ${RM_FLAGS} $PREFIX/$LIB_DIR/lib$1.dll.a + ${RM} ${RM_FLAGS} $PREFIX/$STATICLIB_DIR/lib$1.a +} + +install_header_core() +{ + for a in $2; do + ${CP} ${CP_FLAGS} ${SRCDIR}/$1/Include/$a $PREFIX/$INC_DIR + done +} + +uninstall_header_core() +{ + for a in $2; do + ${RM} ${RM_FLAGS} $PREFIX/$INC_DIR/$a + done +} + +install() +{ + install_pre; + + # Install the libs + install_lib_core amd + install_lib_core camd + install_lib_core ccolamd + install_lib_core colamd + install_lib_core csparse + install_lib_core cxsparse + install_lib_core cholmod + install_lib_core umfpack + + # Install the headers + install_header_core UMFPACK "${UMFPACK_INCLUDES}" + install_header_core CHOLMOD "${CHOLMOD_INCLUDES}" + install_header_core AMD "${AMD_INCLUDES}" + install_header_core CAMD "${CAMD_INCLUDES}" + install_header_core COLAMD "${COLAMD_INCLUDES}" + install_header_core CCOLAMD "${CCOLAMD_INCLUDES}" + install_header_core CXSPARSE "${CXSPARSE_INCLUDES}" + ${CP} ${CP_FLAGS} ${SRCDIR}/UFconfig/UFconfig.h $PREFIX/$INC_DIR + + # Install license file + ${CP} ${CP_FLAGS} ${SRCDIR}/AMD/doc/lesser.txt $PREFIX/$LIC_DIR/$PKG/LGPL.txt + ${CP} ${CP_FLAGS} ${SRCDIR}/AMD/doc/License $PREFIX/$LIC_DIR/$PKG/LICENSE.AMD + ${CP} ${CP_FLAGS} ${SRCDIR}/CAMD/doc/License $PREFIX/$LIC_DIR/$PKG/LICENSE.CAMD + ${CP} ${CP_FLAGS} ${SRCDIR}/CCOLAMD/Readme.txt $PREFIX/$LIC_DIR/$PKG/Readme.CCOLAMD + ${CP} ${CP_FLAGS} ${SRCDIR}/CHOLMOD/Check/License.txt $PREFIX/$LIC_DIR/$PKG/LICENSE.CHOLMOD.Check + ${CP} ${CP_FLAGS} ${SRCDIR}/CHOLMOD/Cholesky/License.txt $PREFIX/$LIC_DIR/$PKG/LICENSE.CHOLMOD.Cholesky + ${CP} ${CP_FLAGS} ${SRCDIR}/CHOLMOD/Core/License.txt $PREFIX/$LIC_DIR/$PKG/LICENSE.CHOLMOD.Core + ${CP} ${CP_FLAGS} ${SRCDIR}/CHOLMOD/Demo/License.txt $PREFIX/$LIC_DIR/$PKG/LICENSE.CHOLMOD.Demo + ${CP} ${CP_FLAGS} ${SRCDIR}/CHOLMOD/MatrixOps/License.txt $PREFIX/$LIC_DIR/$PKG/LICENSE.CHOLMOD.MatrixOps + ${CP} ${CP_FLAGS} ${SRCDIR}/CHOLMOD/Modify/License.txt $PREFIX/$LIC_DIR/$PKG/LICENSE.CHOLMOD.Modify + ${CP} ${CP_FLAGS} ${SRCDIR}/CHOLMOD/Partition/License.txt $PREFIX/$LIC_DIR/$PKG/LICENSE.CHOLMOD.Partition + ${CP} ${CP_FLAGS} ${SRCDIR}/CHOLMOD/Supernodal/License.txt $PREFIX/$LIC_DIR/$PKG/LICENSE.CHOLMOD.Supernodal + ${CP} ${CP_FLAGS} ${SRCDIR}/CHOLMOD/Tcov/License.txt $PREFIX/$LIC_DIR/$PKG/LICENSE.CHOLMOD.Tcov + ${CP} ${CP_FLAGS} ${SRCDIR}/CHOLMOD/Valgrind/License.txt $PREFIX/$LIC_DIR/$PKG/LICENSE.CHOLMOD.Valgrind + ${CP} ${CP_FLAGS} ${SRCDIR}/COLAMD/Readme.txt $PREFIX/$LIC_DIR/$PKG/Readme.COLAMD + ${CP} ${CP_FLAGS} ${SRCDIR}/CSparse/doc/License.txt $PREFIX/$LIC_DIR/$PKG/LICENSE.CSparse + ${CP} ${CP_FLAGS} ${SRCDIR}/CXSparse/doc/License.txt $PREFIX/$LIC_DIR/$PKG/LICENSE.CXSparse + ${CP} ${CP_FLAGS} ${SRCDIR}/UMFPACK/doc/License $PREFIX/$LIC_DIR/$PKG/LICENSE.UMFPACK + + install_post; +} + +install_strip() +{ + install; + for a in umfpack cholmod amd camd colamd ccolamd cxsparse; do + $STRIP $STRIP_FLAGS $PREFIX/$BIN_DIR/$a.dll + done +} + + +uninstall() +{ + uninstall_pre; + + # Install the libs + uninstall_lib_core amd + uninstall_lib_core camd + uninstall_lib_core ccolamd + uninstall_lib_core colamd + uninstall_lib_core csparse + uninstall_lib_core cxsparse + uninstall_lib_core cholmod + uninstall_lib_core umfpack + + # Install the headers + uninstall_header_core UMFPACK "${UMFPACK_INCLUDES}" + uninstall_header_core CHOLMOD "${CHOLMOD_INCLUDES}" + uninstall_header_core AMD "${AMD_INCLUDES}" + uninstall_header_core CAMD "${CAMD_INCLUDES}" + uninstall_header_core COLAMD "${COLAMD_INCLUDES}" + uninstall_header_core CCOLAMD "${CCOLAMD_INCLUDES}" + uninstall_header_core CXSPARSE "${CXSPARSE_INCLUDES}" + ${RM} ${RM_FLAGS} $PREFIX/$INC_DIR/UFconfig.h + + # Uninstall license file(s) + ${RM} ${RM_FLAGS} $PREFIX/$LIC_DIR/$PKG/LGPL.txt + ${RM} ${RM_FLAGS} $PREFIX/$LIC_DIR/$PKG/LICENSE.AMD + ${RM} ${RM_FLAGS} $PREFIX/$LIC_DIR/$PKG/LICENSE.CAMD + ${RM} ${RM_FLAGS} $PREFIX/$LIC_DIR/$PKG/Readme.CCOLAMD + ${RM} ${RM_FLAGS} $PREFIX/$LIC_DIR/$PKG/LICENSE.CHOLMOD.Check + ${RM} ${RM_FLAGS} $PREFIX/$LIC_DIR/$PKG/LICENSE.CHOLMOD.Cholesky + ${RM} ${RM_FLAGS} $PREFIX/$LIC_DIR/$PKG/LICENSE.CHOLMOD.Core + ${RM} ${RM_FLAGS} $PREFIX/$LIC_DIR/$PKG/LICENSE.CHOLMOD.Demo + ${RM} ${RM_FLAGS} $PREFIX/$LIC_DIR/$PKG/LICENSE.CHOLMOD.MatrixOps + ${RM} ${RM_FLAGS} $PREFIX/$LIC_DIR/$PKG/LICENSE.CHOLMOD.Modify + ${RM} ${RM_FLAGS} $PREFIX/$LIC_DIR/$PKG/LICENSE.CHOLMOD.Partition + ${RM} ${RM_FLAGS} $PREFIX/$LIC_DIR/$PKG/LICENSE.CHOLMOD.Supernodal + ${RM} ${RM_FLAGS} $PREFIX/$LIC_DIR/$PKG/LICENSE.CHOLMOD.Tcov + ${RM} ${RM_FLAGS} $PREFIX/$LIC_DIR/$PKG/LICENSE.CHOLMOD.Valgrind + ${RM} ${RM_FLAGS} $PREFIX/$LIC_DIR/$PKG/Readme.COLAMD + ${RM} ${RM_FLAGS} $PREFIX/$LIC_DIR/$PKG/LICENSE.CSparse + ${RM} ${RM_FLAGS} $PREFIX/$LIC_DIR/$PKG/LICENSE.CXSparse + ${RM} ${RM_FLAGS} $PREFIX/$LIC_DIR/$PKG/LICENSE.UMFPACK + + uninstall_post; +} + +all() { + download + unpack + applypatch + mkdirs + conf + build + install +} + +main $* Property changes on: trunk/octave-forge/admin/Windows/mingw32/suitesparse/build-3.2.0-5.sh ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Author Rev Date URL Added: svn:eol-style + LF Added: trunk/octave-forge/admin/Windows/mingw32/suitesparse/suitesparse-3.2.0-5.patch =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/suitesparse/suitesparse-3.2.0-5.patch (rev 0) +++ trunk/octave-forge/admin/Windows/mingw32/suitesparse/suitesparse-3.2.0-5.patch 2010-04-26 13:51:07 UTC (rev 7252) @@ -0,0 +1,1358 @@ +diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg -x '*.orig' -x '*.rej' suitesparse-3.2.0-orig/AMD/Lib/GNUmakefile suitesparse-3.2.0/AMD/Lib/GNUmakefile +--- suitesparse-3.2.0-orig/AMD/Lib/GNUmakefile 2007-05-06 12:32:19 +0000 ++++ suitesparse-3.2.0/AMD/Lib/GNUmakefile 2010-04-26 13:27:17 +0000 +@@ -2,11 +2,15 @@ + # AMD Makefile for compiling on Unix systems (for GNU make only) + #------------------------------------------------------------------------------- + +-default: ../Lib/libamd.a ++default: ../Lib/libamd.a ../Lib/amd.dll + + include ../../UFconfig/UFconfig.mk + +-C = $(CC) $(CFLAGS) $(CONFIG) -I../Include -I../../UFconfig ++SRCDIR = $(SRCTOP)/AMD ++ ++vpath %.c $(SRCDIR)/Source ++ ++C = $(CC) $(CFLAGS) $(CONFIG) -I$(SRCDIR)/Include -I$(SRCDIR)/../UFconfig + + #------------------------------------------------------------------------------- + # source files +@@ -15,9 +19,9 @@ + AMD = amd_aat amd_1 amd_2 amd_dump amd_postorder amd_post_tree amd_defaults \ + amd_order amd_control amd_info amd_valid amd_preprocess + +-UFCONFIG = ../../UFconfig/UFconfig.h ++UFCONFIG = $(SRCDIR)/../UFconfig/UFconfig.h + +-INC = ../Include/amd.h ../Include/amd_internal.h $(UFCONFIG) ++INC = $(SRCDIR)/Include/amd.h $(SRCDIR)/Include/amd_internal.h $(UFCONFIG) + + #------------------------------------------------------------------------------- + # object files for each version +@@ -30,13 +34,13 @@ + # compile each int and long routine (with no real/complex version) + #------------------------------------------------------------------------------- + +-amd_global.o: ../Source/amd_global.c $(INC) ++amd_global.o: $(SRCDIR)/Source/amd_global.c $(INC) + $(C) -c $< -o $@ + +-amd_i_%.o: ../Source/amd_%.c $(INC) ++amd_i_%.o: $(SRCDIR)/Source/amd_%.c $(INC) + $(C) -DDINT -c $< -o $@ + +-amd_l_%.o: ../Source/amd_%.c $(INC) ++amd_l_%.o: $(SRCDIR)/Source/amd_%.c $(INC) + $(C) -DDLONG -c $< -o $@ + + #------------------------------------------------------------------------------- +@@ -44,9 +48,16 @@ + #------------------------------------------------------------------------------- + + ../Lib/libamd.a: amd_global.o $(AMDI) $(AMDL) +- $(AR) ../Lib/libamd.a $^ ++ $(AR) $(ARFLAGS) ../Lib/libamd.a $^ + - $(RANLIB) ../Lib/libamd.a + ++../Lib/amd.dll : ../Lib/libamd.a ++ $(CC) -shared $(LDFLAGS) -o $@ \ ++ -Wl,--whole-archive $< \ ++ -Wl,--out-implib,$(basename $<).dll.a \ ++ -Wl,--output-def=$@.exp \ ++ -Wl,--no-whole-archive ++ + #------------------------------------------------------------------------------- + # compile the Fortran versions and the libamdf77.a library + #------------------------------------------------------------------------------- +@@ -55,14 +66,14 @@ + + AMDF77 = amd.o amdbar.o + +-amd.o: ../Source/amd.f +- $(F77) $(F77FLAGS) -c ../Source/amd.f -o amd.o ++amd.o: $(SRCDIR)/Source/amd.f ++ $(F77) $(F77FLAGS) -c $< -o amd.o + +-amdbar.o: ../Source/amdbar.f +- $(F77) $(F77FLAGS) -c ../Source/amdbar.f -o amdbar.o ++amdbar.o: $(SRCDIR)/Source/amdbar.f ++ $(F77) $(F77FLAGS) -c $< -o amdbar.o + + ../Lib/libamdf77.a: $(AMDF77) +- $(AR) ../Lib/libamdf77.a $^ ++ $(AR) $(ARFLAGS) ../Lib/libamdf77.a $^ + - $(RANLIB) ../Lib/libamdf77.a + + #------------------------------------------------------------------------------- +@@ -75,4 +86,4 @@ + purge: distclean + + distclean: clean +- - $(RM) ../Lib/libamd.a ../Lib/libamdf77.a ++ - $(RM) ../Lib/libamd.a ../Lib/libamdf77.a ../Lib/amd.dll ../Lib/libamd.dll.a +diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg -x '*.orig' -x '*.rej' suitesparse-3.2.0-orig/AMD/Lib/libamd.def suitesparse-3.2.0/AMD/Lib/libamd.def +--- suitesparse-3.2.0-orig/AMD/Lib/libamd.def 2006-04-25 19:04:59 +0000 ++++ suitesparse-3.2.0/AMD/Lib/libamd.def 2010-04-26 13:27:17 +0000 +@@ -1,12 +1,24 @@ +-LIBRARY libamd.dll + EXPORTS ++amd_aat + amd_order + amd_defaults + amd_control + amd_info ++amd_postorder ++amd_valid ++amd_1 + amd_2 ++amd_l_aat + amd_l_order + amd_l_defaults + amd_l_control + amd_l_info ++amd_l_postorder ++amd_l_valid ++amd_l1 + amd_l2 ++amd_malloc ++amd_free ++amd_calloc ++amd_realloc ++amd_printf +diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg -x '*.orig' -x '*.rej' suitesparse-3.2.0-orig/CAMD/Lib/GNUmakefile suitesparse-3.2.0/CAMD/Lib/GNUmakefile +--- suitesparse-3.2.0-orig/CAMD/Lib/GNUmakefile 2007-05-05 14:29:25 +0000 ++++ suitesparse-3.2.0/CAMD/Lib/GNUmakefile 2010-04-26 13:27:17 +0000 +@@ -2,11 +2,15 @@ + # CAMD Makefile for compiling on Unix systems (for GNU make only) + #------------------------------------------------------------------------------- + +-default: libcamd.a ++default: libcamd.a camd.dll + + include ../../UFconfig/UFconfig.mk + +-C = $(CC) $(CFLAGS) $(CONFIG) -I../Include -I../../UFconfig ++SRCDIR = $(SRCTOP)/CAMD ++ ++vpath %.c $(SRCDIR)/Source ++ ++C = $(CC) $(CFLAGS) $(CONFIG) -I$(SRCDIR)/Include -I$(SRCDIR)/../UFconfig + + #------------------------------------------------------------------------------- + # source files +@@ -15,9 +19,9 @@ + CAMD = camd_aat camd_1 camd_2 camd_dump camd_postorder camd_defaults \ + camd_order camd_control camd_info camd_valid camd_preprocess + +-UFCONFIG = ../../UFconfig/UFconfig.h ++UFCONFIG = $(SRCDIR)/../UFconfig/UFconfig.h + +-INC = ../Include/camd.h ../Include/camd_internal.h $(UFCONFIG) ++INC = $(SRCDIR)/Include/camd.h $(SRCDIR)/Include/camd_internal.h $(UFCONFIG) + + #------------------------------------------------------------------------------- + # object files for each version +@@ -30,13 +34,13 @@ + # compile each int and long routine (with no real/complex version) + #------------------------------------------------------------------------------- + +-camd_global.o: ../Source/camd_global.c $(INC) ++camd_global.o: $(SRCDIR)/Source/camd_global.c $(INC) + $(C) -c $< -o $@ + +-camd_i_%.o: ../Source/camd_%.c $(INC) ++camd_i_%.o: $(SRCDIR)/Source/camd_%.c $(INC) + $(C) -DDINT -c $< -o $@ + +-camd_l_%.o: ../Source/camd_%.c $(INC) ++camd_l_%.o: $(SRCDIR)/Source/camd_%.c $(INC) + $(C) -DDLONG -c $< -o $@ + + #------------------------------------------------------------------------------- +@@ -44,9 +48,16 @@ + #------------------------------------------------------------------------------- + + libcamd.a: camd_global.o $(CAMDI) $(CAMDL) +- $(AR) libcamd.a $^ ++ $(AR) $(ARFLAGS) libcamd.a $^ + - $(RANLIB) libcamd.a + ++camd.dll : libcamd.a ++ $(CC) -shared $(LDFLAGS) -o $@ \ ++ -Wl,--whole-archive $< \ ++ -Wl,--out-implib,$(basename $<).dll.a \ ++ -Wl,--output-def=$@.exp \ ++ -Wl,--no-whole-archive ++ + #------------------------------------------------------------------------------- + # Remove all but the files in the original distribution + #------------------------------------------------------------------------------- +@@ -57,4 +68,4 @@ + purge: distclean + + distclean: clean +- - $(RM) libcamd.a ++ - $(RM) libcamd.a camd.dll libcamd.dll.a +diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg -x '*.orig' -x '*.rej' suitesparse-3.2.0-orig/CAMD/Lib/libcamd.def suitesparse-3.2.0/CAMD/Lib/libcamd.def +--- suitesparse-3.2.0-orig/CAMD/Lib/libcamd.def 2006-04-25 19:04:52 +0000 ++++ suitesparse-3.2.0/CAMD/Lib/libcamd.def 2010-04-26 13:27:17 +0000 +@@ -1,12 +1,23 @@ +-LIBRARY libcamd.dll + EXPORTS ++camd_aat + camd_order + camd_defaults + camd_control + camd_info ++camd_postorder ++camd_valid ++camd_1 + camd_2 + camd_l_order + camd_l_defaults + camd_l_control + camd_l_info ++camd_l_postorder ++camd_l_valid ++camd_l1 + camd_l2 ++camd_malloc ++camd_free ++camd_calloc ++camd_realloc ++camd_printf +diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg -x '*.orig' -x '*.rej' suitesparse-3.2.0-orig/CCOLAMD/Lib/Makefile suitesparse-3.2.0/CCOLAMD/Lib/Makefile +--- suitesparse-3.2.0-orig/CCOLAMD/Lib/Makefile 2007-05-05 13:59:13 +0000 ++++ suitesparse-3.2.0/CCOLAMD/Lib/Makefile 2010-04-26 13:27:17 +0000 +@@ -2,22 +2,33 @@ + # CCOLAMD Makefile + #------------------------------------------------------------------------------- + +-default: libccolamd.a ++default: libccolamd.a ccolamd.dll + + include ../../UFconfig/UFconfig.mk + +-I = -I../Include -I../../UFconfig ++SRCDIR = $(SRCTOP)/CCOLAMD + +-INC = ../Include/ccolamd.h ../../UFconfig/UFconfig.h ++vpath %.c $(SRCDIR)/Source + +-SRC = ../Source/ccolamd.c ../Source/ccolamd_global.c ++I = -I$(SRCDIR)/Include -I$(SRCDIR)/../UFconfig ++ ++INC = $(SRCDIR)/Include/ccolamd.h $(SRCDIR)/../UFconfig/UFconfig.h ++ ++SRC = $(SRCDIR)/Source/ccolamd.c $(SRCDIR)/Source/ccolamd_global.c + + # creates libccolamd.a, a C-callable COLAMD library + libccolamd.a: $(SRC) $(INC) +- $(CC) $(CFLAGS) $(I) -c ../Source/ccolamd_global.c +- $(CC) $(CFLAGS) $(I) -c ../Source/ccolamd.c +- $(CC) $(CFLAGS) $(I) -c ../Source/ccolamd.c -DDLONG -o ccolamd_l.o +- $(AR) libccolamd.a ccolamd.o ccolamd_l.o ccolamd_global.o ++ $(CC) $(CFLAGS) $(I) -c $(SRCDIR)/Source/ccolamd_global.c ++ $(CC) $(CFLAGS) $(I) -c $(SRCDIR)/Source/ccolamd.c ++ $(CC) $(CFLAGS) $(I) -c $(SRCDIR)/Source/ccolamd.c -DDLONG -o ccolamd_l.o ++ $(AR) $(ARFLAGS) libccolamd.a ccolamd.o ccolamd_l.o ccolamd_global.o ++ ++ccolamd.dll : libccolamd.a ++ $(CC) -shared $(LDFLAGS) -o $@ \ ++ -Wl,--whole-archive $< \ ++ -Wl,--out-implib,$(basename $<).dll.a \ ++ -Wl,--output-def=$@.exp \ ++ -Wl,--no-whole-archive + + ccode: libccolamd.a + +@@ -29,4 +40,4 @@ + purge: distclean + + distclean: clean +- - $(RM) libccolamd.a ++ - $(RM) libccolamd.a ccolamd.dll libccolamd.dll.a +diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg -x '*.orig' -x '*.rej' suitesparse-3.2.0-orig/CHOLMOD/Lib/Makefile suitesparse-3.2.0/CHOLMOD/Lib/Makefile +--- suitesparse-3.2.0-orig/CHOLMOD/Lib/Makefile 2007-05-05 14:36:56 +0000 ++++ suitesparse-3.2.0/CHOLMOD/Lib/Makefile 2010-04-26 13:27:17 +0000 +@@ -4,20 +4,24 @@ + + default: all + ++SRCDIR = $(SRCTOP)/CHOLMOD ++ ++vpath %.c $(SRCDIR)/Source ++ + ccode: all + + include ../../UFconfig/UFconfig.mk + + C = $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) + +-all: libcholmod.a ++all: libcholmod.a cholmod.dll + + library: libcholmod.a + + purge: distclean + + distclean: clean +- - $(RM) libcholmod.a ++ - $(RM) libcholmod.a cholmod.dll libcholmod.dll.a + + clean: + - $(RM) $(CLEAN) +@@ -26,19 +30,19 @@ + # ../Include/ directory contains all include files: + #------------------------------------------------------------------------------- + +-INC = ../Include/cholmod.h \ +- ../Include/cholmod_blas.h \ +- ../Include/cholmod_check.h \ +- ../Include/cholmod_cholesky.h \ +- ../Include/cholmod_complexity.h \ +- ../Include/cholmod_config.h \ +- ../Include/cholmod_core.h \ +- ../Include/cholmod_internal.h \ +- ../Include/cholmod_matrixops.h \ +- ../Include/cholmod_modify.h \ +- ../Include/cholmod_partition.h \ +- ../Include/cholmod_supernodal.h \ +- ../Include/cholmod_template.h ++INC = $(SRCDIR)/Include/cholmod.h \ ++ $(SRCDIR)/Include/cholmod_blas.h \ ++ $(SRCDIR)/Include/cholmod_check.h \ ++ $(SRCDIR)/Include/cholmod_cholesky.h \ ++ $(SRCDIR)/Include/cholmod_complexity.h \ ++ $(SRCDIR)/Include/cholmod_config.h \ ++ $(SRCDIR)/Include/cholmod_core.h \ ++ $(SRCDIR)/Include/cholmod_internal.h \ ++ $(SRCDIR)/Include/cholmod_matrixops.h \ ++ $(SRCDIR)/Include/cholmod_modify.h \ ++ $(SRCDIR)/Include/cholmod_partition.h \ ++ $(SRCDIR)/Include/cholmod_supernodal.h \ ++ $(SRCDIR)/Include/cholmod_template.h + + #------------------------------------------------------------------------------- + # The 7 CHOLMOD library modules (int, double) +@@ -110,37 +114,45 @@ + OBJ = $(DI) $(DL) + + libcholmod.a: $(OBJ) +- $(AR) libcholmod.a $(OBJ) ++ $(AR) $(ARFLAGS) libcholmod.a $(OBJ) + $(RANLIB) libcholmod.a + ++cholmod.dll : libcholmod.a ++ $(CC) -shared $(LDFLAGS) -o $@ \ ++ -L../../AMD/Lib -L../../COLAMD/Lib \ ++ -Wl,--whole-archive $< \ ++ -Wl,--out-implib,$(basename $<).dll.a \ ++ -Wl,--output-def=$@.exp \ ++ -Wl,--no-whole-archive -lamd -lcolamd $(LAPACK) $(BLAS) ++ + $(OBJ): $(INC) + +-I = -I../../AMD/Include -I../../AMD/Source -I../../COLAMD/Include \ +- -I$(METIS_PATH)/Lib -I../../CCOLAMD/Include -I../../CAMD/Include \ +- -I../Include -I../../UFconfig ++I = -I$(SRCDIR)/../AMD/Include -I$(SRCDIR)/../AMD/Source -I$(SRCDIR)/../COLAMD/Include \ ++ -I$(METIS_PATH)/Lib -I$(SRCDIR)/../CCOLAMD/Include -I$(SRCDIR)/../CAMD/Include \ ++ -I$(SRCDIR)/Include -I$(SRCDIR)/../UFconfig + + #------------------------------------------------------------------------------- + # Check Module: + #------------------------------------------------------------------------------- + +-cholmod_check.o: ../Check/cholmod_check.c ++cholmod_check.o: $(SRCDIR)/Check/cholmod_check.c + $(C) -c $(I) $< + +-cholmod_read.o: ../Check/cholmod_read.c ++cholmod_read.o: $(SRCDIR)/Check/cholmod_read.c + $(C) -c $(I) $< + +-cholmod_write.o: ../Check/cholmod_write.c ++cholmod_write.o: $(SRCDIR)/Check/cholmod_write.c + $(C) -c $(I) $< + + #------------------------------------------------------------------------------- + +-cholmod_l_check.o: ../Check/cholmod_check.c ++cholmod_l_check.o: $(SRCDIR)/Check/cholmod_check.c + $(C) -DDLONG -c $(I) $< -o $@ + +-cholmod_l_read.o: ../Check/cholmod_read.c ++cholmod_l_read.o: $(SRCDIR)/Check/cholmod_read.c + $(C) -DDLONG -c $(I) $< -o $@ + +-cholmod_l_write.o: ../Check/cholmod_write.c ++cholmod_l_write.o: $(SRCDIR)/Check/cholmod_write.c + $(C) -DDLONG -c $(I) $< -o $@ + + +@@ -148,92 +160,92 @@ + # Core Module: + #------------------------------------------------------------------------------- + +-cholmod_common.o: ../Core/cholmod_common.c ++cholmod_common.o: $(SRCDIR)/Core/cholmod_common.c + $(C) -c $(I) $< + +-cholmod_dense.o: ../Core/cholmod_dense.c ../Core/t_cholmod_dense.c ++cholmod_dense.o: $(SRCDIR)/Core/cholmod_dense.c $(SRCDIR)/Core/t_cholmod_dense.c + $(C) -c $(I) $< + +-cholmod_factor.o: ../Core/cholmod_factor.c ++cholmod_factor.o: $(SRCDIR)/Core/cholmod_factor.c + $(C) -c $(I) $< + +-cholmod_change_factor.o: ../Core/cholmod_change_factor.c \ +- ../Core/t_cholmod_change_factor.c ++cholmod_change_factor.o: $(SRCDIR)/Core/cholmod_change_factor.c \ ++ $(SRCDIR)/Core/t_cholmod_change_factor.c + $(C) -c $(I) $< + +-cholmod_memory.o: ../Core/cholmod_memory.c ++cholmod_memory.o: $(SRCDIR)/Core/cholmod_memory.c + $(C) -c $(I) $< + +-cholmod_sparse.o: ../Core/cholmod_sparse.c ++cholmod_sparse.o: $(SRCDIR)/Core/cholmod_sparse.c + $(C) -c $(I) $< + +-cholmod_complex.o: ../Core/cholmod_complex.c ++cholmod_complex.o: $(SRCDIR)/Core/cholmod_complex.c + $(C) -c $(I) $< + +-cholmod_transpose.o: ../Core/cholmod_transpose.c ../Core/t_cholmod_transpose.c ++cholmod_transpose.o: $(SRCDIR)/Core/cholmod_transpose.c $(SRCDIR)/Core/t_cholmod_transpose.c + $(C) -c $(I) $< + +-cholmod_band.o: ../Core/cholmod_band.c ++cholmod_band.o: $(SRCDIR)/Core/cholmod_band.c + $(C) -c $(I) $< + +-cholmod_copy.o: ../Core/cholmod_copy.c ++cholmod_copy.o: $(SRCDIR)/Core/cholmod_copy.c + $(C) -c $(I) $< + +-cholmod_triplet.o: ../Core/cholmod_triplet.c ../Core/t_cholmod_triplet.c ++cholmod_triplet.o: $(SRCDIR)/Core/cholmod_triplet.c $(SRCDIR)/Core/t_cholmod_triplet.c + $(C) -c $(I) $< + +-cholmod_error.o: ../Core/cholmod_error.c ++cholmod_error.o: $(SRCDIR)/Core/cholmod_error.c + $(C) -c $(I) $< + +-cholmod_aat.o: ../Core/cholmod_aat.c ++cholmod_aat.o: $(SRCDIR)/Core/cholmod_aat.c + $(C) -c $(I) $< + +-cholmod_add.o: ../Core/cholmod_add.c ++cholmod_add.o: $(SRCDIR)/Core/cholmod_add.c + $(C) -c $(I) $< + + #------------------------------------------------------------------------------- + +-cholmod_l_common.o: ../Core/cholmod_common.c ++cholmod_l_common.o: $(SRCDIR)/Core/cholmod_common.c + $(C) -DDLONG -c $(I) $< -o $@ + +-cholmod_l_dense.o: ../Core/cholmod_dense.c ../Core/t_cholmod_dense.c ++cholmod_l_dense.o: $(SRCDIR)/Core/cholmod_dense.c $(SRCDIR)/Core/t_cholmod_dense.c + $(C) -DDLONG -c $(I) $< -o $@ + +-cholmod_l_factor.o: ../Core/cholmod_factor.c ++cholmod_l_factor.o: $(SRCDIR)./Core/cholmod_factor.c + $(C) -DDLONG -c $(I) $< -o $@ + +-cholmod_l_change_factor.o: ../Core/cholmod_change_factor.c \ +- ../Core/t_cholmod_change_factor.c ++cholmod_l_change_factor.o: $(SRCDIR)/Core/cholmod_change_factor.c \ ++ $(SRCDIR)/Core/t_cholmod_change_factor.c + $(C) -DDLONG -c $(I) $< -o $@ + +-cholmod_l_memory.o: ../Core/cholmod_memory.c ++cholmod_l_memory.o: $(SRCDIR)/Core/cholmod_memory.c + $(C) -DDLONG -c $(I) $< -o $@ + +-cholmod_l_sparse.o: ../Core/cholmod_sparse.c ++cholmod_l_sparse.o: $(SRCDIR)/Core/cholmod_sparse.c + $(C) -DDLONG -c $(I) $< -o $@ + +-cholmod_l_complex.o: ../Core/cholmod_complex.c ++cholmod_l_complex.o: $(SRCDIR)/Core/cholmod_complex.c + $(C) -DDLONG -c $(I) $< -o $@ + +-cholmod_l_transpose.o: ../Core/cholmod_transpose.c ../Core/t_cholmod_transpose.c ++cholmod_l_transpose.o: $(SRCDIR)/Core/cholmod_transpose.c $(SRCDIR)/Core/t_cholmod_transpose.c + $(C) -DDLONG -c $(I) $< -o $@ + +-cholmod_l_band.o: ../Core/cholmod_band.c ++cholmod_l_band.o: $(SRCDIR)/Core/cholmod_band.c + $(C) -DDLONG -c $(I) $< -o $@ + +-cholmod_l_copy.o: ../Core/cholmod_copy.c ++cholmod_l_copy.o: $(SRCDIR)/Core/cholmod_copy.c + $(C) -DDLONG -c $(I) $< -o $@ + +-cholmod_l_triplet.o: ../Core/cholmod_triplet.c ../Core/t_cholmod_triplet.c ++cholmod_l_triplet.o: $(SRCDIR)/Core/cholmod_triplet.c $(SRCDIR)/Core/t_cholmod_triplet.c + $(C) -DDLONG -c $(I) $< -o $@ + +-cholmod_l_error.o: ../Core/cholmod_error.c ++cholmod_l_error.o: $(SRCDIR)./Core/cholmod_error.c + $(C) -DDLONG -c $(I) $< -o $@ + +-cholmod_l_aat.o: ../Core/cholmod_aat.c ++cholmod_l_aat.o: $(SRCDIR)/Core/cholmod_aat.c + $(C) -DDLONG -c $(I) $< -o $@ + +-cholmod_l_add.o: ../Core/cholmod_add.c ++cholmod_l_add.o: $(SRCDIR)/Core/cholmod_add.c + $(C) -DDLONG -c $(I) $< -o $@ + + +@@ -241,116 +253,116 @@ + # Cholesky Module: + #------------------------------------------------------------------------------- + +-cholmod_amd.o: ../Cholesky/cholmod_amd.c ++cholmod_amd.o: $(SRCDIR)/Cholesky/cholmod_amd.c + $(C) -c $(I) $< + +-cholmod_analyze.o: ../Cholesky/cholmod_analyze.c ++cholmod_analyze.o: $(SRCDIR)/Cholesky/cholmod_analyze.c + $(C) -c $(I) $< + +-cholmod_colamd.o: ../Cholesky/cholmod_colamd.c ++cholmod_colamd.o: $(SRCDIR)/Cholesky/cholmod_colamd.c + $(C) -c $(I) $< + +-cholmod_etree.o: ../Cholesky/cholmod_etree.c ++cholmod_etree.o: $(SRCDIR)/Cholesky/cholmod_etree.c + $(C) -c $(I) $< + +-cholmod_factorize.o: ../Cholesky/cholmod_factorize.c ++cholmod_factorize.o: $(SRCDIR)/Cholesky/cholmod_factorize.c + $(C) -c $(I) $< + +-cholmod_postorder.o: ../Cholesky/cholmod_postorder.c ++cholmod_postorder.o: $(SRCDIR)./Cholesky/cholmod_postorder.c + $(C) -c $(I) $< + +-cholmod_rcond.o: ../Cholesky/cholmod_rcond.c ++cholmod_rcond.o: $(SRCDIR)/Cholesky/cholmod_rcond.c + $(C) -c $(I) $< + +-cholmod_resymbol.o: ../Cholesky/cholmod_resymbol.c ++cholmod_resymbol.o: $(SRCDIR)/Cholesky/cholmod_resymbol.c + $(C) -c $(I) $< + +-cholmod_rowcolcounts.o: ../Cholesky/cholmod_rowcolcounts.c ++cholmod_rowcolcounts.o: $(SRCDIR)/Cholesky/cholmod_rowcolcounts.c + $(C) -c $(I) $< + +-cholmod_solve.o: ../Cholesky/cholmod_solve.c ../Cholesky/t_cholmod_lsolve.c \ +- ../Cholesky/t_cholmod_ltsolve.c ../Cholesky/t_cholmod_solve.c ++cholmod_solve.o: $(SRCDIR)/Cholesky/cholmod_solve.c $(SRCDIR)/Cholesky/t_cholmod_lsolve.c \ ++ $(SRCDIR)/Cholesky/t_cholmod_ltsolve.c $(SRCDIR)/Cholesky/t_cholmod_solve.c + $(C) -c $(I) $< + +-cholmod_spsolve.o: ../Cholesky/cholmod_spsolve.c ++cholmod_spsolve.o: $(SRCDIR)/Cholesky/cholmod_spsolve.c + $(C) -c $(I) $< + +-cholmod_rowfac.o: ../Cholesky/cholmod_rowfac.c ../Cholesky/t_cholmod_rowfac.c ++cholmod_rowfac.o: $(SRCDIR)/Cholesky/cholmod_rowfac.c $(SRCDIR)/Cholesky/t_cholmod_rowfac.c + $(C) -c $(I) $< + + #------------------------------------------------------------------------------- + +-cholmod_l_amd.o: ../Cholesky/cholmod_amd.c ++cholmod_l_amd.o: $(SRCDIR)/Cholesky/cholmod_amd.c + $(C) -DDLONG -c $(I) $< -o $@ + +-cholmod_l_analyze.o: ../Cholesky/cholmod_analyze.c ++cholmod_l_analyze.o: $(SRCDIR)/Cholesky/cholmod_analyze.c + $(C) -DDLONG -c $(I) $< -o $@ + +-cholmod_l_colamd.o: ../Cholesky/cholmod_colamd.c ++cholmod_l_colamd.o: $(SRCDIR)/Cholesky/cholmod_colamd.c + $(C) -DDLONG -c $(I) $< -o $@ + +-cholmod_l_etree.o: ../Cholesky/cholmod_etree.c ++cholmod_l_etree.o: $(SRCDIR)/Cholesky/cholmod_etree.c + $(C) -DDLONG -c $(I) $< -o $@ + +-cholmod_l_factorize.o: ../Cholesky/cholmod_factorize.c ++cholmod_l_factorize.o: $(SRCDIR)/Cholesky/cholmod_factorize.c + $(C) -DDLONG -c $(I) $< -o $@ + +-cholmod_l_postorder.o: ../Cholesky/cholmod_postorder.c ++cholmod_l_postorder.o: $(SRCDIR)/Cholesky/cholmod_postorder.c + $(C) -DDLONG -c $(I) $< -o $@ + +-cholmod_l_rcond.o: ../Cholesky/cholmod_rcond.c ++cholmod_l_rcond.o: $(SRCDIR)/Cholesky/cholmod_rcond.c + $(C) -DDLONG -c $(I) $< -o $@ + +-cholmod_l_resymbol.o: ../Cholesky/cholmod_resymbol.c ++cholmod_l_resymbol.o: $(SRCDIR)/Cholesky/cholmod_resymbol.c + $(C) -DDLONG -c $(I) $< -o $@ + +-cholmod_l_rowcolcounts.o: ../Cholesky/cholmod_rowcolcounts.c ++cholmod_l_rowcolcounts.o: $(SRCDIR)/Cholesky/cholmod_rowcolcounts.c + $(C) -DDLONG -c $(I) $< -o $@ + +-cholmod_l_solve.o: ../Cholesky/cholmod_solve.c ../Cholesky/t_cholmod_lsolve.c \ +- ../Cholesky/t_cholmod_ltsolve.c ../Cholesky/t_cholmod_solve.c ++cholmod_l_solve.o: $(SRCDIR)/Cholesky/cholmod_solve.c $(SRCDIR)/Cholesky/t_cholmod_lsolve.c \ ++ $(SRCDIR)/Cholesky/t_cholmod_ltsolve.c $(SRCDIR)/Cholesky/t_cholmod_solve.c + $(C) -DDLONG -c $(I) $< -o $@ + +-cholmod_l_spsolve.o: ../Cholesky/cholmod_spsolve.c ++cholmod_l_spsolve.o: $(SRCDIR)/Cholesky/cholmod_spsolve.c + $(C) -DDLONG -c $(I) $< -o $@ + +-cholmod_l_rowfac.o: ../Cholesky/cholmod_rowfac.c ../Cholesky/t_cholmod_rowfac.c ++cholmod_l_rowfac.o: $(SRCDIR)/Cholesky/cholmod_rowfac.c $(SRCDIR)/Cholesky/t_cholmod_rowfac.c + $(C) -DDLONG -c $(I) $< -o $@ + + #------------------------------------------------------------------------------- + # Partition Module: + #------------------------------------------------------------------------------- + +-cholmod_ccolamd.o: ../Partition/cholmod_ccolamd.c ++cholmod_ccolamd.o: $(SRCDIR)/Partition/cholmod_ccolamd.c + $(C) -c $(I) $< + +-cholmod_csymamd.o: ../Partition/cholmod_csymamd.c ++cholmod_csymamd.o: $(SRCDIR)/Partition/cholmod_csymamd.c + $(C) -c $(I) $< + +-cholmod_camd.o: ../Partition/cholmod_camd.c ++cholmod_camd.o: $(SRCDIR)/Partition/cholmod_camd.c + $(C) -c $(I) $< + +-cholmod_metis.o: ../Partition/cholmod_metis.c ++cholmod_metis.o: $(SRCDIR)/Partition/cholmod_metis.c + $(C) -c $(I) $< + +-cholmod_nesdis.o: ../Partition/cholmod_nesdis.c ++cholmod_nesdis.o: $(SRCDIR)/Partition/cholmod_nesdis.c + $(C) -c $(I) $< + + #------------------------------------------------------------------------------- + +-cholmod_l_ccolamd.o: ../Partition/cholmod_ccolamd.c ++cholmod_l_ccolamd.o: $(SRCDIR)/Partition/cholmod_ccolamd.c + $(C) -DDLONG -c $(I) $< -o $@ + +-cholmod_l_csymamd.o: ../Partition/cholmod_csymamd.c ++cholmod_l_csymamd.o: $(SRCDIR)/Partition/cholmod_csymamd.c + $(C) -DDLONG -c $(I) $< -o $@ + +-cholmod_l_camd.o: ../Partition/cholmod_camd.c ++cholmod_l_camd.o: $(SRCDIR)/Partition/cholmod_camd.c + $(C) -DDLONG -c $(I) $< -o $@ + +-cholmod_l_metis.o: ../Partition/cholmod_metis.c ++cholmod_l_metis.o: $(SRCDIR)/Partition/cholmod_metis.c + $(C) -DDLONG -c $(I) $< -o $@ + +-cholmod_l_nesdis.o: ../Partition/cholmod_nesdis.c ++cholmod_l_nesdis.o: $(SRCDIR)/Partition/cholmod_nesdis.c + $(C) -DDLONG -c $(I) $< -o $@ + + +@@ -358,88 +370,88 @@ + # MatrixOps Module: + #------------------------------------------------------------------------------- + +-cholmod_horzcat.o: ../MatrixOps/cholmod_horzcat.c ++cholmod_horzcat.o: $(SRCDIR)/MatrixOps/cholmod_horzcat.c + $(C) -c $(I) $< + +-cholmod_norm.o: ../MatrixOps/cholmod_norm.c ++cholmod_norm.o: $(SRCDIR)/MatrixOps/cholmod_norm.c + $(C) -c $(I) $< + +-cholmod_scale.o: ../MatrixOps/cholmod_scale.c ++cholmod_scale.o: $(SRCDIR)/MatrixOps/cholmod_scale.c + $(C) -c $(I) $< + +-cholmod_drop.o: ../MatrixOps/cholmod_drop.c ++cholmod_drop.o: $(SRCDIR)/MatrixOps/cholmod_drop.c + $(C) -c $(I) $< + +-cholmod_sdmult.o: ../MatrixOps/cholmod_sdmult.c \ +- ../MatrixOps/t_cholmod_sdmult.c ++cholmod_sdmult.o: $(SRCDIR)/MatrixOps/cholmod_sdmult.c \ ++ $(SRCDIR)/MatrixOps/t_cholmod_sdmult.c + $(C) -c $(I) $< + +-cholmod_ssmult.o: ../MatrixOps/cholmod_ssmult.c ++cholmod_ssmult.o: $(SRCDIR)/MatrixOps/cholmod_ssmult.c + $(C) -c $(I) $< + +-cholmod_submatrix.o: ../MatrixOps/cholmod_submatrix.c ++cholmod_submatrix.o: $(SRCDIR)/MatrixOps/cholmod_submatrix.c + $(C) -c $(I) $< + +-cholmod_vertcat.o: ../MatrixOps/cholmod_vertcat.c ++cholmod_vertcat.o: $(SRCDIR)/MatrixOps/cholmod_vertcat.c + $(C) -c $(I) $< + +-cholmod_symmetry.o: ../MatrixOps/cholmod_symmetry.c ++cholmod_symmetry.o: $(SRCDIR)/MatrixOps/cholmod_symmetry.c + $(C) -c $(I) $< + + #------------------------------------------------------------------------------- + +-cholmod_l_horzcat.o: ../MatrixOps/cholmod_horzcat.c ++cholmod_l_horzcat.o: $(SRCDIR)/MatrixOps/cholmod_horzcat.c + $(C) -DDLONG -c $(I) $< -o $@ + +-cholmod_l_norm.o: ../MatrixOps/cholmod_norm.c ++cholmod_l_norm.o: $(SRCDIR)/MatrixOps/cholmod_norm.c + $(C) -DDLONG -c $(I) $< -o $@ + +-cholmod_l_scale.o: ../MatrixOps/cholmod_scale.c ++cholmod_l_scale.o: $(SRCDIR)/MatrixOps/cholmod_scale.c + $(C) -DDLONG -c $(I) $< -o $@ + +-cholmod_l_drop.o: ../MatrixOps/cholmod_drop.c ++cholmod_l_drop.o: $(SRCDIR)/MatrixOps/cholmod_drop.c + $(C) -DDLONG -c $(I) $< -o $@ + +-cholmod_l_sdmult.o: ../MatrixOps/cholmod_sdmult.c \ +- ../MatrixOps/t_cholmod_sdmult.c ++cholmod_l_sdmult.o: $(SRCDIR)/MatrixOps/cholmod_sdmult.c \ ++ $(SRCDIR)/MatrixOps/t_cholmod_sdmult.c + $(C) -DDLONG -c $(I) $< -o $@ + +-cholmod_l_ssmult.o: ../MatrixOps/cholmod_ssmult.c ++cholmod_l_ssmult.o: $(SRCDIR)/MatrixOps/cholmod_ssmult.c + $(C) -DDLONG -c $(I) $< -o $@ + +-cholmod_l_submatrix.o: ../MatrixOps/cholmod_submatrix.c ++cholmod_l_submatrix.o: $(SRCDIR)/MatrixOps/cholmod_submatrix.c + $(C) -DDLONG -c $(I) $< -o $@ + +-cholmod_l_vertcat.o: ../MatrixOps/cholmod_vertcat.c ++cholmod_l_vertcat.o: $(SRCDIR)/MatrixOps/cholmod_vertcat.c + $(C) -DDLONG -c $(I) $< -o $@ + +-cholmod_l_symmetry.o: ../MatrixOps/cholmod_symmetry.c ++cholmod_l_symmetry.o: $(SRCDIR)/MatrixOps/cholmod_symmetry.c + $(C) -DDLONG -c $(I) $< -o $@ + + #------------------------------------------------------------------------------- + # Modify Module: + #------------------------------------------------------------------------------- + +-cholmod_rowadd.o: ../Modify/cholmod_rowadd.c ++cholmod_rowadd.o: $(SRCDIR)/Modify/cholmod_rowadd.c + $(C) -c $(I) $< + +-cholmod_rowdel.o: ../Modify/cholmod_rowdel.c ++cholmod_rowdel.o: $(SRCDIR)/Modify/cholmod_rowdel.c + $(C) -c $(I) $< + +-cholmod_updown.o: ../Modify/cholmod_updown.c \ +- ../Modify/t_cholmod_updown.c ../Modify/t_cholmod_updown_numkr.c ++cholmod_updown.o: $(SRCDIR)/Modify/cholmod_updown.c \ ++ $(SRCDIR)/Modify/t_cholmod_updown.c $(SRCDIR)/Modify/t_cholmod_updown_numkr.c + $(C) -c $(I) $< + + #------------------------------------------------------------------------------- + +-cholmod_l_rowadd.o: ../Modify/cholmod_rowadd.c ++cholmod_l_rowadd.o: $(SRCDIR)/Modify/cholmod_rowadd.c + $(C) -DDLONG -c $(I) $< -o $@ + +-cholmod_l_rowdel.o: ../Modify/cholmod_rowdel.c ++cholmod_l_rowdel.o: $(SRCDIR)/Modify/cholmod_rowdel.c + $(C) -DDLONG -c $(I) $< -o $@ + +-cholmod_l_updown.o: ../Modify/cholmod_updown.c \ +- ../Modify/t_cholmod_updown.c ../Modify/t_cholmod_updown_numkr.c ++cholmod_l_updown.o: $(SRCDIR)/Modify/cholmod_updown.c \ ++ $(SRCDIR)/Modify/t_cholmod_updown.c $(SRCDIR)/Modify/t_cholmod_updown_numkr.c + $(C) -DDLONG -c $(I) $< -o $@ + + +@@ -447,26 +459,26 @@ + # Supernodal Module: + #------------------------------------------------------------------------------- + +-cholmod_super_numeric.o: ../Supernodal/cholmod_super_numeric.c \ +- ../Supernodal/t_cholmod_super_numeric.c ++cholmod_super_numeric.o: $(SRCDIR)/Supernodal/cholmod_super_numeric.c \ ++ $(SRCDIR)/Supernodal/t_cholmod_super_numeric.c + $(C) -c $(I) $< + +-cholmod_super_symbolic.o: ../Supernodal/cholmod_super_symbolic.c ++cholmod_super_symbolic.o: $(SRCDIR)/Supernodal/cholmod_super_symbolic.c + $(C) -c $(I) $< + +-cholmod_super_solve.o: ../Supernodal/cholmod_super_solve.c \ +- ../Supernodal/t_cholmod_super_solve.c ++cholmod_super_solve.o: $(SRCDIR)/Supernodal/cholmod_super_solve.c \ ++ $(SRCDIR)/Supernodal/t_cholmod_super_solve.c + $(C) -c $(I) $< + + #------------------------------------------------------------------------------- + +-cholmod_l_super_numeric.o: ../Supernodal/cholmod_super_numeric.c \ +- ../Supernodal/t_cholmod_super_numeric.c ++cholmod_l_super_numeric.o: $(SRCDIR)/Supernodal/cholmod_super_numeric.c \ ++ $(SRCDIR)/Supernodal/t_cholmod_super_numeric.c + $(C) -DDLONG -c $(I) $< -o $@ + +-cholmod_l_super_symbolic.o: ../Supernodal/cholmod_super_symbolic.c ++cholmod_l_super_symbolic.o: $(SRCDIR)/Supernodal/cholmod_super_symbolic.c + $(C) -DDLONG -c $(I) $< -o $@ + +-cholmod_l_super_solve.o: ../Supernodal/cholmod_super_solve.c \ +- ../Supernodal/t_cholmod_super_solve.c ++cholmod_l_super_solve.o: $(SRCDIR)/Supernodal/cholmod_super_solve.c \ ++ $(SRCDIR)/Supernodal/t_cholmod_super_solve.c + $(C) -DDLONG -c $(I) $< -o $@ +diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg -x '*.orig' -x '*.rej' suitesparse-3.2.0-orig/COLAMD/Lib/Makefile suitesparse-3.2.0/COLAMD/Lib/Makefile +--- suitesparse-3.2.0-orig/COLAMD/Lib/Makefile 2007-05-05 13:41:47 +0000 ++++ suitesparse-3.2.0/COLAMD/Lib/Makefile 2010-04-26 13:27:17 +0000 +@@ -2,22 +2,33 @@ + # COLAMD Makefile + #------------------------------------------------------------------------------- + +-default: libcolamd.a ++default: libcolamd.a colamd.dll ++ ++SRCDIR = $(SRCTOP)/COLAMD ++ ++vpath %.c $(SRCDIR)/Source + + include ../../UFconfig/UFconfig.mk + +-I = -I../Include -I../../UFconfig ++I = -I$(SRCDIR)/Include -I$(SRCDIR)/../UFconfig + +-INC = ../Include/colamd.h ../../UFconfig/UFconfig.h ++INC = $(SRCDIR)/Include/colamd.h $(SRCDIR)/../UFconfig/UFconfig.h + +-SRC = ../Source/colamd.c ../Source/colamd_global.c ++SRC = $(SRCDIR)/Source/colamd.c $(SRCDIR)/Source/colamd_global.c + + # creates libcolamd.a, a C-callable COLAMD library + libcolamd.a: $(SRC) $(INC) +- $(CC) $(CFLAGS) $(I) -c ../Source/colamd_global.c +- $(CC) $(CFLAGS) $(I) -c ../Source/colamd.c +- $(CC) $(CFLAGS) $(I) -c ../Source/colamd.c -DDLONG -o colamd_l.o +- $(AR) libcolamd.a colamd.o colamd_l.o colamd_global.o ++ $(CC) $(CFLAGS) $(I) -c $(SRCDIR)/Source/colamd_global.c ++ $(CC) $(CFLAGS) $(I) -c $(SRCDIR)/Source/colamd.c ++ $(CC) $(CFLAGS) $(I) -c $(SRCDIR)/Source/colamd.c -DDLONG -o colamd_l.o ++ $(AR) $(ARFLAGS) libcolamd.a colamd.o colamd_l.o colamd_global.o ++ ++colamd.dll : libcolamd.a ++ $(CC) -shared $(LDFLAGS) -o $@ \ ++ -Wl,--whole-archive $< \ ++ -Wl,--out-implib,$(basename $<).dll.a \ ++ -Wl,--output-def=$@.exp \ ++ -Wl,--no-whole-archive + + ccode: libcolamd.a + +@@ -29,4 +40,4 @@ + purge: distclean + + distclean: clean +- - $(RM) libcolamd.a ++ - $(RM) libcolamd.a colamd.dll libcolamd.dll.a +diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg -x '*.orig' -x '*.rej' suitesparse-3.2.0-orig/CSparse/Lib/Makefile suitesparse-3.2.0/CSparse/Lib/Makefile +--- suitesparse-3.2.0-orig/CSparse/Lib/Makefile 2007-05-05 20:46:13 +0000 ++++ suitesparse-3.2.0/CSparse/Lib/Makefile 2010-04-26 13:27:17 +0000 +@@ -1,11 +1,13 @@ + # Modify the "-O" optimization option for best performance (-O3 on Linux): +-CC = cc +-CFLAGS = -O -I../Include ++include ../../UFconfig/UFconfig.mk + +-AR = ar cr +-RANLIB = ranlib ++all: libcsparse.a csparse.dll + +-all: libcsparse.a ++SRCDIR = $(SRCTOP)/CSparse ++ ++vpath %.c $(SRCDIR)/Source ++ ++CFLAGS_ADD = -I$(SRCDIR)/Include + + CS = cs_add.o cs_amd.o cs_chol.o cs_cholsol.o cs_counts.o cs_cumsum.o \ + cs_droptol.o cs_dropzeros.o cs_dupl.o cs_entry.o \ +@@ -17,19 +19,26 @@ + cs_maxtrans.o cs_dmperm.o cs_updown.o cs_print.o cs_norm.o cs_load.o \ + cs_dfs.o cs_reach.o cs_spsolve.o cs_ereach.o cs_leaf.o cs_randperm.o + +-$(CS): ../Include/cs.h Makefile ++$(CS): $(SRCDIR)/Include/cs.h Makefile + +-%.o: ../Source/%.c ../Include/cs.h +- $(CC) $(CFLAGS) -c $< ++%.o: $(SRCDIR)/Source/%.c $(SRCDIR)/Include/cs.h ++ $(CC) $(CFLAGS) $(CFLAGS_ADD) -c $< + + libcsparse.a: $(CS) +- $(AR) libcsparse.a $(CS) ++ $(AR) $(ARFLAGS) libcsparse.a $(CS) + $(RANLIB) libcsparse.a + ++csparse.dll : libcsparse.a ++ $(CC) -shared $(LDFLAGS) -o $@ \ ++ -Wl,--whole-archive $< \ ++ -Wl,--out-implib,$(basename $<).dll.a \ ++ -Wl,--output-def=$@.exp \ ++ -Wl,--no-whole-archive ++ + clean: + rm -f *.o + + purge: distclean + + distclean: clean +- rm -f *.a ++ rm -f *.a csparse.dll libcsparse.dll.a +diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg -x '*.orig' -x '*.rej' suitesparse-3.2.0-orig/CXSparse/Lib/Makefile suitesparse-3.2.0/CXSparse/Lib/Makefile +--- suitesparse-3.2.0-orig/CXSparse/Lib/Makefile 2008-09-22 18:26:17 +0000 ++++ suitesparse-3.2.0/CXSparse/Lib/Makefile 2010-04-26 13:27:17 +0000 +@@ -5,12 +5,16 @@ + + include ../../UFconfig/UFconfig.mk + +-I = -I../../UFconfig -I../Include ++SRCDIR = $(SRCTOP)/CXSparse ++ ++vpath %.c $(SRCDIR)/Source ++ ++I = -I$(SRCDIR)/../UFconfig -I$(SRCDIR)/Include + + # AR = ar cr + # RANLIB = ranlib + +-all: libcxsparse.a ++all: libcxsparse.a cxsparse.dll + + CS_SOURCE = cs_add.c cs_amd.c cs_chol.c cs_cholsol.c cs_counts.c cs_cumsum.c \ + cs_droptol.c cs_dropzeros.c cs_dupl.c cs_entry.c \ +@@ -72,31 +76,38 @@ + + CS = cs_convert.o $(CS_DI_OBJ) $(CS_DL_OBJ) $(CS_CI_OBJ) $(CS_CL_OBJ) + +-$(CS): ../Include/cs.h Makefile ++$(CS): $(SRCDIR)/Include/cs.h Makefile + +-cs_convert.o: ../Source/cs_convert.c ++cs_convert.o: $(SRCDIR)/Source/cs_convert.c + $(CC) $(CFLAGS) $(I) -c $< -o $@ + +-%_di.o : ../Source/%.c ++%_di.o : $(SRCDIR)/Source/%.c + $(CC) $(CFLAGS) $(I) -c $< -o $@ + +-%_dl.o : ../Source/%.c ++%_dl.o : $(SRCDIR)/Source/%.c + $(CC) $(CFLAGS) $(I) -DCS_LONG -c $< -o $@ + +-%_ci.o : ../Source/%.c ++%_ci.o : $(SRCDIR)/Source/%.c + $(CC) $(CFLAGS) $(I) -DCS_COMPLEX -c $< -o $@ + +-%_cl.o : ../Source/%.c ++%_cl.o : $(SRCDIR)/Source/%.c + $(CC) $(CFLAGS) $(I) -DCS_LONG -DCS_COMPLEX -c $< -o $@ + + libcxsparse.a: $(CS) +- $(AR) libcxsparse.a $(CS) ++ $(AR) $(ARFLAGS) libcxsparse.a $(CS) + $(RANLIB) libcxsparse.a + ++cxsparse.dll : libcxsparse.a ++ $(CC) -shared $(LDFLAGS) -o $@ \ ++ -Wl,--whole-archive $< \ ++ -Wl,--out-implib,$(basename $<).dll.a \ ++ -Wl,--output-def=$@.exp \ ++ -Wl,--no-whole-archive ++ + clean: + rm -f *.o + + purge: distclean + + distclean: clean +- rm -f *.a ++ rm -f *.a cxsparse.dll cxsparse.dll.a +diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg -x '*.orig' -x '*.rej' suitesparse-3.2.0-orig/UFconfig/UFconfig.mk suitesparse-3.2.0/UFconfig/UFconfig.mk +--- suitesparse-3.2.0-orig/UFconfig/UFconfig.mk 2008-09-22 18:19:37 +0000 ++++ suitesparse-3.2.0/UFconfig/UFconfig.mk 2010-04-26 13:28:19 +0000 +@@ -30,25 +30,28 @@ + # Generic configuration + #------------------------------------------------------------------------------ + ++SRCTOP = @SRCDIR@ ++ + # C compiler and compiler flags: These will normally not give you optimal + # performance. You should select the optimization parameters that are best + # for your system. On Linux, use "CFLAGS = -O3 -fexceptions" for example. +-CC = cc ++# CC = cc + # CFLAGS = -O (for example; see below for details) + + # C++ compiler (also uses CFLAGS) +-CPLUSPLUS = g++ ++CPLUSPLUS = $(CXX) + + # ranlib, and ar, for generating libraries +-RANLIB = ranlib +-AR = ar cr ++RANLIB ?= ranlib ++AR ?= ar ++ARFLAGS = cr + + # delete and rename a file + RM = rm -f + MV = mv -f + + # Fortran compiler (not normally required) +-F77 = f77 ++F77 = $(F77) + F77FLAGS = -O + F77LIB = + +@@ -89,7 +92,7 @@ + # BLAS = -lgoto -lgfortran -lgfortranbegin -lg2c + + # This is probably slow ... it might connect to the Standard Reference BLAS: +-BLAS = -lblas -lgfortran -lgfortranbegin -lg2c ++BLAS = -lblas + LAPACK = -llapack + + # Using non-optimized versions: +@@ -122,13 +125,13 @@ + # The path is relative to where it is used, in CHOLMOD/Lib, CHOLMOD/MATLAB, etc. + # You may wish to use an absolute path. METIS is optional. Compile + # CHOLMOD with -DNPARTITION if you do not wish to use METIS. +-METIS_PATH = ../../metis-4.0 +-METIS = ../../metis-4.0/libmetis.a ++# METIS_PATH = ../../metis-4.0 ++# METIS = ../../metis-4.0/libmetis.a + + # If you use CHOLMOD_CONFIG = -DNPARTITION then you must use the following + # options: +-# METIS_PATH = +-# METIS = ++METIS_PATH = ++METIS = + + #------------------------------------------------------------------------------ + # UMFPACK configuration: +@@ -184,7 +187,7 @@ + # -DNSUNPERF for Solaris only. If defined, do not use the Sun + # Performance Library + +-CHOLMOD_CONFIG = ++CHOLMOD_CONFIG = -DNPARTITION + + #------------------------------------------------------------------------------ + # SuiteSparseQR configuration: +@@ -219,8 +222,8 @@ + #------------------------------------------------------------------------------ + + # Using default compilers: +-# CC = gcc +-CFLAGS = -O3 -fexceptions ++CC ?= gcc ++override CFLAGS += -O3 -fexceptions + + # alternatives: + # CFLAGS = -g -fexceptions \ +diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg -x '*.orig' -x '*.rej' suitesparse-3.2.0-orig/UMFPACK/Lib/GNUmakefile suitesparse-3.2.0/UMFPACK/Lib/GNUmakefile +--- suitesparse-3.2.0-orig/UMFPACK/Lib/GNUmakefile 2007-05-06 12:31:22 +0000 ++++ suitesparse-3.2.0/UMFPACK/Lib/GNUmakefile 2010-04-26 13:27:17 +0000 +@@ -2,12 +2,16 @@ + # UMFPACK Makefile for compiling on Unix systems (for GNU Make) + #------------------------------------------------------------------------------- + +-default: ../Lib/libumfpack.a ++default: ../Lib/libumfpack.a ../Lib/umfpack.dll + + include ../../UFconfig/UFconfig.mk + ++SRCDIR = $(SRCTOP)/UMFPACK ++ ++vpath %.c $(SRCDIR)/Source ++ + C = $(CC) $(CFLAGS) $(UMFPACK_CONFIG) \ +- -I../Include -I../Source -I../../AMD/Include -I../../UFconfig ++ -I$(SRCDIR)/Include -I$(SRCDIR)/Source -I$(SRCDIR)/../AMD/Include -I$(SRCDIR)/../UFconfig + + #------------------------------------------------------------------------------- + # source files +@@ -65,14 +69,14 @@ + # include files: + #------------------------------------------------------------------------------- + +-INC = ../Include/umfpack.h ../../UFconfig/UFconfig.h \ +- ../Source/umf_config.h ../Source/umf_version.h \ +- ../Source/umf_internal.h ../Source/umf_triplet.h \ +- $(addprefix ../Source/, $(addsuffix .h,$(UMFCH))) \ +- $(addprefix ../Source/, $(addsuffix .h,$(UMFINT))) \ +- $(addprefix ../Include/, $(addsuffix .h,$(USER))) \ +- $(addprefix ../Include/, $(addsuffix .h,$(GENERIC))) \ +- ../../AMD/Include/amd_internal.h ../../AMD/Include/amd.h ++INC = $(SRCDIR)/Include/umfpack.h $(SRCDIR)/../UFconfig/UFconfig.h \ ++ $(SRCDIR)/Source/umf_config.h $(SRCDIR)/Source/umf_version.h \ ++ $(SRCDIR)/Source/umf_internal.h $(SRCDIR)/Source/umf_triplet.h \ ++ $(addprefix $(SRCDIR)/Source/, $(addsuffix .h,$(UMFCH))) \ ++ $(addprefix $(SRCDIR)/Source/, $(addsuffix .h,$(UMFINT))) \ ++ $(addprefix $(SRCDIR)/Include/, $(addsuffix .h,$(USER))) \ ++ $(addprefix $(SRCDIR)/Include/, $(addsuffix .h,$(GENERIC))) \ ++ $(SRCDIR)/../AMD/Include/amd_internal.h $(SRCDIR)/../AMD/Include/amd.h + + #------------------------------------------------------------------------------- + # object files for each version +@@ -90,153 +94,153 @@ + # compile each int and UF_long routine (with no real/complex version) + #------------------------------------------------------------------------------- + +-umf_i_%.o: ../Source/umf_%.c $(INC) ++umf_i_%.o: $(SRCDIR)/Source/umf_%.c $(INC) + $(C) -DDINT -c $< -o $@ + +-umf_l_%.o: ../Source/umf_%.c $(INC) ++umf_l_%.o: $(SRCDIR)/Source/umf_%.c $(INC) + $(C) -DDLONG -c $< -o $@ + + #------------------------------------------------------------------------------- + # compile each routine in the DI version + #------------------------------------------------------------------------------- + +-umf_di_%.o: ../Source/umf_%.c $(INC) ++umf_di_%.o: $(SRCDIR)/Source/umf_%.c $(INC) + $(C) -DDINT -c $< -o $@ + +-umf_di_%hsolve.o: ../Source/umf_%tsolve.c $(INC) ++umf_di_%hsolve.o: $(SRCDIR)/Source/umf_%tsolve.c $(INC) + $(C) -DDINT -DCONJUGATE_SOLVE -c $< -o $@ + +-umf_di_triplet_map_x.o: ../Source/umf_triplet.c $(INC) ++umf_di_triplet_map_x.o: $(SRCDIR)/Source/umf_triplet.c $(INC) + $(C) -DDINT -DDO_MAP -DDO_VALUES -c $< -o $@ + +-umf_di_triplet_map_nox.o: ../Source/umf_triplet.c $(INC) ++umf_di_triplet_map_nox.o: $(SRCDIR)/Source/umf_triplet.c $(INC) + $(C) -DDINT -DDO_MAP -c $< -o $@ + +-umf_di_triplet_nomap_x.o: ../Source/umf_triplet.c $(INC) ++umf_di_triplet_nomap_x.o: $(SRCDIR)/Source/umf_triplet.c $(INC) + $(C) -DDINT -DDO_VALUES -c $< -o $@ + +-umf_di_triplet_nomap_nox.o: ../Source/umf_triplet.c $(INC) ++umf_di_triplet_nomap_nox.o: $(SRCDIR)/Source/umf_triplet.c $(INC) + $(C) -DDINT -c $< -o $@ + +-umf_di_assemble_fixq.o: ../Source/umf_assemble.c $(INC) ++umf_di_assemble_fixq.o: $(SRCDIR)/Source/umf_assemble.c $(INC) + $(C) -DDINT -DFIXQ -c $< -o $@ + +-umf_di_store_lu_drop.o: ../Source/umf_store_lu.c $(INC) ++umf_di_store_lu_drop.o: $(SRCDIR)/Source/umf_store_lu.c $(INC) + $(C) -DDINT -DDROP -c $< -o $@ + +-umfpack_di_wsolve.o: ../Source/umfpack_solve.c $(INC) ++umfpack_di_wsolve.o: $(SRCDIR)/Source/umfpack_solve.c $(INC) + $(C) -DDINT -DWSOLVE -c $< -o $@ + +-umfpack_di_%.o: ../Source/umfpack_%.c $(INC) ++umfpack_di_%.o: $(SRCDIR)/Source/umfpack_%.c $(INC) + $(C) -DDINT -c $< -o $@ + + #------------------------------------------------------------------------------- + # compile each routine in the DL version + #------------------------------------------------------------------------------- + +-umf_dl_%.o: ../Source/umf_%.c $(INC) ++umf_dl_%.o: $(SRCDIR)/Source/umf_%.c $(INC) + $(C) -DDLONG -c $< -o $@ + +-umf_dl_%hsolve.o: ../Source/umf_%tsolve.c $(INC) ++umf_dl_%hsolve.o: $(SRCDIR)/Source/umf_%tsolve.c $(INC) + $(C) -DDLONG -DCONJUGATE_SOLVE -c $< -o $@ + +-umf_dl_triplet_map_x.o: ../Source/umf_triplet.c $(INC) ++umf_dl_triplet_map_x.o: $(SRCDIR)/Source/umf_triplet.c $(INC) + $(C) -DDLONG -DDO_MAP -DDO_VALUES -c $< -o $@ + +-umf_dl_triplet_map_nox.o: ../Source/umf_triplet.c $(INC) ++umf_dl_triplet_map_nox.o: $(SRCDIR)/Source/umf_triplet.c $(INC) + $(C) -DDLONG -DDO_MAP -c $< -o $@ + +-umf_dl_triplet_nomap_x.o: ../Source/umf_triplet.c $(INC) ++umf_dl_triplet_nomap_x.o: $(SRCDIR)/Source/umf_triplet.c $(INC) + $(C) -DDLONG -DDO_VALUES -c $< -o $@ + +-umf_dl_triplet_nomap_nox.o: ../Source/umf_triplet.c $(INC) ++umf_dl_triplet_nomap_nox.o: $(SRCDIR)/Source/umf_triplet.c $(INC) + $(C) -DDLONG -c $< -o $@ + +-umf_dl_assemble_fixq.o: ../Source/umf_assemble.c $(INC) ++umf_dl_assemble_fixq.o: $(SRCDIR)/Source/umf_assemble.c $(INC) + $(C) -DDLONG -DFIXQ -c $< -o $@ + +-umf_dl_store_lu_drop.o: ../Source/umf_store_lu.c $(INC) ++umf_dl_store_lu_drop.o: $(SRCDIR)/Source/umf_store_lu.c $(INC) + $(C) -DDLONG -DDROP -c $< -o $@ + +-umfpack_dl_wsolve.o: ../Source/umfpack_solve.c $(INC) ++umfpack_dl_wsolve.o: $(SRCDIR)/Source/umfpack_solve.c $(INC) + $(C) -DDLONG -DWSOLVE -c $< -o $@ + +-umfpack_dl_%.o: ../Source/umfpack_%.c $(INC) ++umfpack_dl_%.o: $(SRCDIR)/Source/umfpack_%.c $(INC) + $(C) -DDLONG -c $< -o $@ + + #------------------------------------------------------------------------------- + # compile each routine in the ZI version + #------------------------------------------------------------------------------- + +-umf_zi_%.o: ../Source/umf_%.c $(INC) ++umf_zi_%.o: $(SRCDIR)/Source/umf_%.c $(INC) + $(C) -DZINT -c $< -o $@ + +-umf_zi_%hsolve.o: ../Source/umf_%tsolve.c $(INC) ++umf_zi_%hsolve.o: $(SRCDIR)/Source/umf_%tsolve.c $(INC) + $(C) -DZINT -DCONJUGATE_SOLVE -c $< -o $@ + +-umf_zi_triplet_map_x.o: ../Source/umf_triplet.c $(INC) ++umf_zi_triplet_map_x.o: $(SRCDIR)/Source/umf_triplet.c $(INC) + $(C) -DZINT -DDO_MAP -DDO_VALUES -c $< -o $@ + +-umf_zi_triplet_map_nox.o: ../Source/umf_triplet.c $(INC) ++umf_zi_triplet_map_nox.o: $(SRCDIR)/Source/umf_triplet.c $(INC) + $(C) -DZINT -DDO_MAP -c $< -o $@ + +-umf_zi_triplet_nomap_x.o: ../Source/umf_triplet.c $(INC) ++umf_zi_triplet_nomap_x.o: $(SRCDIR)/Source/umf_triplet.c $(INC) + $(C) -DZINT -DDO_VALUES -c $< -o $@ + +-umf_zi_triplet_nomap_nox.o: ../Source/umf_triplet.c $(INC) ++umf_zi_triplet_nomap_nox.o: $(SRCDIR)/Source/umf_triplet.c $(INC) + $(C) -DZINT -c $< -o $@ + +-umf_zi_assemble_fixq.o: ../Source/umf_assemble.c $(INC) ++umf_zi_assemble_fixq.o: $(SRCDIR)/Source/umf_assemble.c $(INC) + $(C) -DZINT -DFIXQ -c $< -o $@ + +-umf_zi_store_lu_drop.o: ../Source/umf_store_lu.c $(INC) ++umf_zi_store_lu_drop.o: $(SRCDIR)/Source/umf_store_lu.c $(INC) + $(C) -DZINT -DDROP -c $< -o $@ + +-umfpack_zi_wsolve.o: ../Source/umfpack_solve.c $(INC) ++umfpack_zi_wsolve.o: $(SRCDIR)/Source/umfpack_solve.c $(INC) + $(C) -DZINT -DWSOLVE -c $< -o $@ + +-umfpack_zi_%.o: ../Source/umfpack_%.c $(INC) ++umfpack_zi_%.o: $(SRCDIR)/Source/umfpack_%.c $(INC) + $(C) -DZINT -c $< -o $@ + + #------------------------------------------------------------------------------- + # compile each routine in the ZL version + #------------------------------------------------------------------------------- + +-umf_zl_%.o: ../Source/umf_%.c $(INC) ++umf_zl_%.o: $(SRCDIR)/Source/umf_%.c $(INC) + $(C) -DZLONG -c $< -o $@ + +-umf_zl_%hsolve.o: ../Source/umf_%tsolve.c $(INC) ++umf_zl_%hsolve.o: $(SRCDIR)/Source/umf_%tsolve.c $(INC) + $(C) -DZLONG -DCONJUGATE_SOLVE -c $< -o $@ + +-umf_zl_triplet_map_x.o: ../Source/umf_triplet.c $(INC) ++umf_zl_triplet_map_x.o: $(SRCDIR)/Source/umf_triplet.c $(INC) + $(C) -DZLONG -DDO_MAP -DDO_VALUES -c $< -o $@ + +-umf_zl_triplet_map_nox.o: ../Source/umf_triplet.c $(INC) ++umf_zl_triplet_map_nox.o: $(SRCDIR)/Source/umf_triplet.c $(INC) + $(C) -DZLONG -DDO_MAP -c $< -o $@ + +-umf_zl_triplet_nomap_x.o: ../Source/umf_triplet.c $(INC) ++umf_zl_triplet_nomap_x.o: $(SRCDIR)/Source/umf_triplet.c $(INC) + $(C) -DZLONG -DDO_VALUES -c $< -o $@ + +-umf_zl_triplet_nomap_nox.o: ../Source/umf_triplet.c $(INC) ++umf_zl_triplet_nomap_nox.o: $(SRCDIR)/Source/umf_triplet.c $(INC) + $(C) -DZLONG -c $< -o $@ + +-umf_zl_assemble_fixq.o: ../Source/umf_assemble.c $(INC) ++umf_zl_assemble_fixq.o: $(SRCDIR)/Source/umf_assemble.c $(INC) + $(C) -DZLONG -DFIXQ -c $< -o $@ + +-umf_zl_store_lu_drop.o: ../Source/umf_store_lu.c $(INC) ++umf_zl_store_lu_drop.o: $(SRCDIR)/Source/umf_store_lu.c $(INC) + $(C) -DZLONG -DDROP -c $< -o $@ + +-umfpack_zl_wsolve.o: ../Source/umfpack_solve.c $(INC) ++umfpack_zl_wsolve.o: $(SRCDIR)/Source/umfpack_solve.c $(INC) + $(C) -DZLONG -DWSOLVE -c $< -o $@ + +-umfpack_zl_%.o: ../Source/umfpack_%.c $(INC) ++umfpack_zl_%.o: $(SRCDIR)/Source/umfpack_%.c $(INC) + $(C) -DZLONG -c $< -o $@ + + #------------------------------------------------------------------------------- + # Create the generic routines (GN) using a generic rule + #------------------------------------------------------------------------------- + +-umfpack_gn_%.o: ../Source/umfpack_%.c $(INC) ++umfpack_gn_%.o: $(SRCDIR)/Source/umfpack_%.c $(INC) + $(C) -c $< -o $@ + + #------------------------------------------------------------------------------- +@@ -244,15 +248,22 @@ + #------------------------------------------------------------------------------- + + ../Lib/libumfpack.a: $(II) $(LL) $(GN) $(DI) $(DL) $(ZI) $(ZL) +- $(AR) ../Lib/libumfpack.a $^ ++ $(AR) $(ARFLAGS) ../Lib/libumfpack.a $^ + - $(RANLIB) ../Lib/libumfpack.a + ++../Lib/umfpack.dll : ../Lib/libumfpack.a ++ $(CC) -shared $(LDFLAGS) -o $@ -L../../AMD/Lib \ ++ -Wl,--whole-archive $< ... [truncated message content] |
From: <lin...@us...> - 2010-05-16 14:25:49
|
Revision: 7308 http://octave.svn.sourceforge.net/octave/?rev=7308&view=rev Author: lindnerb Date: 2010-05-16 14:25:43 +0000 (Sun, 16 May 2010) Log Message: ----------- mingw32: (gcc-4.5.0) factor out common configure code Modified Paths: -------------- trunk/octave-forge/admin/Windows/mingw32/expat/build-2.0.1-5.sh trunk/octave-forge/admin/Windows/mingw32/gcc45_common.sh trunk/octave-forge/admin/Windows/mingw32/libncurses/build-5.7-5.sh Modified: trunk/octave-forge/admin/Windows/mingw32/expat/build-2.0.1-5.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/expat/build-2.0.1-5.sh 2010-05-15 00:48:32 UTC (rev 7307) +++ trunk/octave-forge/admin/Windows/mingw32/expat/build-2.0.1-5.sh 2010-05-16 14:25:43 UTC (rev 7308) @@ -51,20 +51,9 @@ # == override resp. specify build actions == -conf() +conf_post() { - conf_pre; - ( cd ${BUILDDIR} && ${TOPDIR}/${SRCDIR}/configure \ - --srcdir=${TOPDIR}/${SRCDIR} \ - --prefix=${PREFIX} \ - CC="gcc -shared-libgcc" \ - CXX="g++ -shared-libgcc" \ - F77="gfortran -shared-libgcc" \ - LDFLAGS="-Wl,--enable-runtime-pseudo-reloc-v2" - ) - touch ${BUILDDIR}/have_configure modify_libtool_all ${BUILDDIR}/libtool - conf_post; } install() Modified: trunk/octave-forge/admin/Windows/mingw32/gcc45_common.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/gcc45_common.sh 2010-05-15 00:48:32 UTC (rev 7307) +++ trunk/octave-forge/admin/Windows/mingw32/gcc45_common.sh 2010-05-16 14:25:43 UTC (rev 7308) @@ -91,6 +91,9 @@ MAKE_FILE="" fi + LDFLAGS+=" -Wl,--enable-runtime-pseudo-reloc-v2"; + FLDFLAGS+=" -Wl,--enable-runtime-pseudo-reloc-v2"; + # call make if [ -e have_configure ]; then # we had a configure script setup all variable accordingly @@ -233,7 +236,27 @@ conf_pre() { echo ; } conf() { - echo Not implemented! + conf_pre; + echo ../$SRCDIR/configure \ + --srcdir=$TOPDIR/$SRCDIR \ + --prefix=$PREFIX \ + CC="gcc -shared-libgcc" \ + CXX="g++ -shared-libgcc" \ + F77="gfortran -shared-libgcc" \ + LDFLAGS="-Wl,--enable-runtime-pseudo-reloc-v2" \ + $CONFIGURE_XTRA_ARGS + + ( cd $BUILDDIR && ../$SRCDIR/configure \ + --srcdir=$TOPDIR/$SRCDIR \ + --prefix=$PREFIX \ + CC="gcc -shared-libgcc" \ + CXX="g++ -shared-libgcc" \ + F77="gfortran -shared-libgcc" \ + LDFLAGS="-Wl,--enable-runtime-pseudo-reloc-v2" \ + $CONFIGURE_XTRA_ARGS + ) + touch $BUILDDIR/have_configure + conf_post; } conf_post() { echo ; } Modified: trunk/octave-forge/admin/Windows/mingw32/libncurses/build-5.7-5.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/libncurses/build-5.7-5.sh 2010-05-15 00:48:32 UTC (rev 7307) +++ trunk/octave-forge/admin/Windows/mingw32/libncurses/build-5.7-5.sh 2010-05-16 14:25:43 UTC (rev 7308) @@ -115,16 +115,9 @@ done } -conf() +conf_pre() { - conf_pre; - ( cd ${BUILDDIR} && ${TOPDIR}/${SRCDIR}/configure \ - --srcdir=${TOPDIR}/${SRCDIR} \ - CC="gcc -shared-libgcc" \ - CXX="g++ -shared-libgcc" \ - F77="gfortran -shared-libgcc" \ - LDFLAGS="-Wl,--enable-runtime-pseudo-reloc-v2" \ - --prefix=$PREFIX \ + CONFIGURE_XTRA_ARGS="\ --without-ada \ --without-cxx \ --without-cxx-binding \ @@ -132,10 +125,7 @@ --with-libtool \ --with-normal \ --enable-term-driver \ - --enable-sp-funcs - ) - touch ${BUILDDIR}/have_configure - conf_post; + --enable-sp-funcs" } install() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lin...@us...> - 2010-05-16 16:30:56
|
Revision: 7309 http://octave.svn.sourceforge.net/octave/?rev=7309&view=rev Author: lindnerb Date: 2010-05-16 16:30:50 +0000 (Sun, 16 May 2010) Log Message: ----------- mingw32: (gcc-4.5.0) add install_strip() for expat and ncurses Modified Paths: -------------- trunk/octave-forge/admin/Windows/mingw32/expat/build-2.0.1-5.sh trunk/octave-forge/admin/Windows/mingw32/libncurses/build-5.7-5.sh Modified: trunk/octave-forge/admin/Windows/mingw32/expat/build-2.0.1-5.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/expat/build-2.0.1-5.sh 2010-05-16 14:25:43 UTC (rev 7308) +++ trunk/octave-forge/admin/Windows/mingw32/expat/build-2.0.1-5.sh 2010-05-16 16:30:50 UTC (rev 7309) @@ -83,6 +83,11 @@ install_post; } +install_strip() +{ + install; + $STRIP $STRIP_FLAGS $PREFIX/$BIN_DIR/expat.dll +} uninstall() { uninstall_pre; Modified: trunk/octave-forge/admin/Windows/mingw32/libncurses/build-5.7-5.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/libncurses/build-5.7-5.sh 2010-05-16 14:25:43 UTC (rev 7308) +++ trunk/octave-forge/admin/Windows/mingw32/libncurses/build-5.7-5.sh 2010-05-16 16:30:50 UTC (rev 7309) @@ -160,6 +160,14 @@ install_post; } +install_strip() +{ + install; + for a in ncurses form menu panel; do + $STRIP $STRIP_FLAGS $PREFIX/$BIN_DIR/lib$a-$NCURSES_ABI.dll + done +} + uninstall() { uninstall_pre; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lin...@us...> - 2010-05-16 16:32:39
|
Revision: 7310 http://octave.svn.sourceforge.net/octave/?rev=7310&view=rev Author: lindnerb Date: 2010-05-16 16:32:30 +0000 (Sun, 16 May 2010) Log Message: ----------- mingw32: (gcc-4.5.0) add fftw3, fix common configure code in gcc45_common.sh Modified Paths: -------------- trunk/octave-forge/admin/Windows/mingw32/gcc45_common.sh Added Paths: ----------- trunk/octave-forge/admin/Windows/mingw32/fftw3/build-3.2.2-5.sh Added: trunk/octave-forge/admin/Windows/mingw32/fftw3/build-3.2.2-5.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/fftw3/build-3.2.2-5.sh (rev 0) +++ trunk/octave-forge/admin/Windows/mingw32/fftw3/build-3.2.2-5.sh 2010-05-16 16:32:30 UTC (rev 7310) @@ -0,0 +1,214 @@ +#! /usr/bin/sh + +# Name of package +PKG=fftw +# Version of Package +VER=3.2.2 +# Release of (this patched) package +REL=5 +# Name&Version of Package +PKGVER=${PKG}-${VER} +# Full name of this patched Package +FULLPKG=${PKGVER}-${REL} + +# Name of source file(s) +SRCFILE=${PKGVER}.tar.gz +# Name of Patch file +PATCHFILE=${FULLPKG}.patch + +# URL(s) of source code file(s) +URL="http://www.fftw.org/fftw-3.2.2.tar.gz" + +# Top dir of this building process (i.e. where the patch file and source file(s) reside) +TOPDIR=`pwd` +# Directory source code is extraced to (relative to TOPDIR) +SRCDIR=${PKGVER} +# Directory original source code is extracted to (for generating diffs) (relative to TOPDIR) +SRCDIR_ORIG=${SRCDIR}-orig + +# Make file to use (optional) +MAKEFILE= +# Any extra flags to pass make to +MAKE_XTRA= + +# Header files to install +HEADERS_INSTALL="fftw3.h" + +# License file(s) to install +LICENSE_INSTALL="COPYING COPYRIGHT" + +# pkg-config .pc files to install +PKG_CONFIG_INSTALL="fftw3.pc fftw3f.pc" + +# Additional DIFF Flags for generating diff file +DIFF_FLAGS= + +# load common functions +source ../gcc45_common.sh + +# Directory the lib is built in (set this *after* loading gcc44_common.sh) +BUILDDIR_DOUBLE=".build_${BUILD_TARGET}_${FULLPKG}_gcc${GCC_VERSION}${GCC_SYSTEM}_double" +BUILDDIR_SINGLE=".build_${BUILD_TARGET}_${FULLPKG}_gcc${GCC_VERSION}${GCC_SYSTEM}_single" + +# == override resp. specify build actions == + +mkdirs() +{ + for a in $BUILDDIR_DOUBLE $BUILDDIR_SINGLE; do + if test -d $a; then + echo removing $a ... + rm -rf $a + fi + mkdir -vp $a + done +} + +conf() +{ + conf_general; + conf_single; +} + +conf_post() +{ + modify_libtool_all $BUILDDIR/libtool +} + +conf_general() +{ + CONFIGURE_XTRA_ARGS="\ + --enable-portable-binary \ + --enable-static \ + --enable-shared" + BUILDDIR=$BUILDDIR_DOUBLE + + conf_pre; + conf_common; + conf_post; +} + +conf_single() +{ + CONFIGURE_XTRA_ARGS="\ + --enable-portable-binary \ + --enable-single \ + --enable-shared \ + --enable-static" + BUILDDIR=$BUILDDIR_SINGLE + + conf_pre; + conf_common; + conf_post; +} + +build() +{ + build_pre; + + for a in $BUILDDIR_DOUBLE $BUILDDIR_SINGLE; do + ( cd $a && make_common ) + done + + build_post; +} + +# Make check: all tests pass 17-may-2010 using mingw32-gcc-4.5.0 (mingw) + +check() +{ + check_pre; + + for a in $BUILDDIR_DOUBLE $BUILDDIR_SINGLE; do + ( cd $a && make_common check ) + done + + check_post; +} + +install() +{ + install_pre; + + # Install library, import library and static library + ${CP} ${CP_FLAGS} $BUILDDIR_DOUBLE/.libs/fftw3.dll $PREFIX/$BIN_DIR + ${CP} ${CP_FLAGS} $BUILDDIR_DOUBLE/.libs/libfftw3.dll.a $PREFIX/$LIB_DIR + ${CP} ${CP_FLAGS} $BUILDDIR_DOUBLE/.libs/libfftw3.a $PREFIX/$STATICLIB_DIR + + ${CP} ${CP_FLAGS} $BUILDDIR_SINGLE/.libs/fftw3f.dll $PREFIX/$BIN_DIR + ${CP} ${CP_FLAGS} $BUILDDIR_SINGLE/.libs/libfftw3f.dll.a $PREFIX/$LIB_DIR + ${CP} ${CP_FLAGS} $BUILDDIR_SINGLE/.libs/libfftw3f.a $PREFIX/$STATICLIB_DIR + + # Install pkg-config .pc files + for a in $PKG_CONFIG_INSTALL; do + ${CP} ${CP_FLAGS} $BUILDDIR_DOUBLE/$a $PREFIX/$PKGCONFIG_DIR + ${CP} ${CP_FLAGS} $BUILDDIR_SINGLE/$a $PREFIX/$PKGCONFIG_DIR + done + + # Install headers + for a in $HEADERS_INSTALL; do + ${CP} ${CP_FLAGS} ${SRCDIR}/api/$a $PREFIX/$INC_DIR + done + + # Install license file + for a in $LICENSE_INSTALL; do + ${CP} ${CP_FLAGS} ${SRCDIR}/$a $PREFIX/$LIC_DIR/$PKG + done + + install_post; +} + +install_strip() +{ + install; + $STRIP $STRIP_FLAGS $PREFIX/$BIN_DIR/fftw3.dll + $STRIP $STRIP_FLAGS $PREFIX/$BIN_DIR/fftw3f.dll +} + +uninstall() +{ + uninstall_pre; + + # Install library, import library and static library + ${RM} ${RM_FLAGS} $PREFIX/$BIN_DIR/fftw3.dll + ${RM} ${RM_FLAGS} $PREFIX/$LIB_DIR/libfftw3.dll.a + ${RM} ${RM_FLAGS} $PREFIX/$STATICLIB_DIR/libfftw3.a + + ${RM} ${RM_FLAGS} $PREFIX/$BIN_DIR/fftw3f.dll + ${RM} ${RM_FLAGS} $PREFIX/$LIB_DIR/libfftw3f.dll.a + ${RM} ${RM_FLAGS} $PREFIX/$STATICLIB_DIR/libfftw3f.a + + # Uninstall headers + for a in $HEADERS_INSTALL; do + ${RM} ${RM_FLAGS} $PREFIX/$INC_DIR/$a + done + + # Uninstall pkg-config .pc files + for a in $PKG_CONFIG_INSTALL; do + ${RM} ${RM_FLAGS} $PREFIX/$PKGCONFIG_DIR/$a + done + + # Uninstall license file + for a in $LICENSE_INSTALL; do + ${RM} ${RM_FLAGS} $PREFIX/$LIC_DIR/$PKG/$a + done + + uninstall_post; +} + +pkg_pre() +{ + # No extra patch required + PATCHFILE="" +} + +all() { + download + unpack + applypatch + mkdirs + conf + build + install +} + +main $* Modified: trunk/octave-forge/admin/Windows/mingw32/gcc45_common.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/gcc45_common.sh 2010-05-16 16:30:50 UTC (rev 7309) +++ trunk/octave-forge/admin/Windows/mingw32/gcc45_common.sh 2010-05-16 16:32:30 UTC (rev 7310) @@ -234,9 +234,8 @@ # == configure == conf_pre() { echo ; } -conf() +conf_common() { - conf_pre; echo ../$SRCDIR/configure \ --srcdir=$TOPDIR/$SRCDIR \ --prefix=$PREFIX \ @@ -256,10 +255,16 @@ $CONFIGURE_XTRA_ARGS ) touch $BUILDDIR/have_configure - conf_post; } conf_post() { echo ; } +conf() +{ + conf_pre; + conf_common; + conf_post; +} + # == check == check_pre() { echo ; } check() @@ -304,7 +309,7 @@ # == install == install_pre() { - for a in $BIN_DIR $LIB_DIR $STATICLIB_DIR $INC_DIR $LIC_DIR $LIC_DIR/$PKG $ETC_DIR $SHARE_DIR; do + for a in $BIN_DIR $LIB_DIR $STATICLIB_DIR $INC_DIR $LIC_DIR $LIC_DIR/$PKG $ETC_DIR $SHARE_DIR $PKGCONFIG_DIR; do if [ ! -e $PREFIX/$a ]; then mkdir -vp $PREFIX/$a; fi done } @@ -327,7 +332,7 @@ uninstall_post() { # Remove installation directories if empty - for a in $BIN_DIR $LIB_DIR $STATICLIB_DIR $INC_DIR $LIC_DIR/$PKG $LIC_DIR $ETC_DIR $SHARE_DIR; do + for a in $BIN_DIR $LIB_DIR $STATICLIB_DIR $INC_DIR $LIC_DIR/$PKG $LIC_DIR $ETC_DIR $SHARE_DIR $PKGCONFIG_DIR; do rmdir --ignore-fail-on-non-empty $PREFIX/$a done } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lin...@us...> - 2010-06-05 09:29:55
|
Revision: 7400 http://octave.svn.sourceforge.net/octave/?rev=7400&view=rev Author: lindnerb Date: 2010-06-05 09:29:47 +0000 (Sat, 05 Jun 2010) Log Message: ----------- mingw32 (gcc-4.5.0): add common install/uninstall code, adapt build scripts Modified Paths: -------------- trunk/octave-forge/admin/Windows/mingw32/arpack/build-96-5.sh trunk/octave-forge/admin/Windows/mingw32/blas/build-5.sh trunk/octave-forge/admin/Windows/mingw32/cblas/build-5.sh trunk/octave-forge/admin/Windows/mingw32/expat/build-2.0.1-5.sh trunk/octave-forge/admin/Windows/mingw32/fftw3/build-3.2.2-5.sh trunk/octave-forge/admin/Windows/mingw32/gcc45_common.sh trunk/octave-forge/admin/Windows/mingw32/lapack/build-3.2.1-5.sh trunk/octave-forge/admin/Windows/mingw32/libncurses/build-5.7-5.sh trunk/octave-forge/admin/Windows/mingw32/qrupdate/build-1.1.1-5.sh trunk/octave-forge/admin/Windows/mingw32/zlib/build-1.2.5-5.sh Modified: trunk/octave-forge/admin/Windows/mingw32/arpack/build-96-5.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/arpack/build-96-5.sh 2010-06-04 04:49:12 UTC (rev 7399) +++ trunk/octave-forge/admin/Windows/mingw32/arpack/build-96-5.sh 2010-06-05 09:29:47 UTC (rev 7400) @@ -34,7 +34,11 @@ # Header files to install HEADERS_INSTALL= +HEADERS_BUILD_INSTALL= +# install subdirectory below $PREFIX/$INC_DIR (if any) +INCLUDE_SUBDIR= + # License file(s) to install LICENSE_INSTALL="README" @@ -90,16 +94,7 @@ ${CP} ${CP_FLAGS} ${BUILDDIR}/libarpack.dll.a $PREFIX/$LIB_DIR ${CP} ${CP_FLAGS} ${BUILDDIR}/libarpack.a $PREFIX/$STATICLIB_DIR - # Install headers - for a in $HEADERS_INSTALL; do - ${CP} ${CP_FLAGS} ${SRCDIR}/$a $PREFIX/$INC_DIR - done - - # Install license file - for a in $LICENSE_INSTALL; do - ${CP} ${CP_FLAGS} ${SRCDIR}/$a $PREFIX/$LIC_DIR/$PKG - done - + install_common; install_post; } @@ -118,16 +113,7 @@ ${RM} ${RM_FLAGS} $PREFIX/$LIB_DIR/libarpack.dll.a ${RM} ${RM_FLAGS} $PREFIX/$STATICLIB_DIR/libarpack.a - # Uninstall headers - for a in $HEADERS_INSTALL; do - ${RM} ${RM_FLAGS} $PREFIX/$INC_DIR/$a - done - - # Uninstall license file - for a in $LICENSE_INSTALL; do - ${RM} ${RM_FLAGS} $PREFIX/$LIC_DIR/$PKG/$a - done - + uninstall_common; uninstall_post; } Modified: trunk/octave-forge/admin/Windows/mingw32/blas/build-5.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/blas/build-5.sh 2010-06-04 04:49:12 UTC (rev 7399) +++ trunk/octave-forge/admin/Windows/mingw32/blas/build-5.sh 2010-06-05 09:29:47 UTC (rev 7400) @@ -33,7 +33,11 @@ # Header files to install HEADERS_INSTALL= +HEADERS_BUILD_INSTALL= +# install subdirectory below $PREFIX/$INC_DIR (if any) +INCLUDE_SUBDIR= + # License file(s) to install LICENSE_INSTALL= @@ -65,16 +69,7 @@ ${CP} ${CP_FLAGS} ${BUILDDIR}/libblas.dll.a $PREFIX/$LIB_DIR ${CP} ${CP_FLAGS} ${BUILDDIR}/libblas.a $PREFIX/$STATICLIB_DIR - # Install headers - for a in $HEADERS_INSTALL; do - ${CP} ${CP_FLAGS} ${SRCDIR}/$a $PREFIX/$INC_DIR - done - - # Install license file - for a in $LICENSE_INSTALL; do - ${CP} ${CP_FLAGS} ${SRCDIR}/$a $PREFIX/$LIC_DIR/$PKG - done - + install_common; install_post; } @@ -93,16 +88,7 @@ ${RM} ${RM_FLAGS} $PREFIX/$LIB_DIR/libblas.dll.a ${RM} ${RM_FLAGS} $PREFIX/$STATICLIB_DIR/libblas.a - # Uninstall headers - for a in $HEADERS_INSTALL; do - ${RM} ${RM_FLAGS} $PREFIX/$INC_DIR/$a - done - - # Uninstall license file - for a in $LICENSE_INSTALL; do - ${RM} ${RM_FLAGS} $PREFIX/$LIC_DIR/$PKG/$a - done - + uninstall_common; uninstall_post; } Modified: trunk/octave-forge/admin/Windows/mingw32/cblas/build-5.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/cblas/build-5.sh 2010-06-04 04:49:12 UTC (rev 7399) +++ trunk/octave-forge/admin/Windows/mingw32/cblas/build-5.sh 2010-06-05 09:29:47 UTC (rev 7400) @@ -33,7 +33,11 @@ # Header files to install HEADERS_INSTALL= +HEADERS_BUILD_INSTALL= +# install subdirectory below $PREFIX/$INC_DIR (if any) +INCLUDE_SUBDIR= + # License file(s) to install LICENSE_INSTALL="README" @@ -81,16 +85,7 @@ ${CP} ${CP_FLAGS} ${BUILDDIR}/lib/libcblas.dll.a $PREFIX/$LIB_DIR ${CP} ${CP_FLAGS} ${BUILDDIR}/lib/libcblas.a $PREFIX/$STATICLIB_DIR - # Install headers - for a in $HEADERS_INSTALL; do - ${CP} ${CP_FLAGS} ${SRCDIR}/$a $PREFIX/$INC_DIR - done - - # Install license file - for a in $LICENSE_INSTALL; do - ${CP} ${CP_FLAGS} ${SRCDIR}/$a $PREFIX/$LIC_DIR/$PKG - done - + install_common; install_post; } @@ -109,16 +104,7 @@ ${RM} ${RM_FLAGS} $PREFIX/$LIB_DIR/libcblas.dll.a ${RM} ${RM_FLAGS} $PREFIX/$STATICLIB_DIR/libcblas.a - # Uninstall headers - for a in $HEADERS_INSTALL; do - ${RM} ${RM_FLAGS} $PREFIX/$INC_DIR/$a - done - - # Uninstall license file - for a in $LICENSE_INSTALL; do - ${RM} ${RM_FLAGS} $PREFIX/$LIC_DIR/$PKG/$a - done - + uninstall_common; uninstall_post; } Modified: trunk/octave-forge/admin/Windows/mingw32/expat/build-2.0.1-5.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/expat/build-2.0.1-5.sh 2010-06-04 04:49:12 UTC (rev 7399) +++ trunk/octave-forge/admin/Windows/mingw32/expat/build-2.0.1-5.sh 2010-06-05 09:29:47 UTC (rev 7400) @@ -32,8 +32,12 @@ MAKE_XTRA= # Header files to install -HEADERS_INSTALL="expat.h expat_external.h" +HEADERS_INSTALL="lib/expat.h lib/expat_external.h" +HEADERS_BUILD_INSTALL= +# install subdirectory below $PREFIX/$INC_DIR (if any) +INCLUDE_SUBDIR= + # License file(s) to install LICENSE_INSTALL="COPYING" @@ -65,21 +69,7 @@ ${CP} ${CP_FLAGS} ${BUILDDIR}/.libs/libexpat.dll.a $PREFIX/$LIB_DIR ${CP} ${CP_FLAGS} ${BUILDDIR}/.libs/libexpat.a $PREFIX/$STATICLIB_DIR - # Install pkg-config .pc files - for a in $PKG_CONFIG_INSTALL; do - ${CP} ${CP_FLAGS} ${BUILDDIR}/$a $PREFIX/$PKGCONFIG_DIR - done - - # Install headers - for a in $HEADERS_INSTALL; do - ${CP} ${CP_FLAGS} ${SRCDIR}/lib/$a $PREFIX/$INC_DIR - done - - # Install license file - for a in $LICENSE_INSTALL; do - ${CP} ${CP_FLAGS} ${SRCDIR}/$a $PREFIX/$LIC_DIR/$PKG - done - + install_common; install_post; } @@ -88,6 +78,7 @@ install; $STRIP $STRIP_FLAGS $PREFIX/$BIN_DIR/expat.dll } + uninstall() { uninstall_pre; @@ -97,21 +88,7 @@ ${RM} ${RM_FLAGS} $PREFIX/$LIB_DIR/libexpat.dll.a ${RM} ${RM_FLAGS} $PREFIX/$STATICLIB_DIR/libexpat.a - # Uninstall headers - for a in $HEADERS_INSTALL; do - ${RM} ${RM_FLAGS} $PREFIX/$INC_DIR/$a - done - - # Uninstall pkg-config .pc files - for a in $PKG_CONFIG_INSTALL; do - ${RM} ${RM_FLAGS} $PREFIX/$PKGCONFIG_DIR/$a - done - - # Uninstall license file - for a in $LICENSE_INSTALL; do - ${RM} ${RM_FLAGS} $PREFIX/$LIC_DIR/$PKG/$a - done - + uninstall_common; uninstall_post; } Modified: trunk/octave-forge/admin/Windows/mingw32/fftw3/build-3.2.2-5.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/fftw3/build-3.2.2-5.sh 2010-06-04 04:49:12 UTC (rev 7399) +++ trunk/octave-forge/admin/Windows/mingw32/fftw3/build-3.2.2-5.sh 2010-06-05 09:29:47 UTC (rev 7400) @@ -32,8 +32,12 @@ MAKE_XTRA= # Header files to install -HEADERS_INSTALL="fftw3.h" +HEADERS_INSTALL="api/fftw3.h" +HEADERS_BUILD_INSTALL= +# install subdirectory below $PREFIX/$INC_DIR (if any) +INCLUDE_SUBDIR= + # License file(s) to install LICENSE_INSTALL="COPYING COPYRIGHT" @@ -138,22 +142,10 @@ ${CP} ${CP_FLAGS} $BUILDDIR_SINGLE/.libs/libfftw3f.dll.a $PREFIX/$LIB_DIR ${CP} ${CP_FLAGS} $BUILDDIR_SINGLE/.libs/libfftw3f.a $PREFIX/$STATICLIB_DIR - # Install pkg-config .pc files - for a in $PKG_CONFIG_INSTALL; do - ${CP} ${CP_FLAGS} $BUILDDIR_DOUBLE/$a $PREFIX/$PKGCONFIG_DIR - ${CP} ${CP_FLAGS} $BUILDDIR_SINGLE/$a $PREFIX/$PKGCONFIG_DIR - done - - # Install headers - for a in $HEADERS_INSTALL; do - ${CP} ${CP_FLAGS} ${SRCDIR}/api/$a $PREFIX/$INC_DIR - done - - # Install license file - for a in $LICENSE_INSTALL; do - ${CP} ${CP_FLAGS} ${SRCDIR}/$a $PREFIX/$LIC_DIR/$PKG - done - + BUILDDIR=$BUILDDIR_DOUBLE + install_common; + BUILDDIR=$BUILDDIR_SINGLE + install_common; install_post; } @@ -177,21 +169,7 @@ ${RM} ${RM_FLAGS} $PREFIX/$LIB_DIR/libfftw3f.dll.a ${RM} ${RM_FLAGS} $PREFIX/$STATICLIB_DIR/libfftw3f.a - # Uninstall headers - for a in $HEADERS_INSTALL; do - ${RM} ${RM_FLAGS} $PREFIX/$INC_DIR/$a - done - - # Uninstall pkg-config .pc files - for a in $PKG_CONFIG_INSTALL; do - ${RM} ${RM_FLAGS} $PREFIX/$PKGCONFIG_DIR/$a - done - - # Uninstall license file - for a in $LICENSE_INSTALL; do - ${RM} ${RM_FLAGS} $PREFIX/$LIC_DIR/$PKG/$a - done - + uninstall_common; uninstall_post; } Modified: trunk/octave-forge/admin/Windows/mingw32/gcc45_common.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/gcc45_common.sh 2010-06-04 04:49:12 UTC (rev 7399) +++ trunk/octave-forge/admin/Windows/mingw32/gcc45_common.sh 2010-06-05 09:29:47 UTC (rev 7400) @@ -320,6 +320,26 @@ install_post } install_post() { echo ; } +install_common() +{ + # Install pkg-config .pc files + for a in $PKG_CONFIG_INSTALL; do + ${CP} ${CP_FLAGS} $BUILDDIR/$a $PREFIX/$PKGCONFIG_DIR + done + + # Install headers + for a in $HEADERS_INSTALL; do + ${CP} ${CP_FLAGS} $SRCDIR/$a $PREFIX/${INC_DIR}${INC_SUBDIR:+/$INC_SUBDIR}/`basename $a` + done + for a in $HEADERS_BUILD_INSTALL; do + ${CP} ${CP_FLAGS} $BUILDDIR/$a $PREFIX/${INC_DIR}${INC_SUBDIR:+/$INC_SUBDIR}/`basename $a` + done + + # Install license file + for a in $LICENSE_INSTALL; do + ${CP} ${CP_FLAGS} $SRCDIR/$a $PREFIX/$LIC_DIR/$PKG + done +} # == uninstall == uninstall_pre() { echo ; } @@ -336,8 +356,24 @@ rmdir --ignore-fail-on-non-empty $PREFIX/$a done } +uninstall_common() +{ + # Uninstall headers + for a in $HEADERS_INSTALL $HEADERS_BUILD_INSTALL; do + ${RM} ${RM_FLAGS} $PREFIX/$INC_DIR/`basename $a` + done + + # Uninstall pkg-config .pc files + for a in $PKG_CONFIG_INSTALL; do + ${RM} ${RM_FLAGS} $PREFIX/$PKGCONFIG_DIR/`basename $a` + done + + # Uninstall license file + for a in $LICENSE_INSTALL; do + ${RM} ${RM_FLAGS} $PREFIX/$LIC_DIR/$PKG/`basename $a` + done +} - # == modify libtool == modify_libtool_all() { Modified: trunk/octave-forge/admin/Windows/mingw32/lapack/build-3.2.1-5.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/lapack/build-3.2.1-5.sh 2010-06-04 04:49:12 UTC (rev 7399) +++ trunk/octave-forge/admin/Windows/mingw32/lapack/build-3.2.1-5.sh 2010-06-05 09:29:47 UTC (rev 7400) @@ -33,7 +33,11 @@ # Header files to install HEADERS_INSTALL= +HEADERS_BUILD_INSTALL= +# install subdirectory below $PREFIX/$INC_DIR (if any) +INCLUDE_SUBDIR= + # License file(s) to install LICENSE_INSTALL="LICENSE" @@ -83,16 +87,7 @@ ${CP} ${CP_FLAGS} ${BUILDDIR}/liblapack.dll.a $PREFIX/$LIB_DIR ${CP} ${CP_FLAGS} ${BUILDDIR}/liblapack.a $PREFIX/$STATICLIB_DIR - # Install headers - for a in $HEADERS_INSTALL; do - ${CP} ${CP_FLAGS} ${SRCDIR}/$a $PREFIX/$INC_DIR - done - - # Install license file - for a in $LICENSE_INSTALL; do - ${CP} ${CP_FLAGS} ${SRCDIR}/$a $PREFIX/$LIC_DIR/$PKG - done - + install_common; install_post; } @@ -111,16 +106,7 @@ ${RM} ${RM_FLAGS} $PREFIX/$LIB_DIR/liblapack.dll.a ${RM} ${RM_FLAGS} $PREFIX/$STATICLIB_DIR/liblapack.a - # Uninstall headers - for a in $HEADERS_INSTALL; do - ${RM} ${RM_FLAGS} $PREFIX/$INC_DIR/$a - done - - # Uninstall license file - for a in $LICENSE_INSTALL; do - ${RM} ${RM_FLAGS} $PREFIX/$LIC_DIR/$PKG/$a - done - + uninstall_common; uninstall_post; } Modified: trunk/octave-forge/admin/Windows/mingw32/libncurses/build-5.7-5.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/libncurses/build-5.7-5.sh 2010-06-04 04:49:12 UTC (rev 7399) +++ trunk/octave-forge/admin/Windows/mingw32/libncurses/build-5.7-5.sh 2010-06-05 09:29:47 UTC (rev 7400) @@ -34,8 +34,17 @@ MAKE_XTRA= # Header files to install -HEADERS_INSTALL="term.h curses.h unctrl.h termcap.h ncurses_dll.h" +HEADERS_INSTALL= +HEADERS_BUILD_INSTALL=" +include/term.h +include/curses.h +include/unctrl.h +include/termcap.h +include/ncurses_dll.h" +# install subdirectory below $PREFIX/$INC_DIR (if any) +INCLUDE_SUBDIR= + # License file(s) to install LICENSE_INSTALL="README" @@ -139,24 +148,10 @@ ${CP} ${CP_FLAGS} ${BUILDDIR}/lib/.libs/lib$a.a $PREFIX/$STATICLIB_DIR done - # Install pkg-config .pc files - for a in $PKG_CONFIG_INSTALL; do - ${CP} ${CP_FLAGS} ${BUILDDIR}/$a $PREFIX/$PKGCONFIG_DIR - done - - # Install headers - for a in $HEADERS_INSTALL; do - ${CP} ${CP_FLAGS} ${BUILDDIR}/include/$a $PREFIX/$INC_DIR - done - ( cd ${BUILDDIR}/misc && make install prefix=$PREFIX ticdir=$PREFIX/share/terminfo ) # ${RM} ${RM_FLAGS} $PREFIX/$BIN_DIR/ncurses5-config - - # Install license file - for a in $LICENSE_INSTALL; do - ${CP} ${CP_FLAGS} ${SRCDIR}/$a $PREFIX/$LIC_DIR/$PKG - done + install_common; install_post; } @@ -179,24 +174,10 @@ ${RM} ${RM_FLAGS} $PREFIX/$STATICLIB_DIR/lib$a.a done - # Uninstall headers - for a in $HEADERS_INSTALL $HEADERS2_INSTALL ncurses.h; do - ${RM} ${RM_FLAGS} $PREFIX/$INC_DIR/$a - done - - # Uninstall pkg-config .pc files - for a in $PKG_CONFIG_INSTALL; do - ${RM} ${RM_FLAGS} $PREFIX/$PKGCONFIG_DIR/$a - done - ${RM} -rvf $PREFIX/$SHARE_DIR/terminfo ${RM} -rvf $PREFIX/$SHARE_DIR/tabset - - # Uninstall license file - for a in $LICENSE_INSTALL; do - ${RM} ${RM_FLAGS} $PREFIX/$LIC_DIR/$PKG/$a - done - + + uninstall_common; uninstall_post; } Modified: trunk/octave-forge/admin/Windows/mingw32/qrupdate/build-1.1.1-5.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/qrupdate/build-1.1.1-5.sh 2010-06-04 04:49:12 UTC (rev 7399) +++ trunk/octave-forge/admin/Windows/mingw32/qrupdate/build-1.1.1-5.sh 2010-06-05 09:29:47 UTC (rev 7400) @@ -33,7 +33,11 @@ # Header files to install HEADERS_INSTALL= +HEADERS_BUILD_INSTALL= +# install subdirectory below $PREFIX/$INC_DIR (if any) +INCLUDE_SUBDIR= + # License file(s) to install LICENSE_INSTALL="COPYING " @@ -96,16 +100,7 @@ ${CP} ${CP_FLAGS} ${BUILDDIR}/libqrupdate.dll.a $PREFIX/$LIB_DIR ${CP} ${CP_FLAGS} ${BUILDDIR}/libqrupdate.a $PREFIX/$STATICLIB_DIR - # Install headers - for a in $HEADERS_INSTALL; do - ${CP} ${CP_FLAGS} ${SRCDIR}/$a $PREFIX/$INC_DIR - done - - # Install license file - for a in $LICENSE_INSTALL; do - ${CP} ${CP_FLAGS} ${SRCDIR}/$a $PREFIX/$LIC_DIR/$PKG - done - + install_common; install_post; } @@ -124,16 +119,7 @@ ${RM} ${RM_FLAGS} $PREFIX/$LIB_DIR/libqrupdate.dll.a ${RM} ${RM_FLAGS} $PREFIX/$STATICLIB_DIR/libqrupdate.a - # Uninstall headers - for a in $HEADERS_INSTALL; do - ${RM} ${RM_FLAGS} $PREFIX/$INC_DIR/$a - done - - # Uninstall license file - for a in $LICENSE_INSTALL; do - ${RM} ${RM_FLAGS} $PREFIX/$LIC_DIR/$PKG/$a - done - + uninstall_common; uninstall_post; } Modified: trunk/octave-forge/admin/Windows/mingw32/zlib/build-1.2.5-5.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/zlib/build-1.2.5-5.sh 2010-06-04 04:49:12 UTC (rev 7399) +++ trunk/octave-forge/admin/Windows/mingw32/zlib/build-1.2.5-5.sh 2010-06-05 09:29:47 UTC (rev 7400) @@ -33,7 +33,11 @@ # Header files to install HEADERS_INSTALL="zlib.h zconf.h" +HEADERS_BUILD_INSTALL= +# install subdirectory below $PREFIX/$INC_DIR (if any) +INCLUDE_SUBDIR= + # License file(s) to install LICENSE_INSTALL="README" @@ -73,21 +77,7 @@ ${CP} ${CP_FLAGS} ${BUILDDIR}/libz.dll.a $PREFIX/$LIB_DIR ${CP} ${CP_FLAGS} ${BUILDDIR}/libz.a $PREFIX/$STATICLIB_DIR - # Install pkg-config .pc files - for a in $PKG_CONFIG_INSTALL; do - ${CP} ${CP_FLAGS} ${BUILDDIR}/$a $PREFIX/$PKGCONFIG_DIR - done - - # Install headers - for a in $HEADERS_INSTALL; do - ${CP} ${CP_FLAGS} ${SRCDIR}/$a $PREFIX/$INC_DIR - done - - # Install license file - for a in $LICENSE_INSTALL; do - ${CP} ${CP_FLAGS} ${SRCDIR}/$a $PREFIX/$LIC_DIR/$PKG - done - + install_common; install_post; } @@ -106,21 +96,7 @@ ${RM} ${RM_FLAGS} $PREFIX/$LIB_DIR/libz.dll.a ${RM} ${RM_FLAGS} $PREFIX/$STATICLIB_DIR/libz.a - # Uninstall headers - for a in $HEADERS_INSTALL; do - ${RM} ${RM_FLAGS} $PREFIX/$INC_DIR/$a - done - - # Uninstall pkg-config .pc files - for a in $PKG_CONFIG_INSTALL; do - ${RM} ${RM_FLAGS} $PREFIX/$PKGCONFIG_DIR/$a - done - - # Uninstall license file - for a in $LICENSE_INSTALL; do - ${RM} ${RM_FLAGS} $PREFIX/$LIC_DIR/$PKG/$a - done - + uninstall_common; uninstall_post; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lin...@us...> - 2010-06-05 16:38:27
|
Revision: 7403 http://octave.svn.sourceforge.net/octave/?rev=7403&view=rev Author: lindnerb Date: 2010-06-05 16:38:20 +0000 (Sat, 05 Jun 2010) Log Message: ----------- mingw32 (gcc-4.5.0): add libpng, libtiff and libjpeg Modified Paths: -------------- trunk/octave-forge/admin/Windows/mingw32/gcc45_build_deps.sh Added Paths: ----------- trunk/octave-forge/admin/Windows/mingw32/libjpeg/build-8b-5.sh trunk/octave-forge/admin/Windows/mingw32/libpng/build-1.2.43-5.sh trunk/octave-forge/admin/Windows/mingw32/libpng/libpng-1.2.43-5.patch trunk/octave-forge/admin/Windows/mingw32/libtiff/build-3.9.2-5.sh Modified: trunk/octave-forge/admin/Windows/mingw32/gcc45_build_deps.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/gcc45_build_deps.sh 2010-06-05 09:31:27 UTC (rev 7402) +++ trunk/octave-forge/admin/Windows/mingw32/gcc45_build_deps.sh 2010-06-05 16:38:20 UTC (rev 7403) @@ -23,6 +23,10 @@ VER_FFTW3=5.7-$REL VER_PCRE=8.00-$REL +VER_JPEG=8b-$REL +VER_TIFF=3.9.2-$REL +VER_PNG=1.2.43-$REL + # Mind the dependency of libraries: # CBLAS depends on BLAS # LAPACK depends on BLAS @@ -57,4 +61,6 @@ ( cd fftw3 && build-${VER_FFTW3}.sh ${ACTION} ); ( cd pcre && build-${VER_PCRE}.sh ${ACTION} ); - +( cd libjpeg && build-${VER_JPEG}.sh ${ACTION} ); +( cd libtiff && build-${VER_TIFF}.sh ${ACTION} ); +( cd libpng && build-${VER_PNG}.sh ${ACTION} ); Added: trunk/octave-forge/admin/Windows/mingw32/libjpeg/build-8b-5.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/libjpeg/build-8b-5.sh (rev 0) +++ trunk/octave-forge/admin/Windows/mingw32/libjpeg/build-8b-5.sh 2010-06-05 16:38:20 UTC (rev 7403) @@ -0,0 +1,116 @@ +#! /usr/bin/sh + +# Name of package +PKG=jpeg +# Version of Package +VER=8b +# Release of (this patched) package +REL=5 +# Name&Version of Package +PKGVER=${PKG}-${VER} +# Full name of this patched Package +FULLPKG=${PKGVER}-${REL} + +# Name of source file(s) +SRCFILE=jpegsrc.v$VER.tar.gz +# Name of Patch file +PATCHFILE=${FULLPKG}.patch + +# URL(s) of source code file(s) +URL="http://www.ijg.org/files/jpegsrc.v$VER.tar.gz" + +# Top dir of this building process (i.e. where the patch file and source file(s) reside) +TOPDIR=`pwd` +# Directory source code is extraced to (relative to TOPDIR) +SRCDIR=${PKGVER} +# Directory original source code is extracted to (for generating diffs) (relative to TOPDIR) +SRCDIR_ORIG=${SRCDIR}-orig + +# Make file to use (optional) +MAKEFILE= +# Any extra flags to pass make to +MAKE_XTRA= + +# Header files to install +HEADERS_INSTALL="jpeglib.h jmorecfg.h jerror.h" +HEADERS_BUILD_INSTALL="jconfig.h" + +# install subdirectory below $PREFIX/$INC_DIR (if any) +INCLUDE_SUBDIR= + +# License file(s) to install +LICENSE_INSTALL="README" + +# pkg-config .pc files to install +PKG_CONFIG_INSTALL="" + +# Additional DIFF Flags for generating diff file +DIFF_FLAGS= + +# load common functions +source ../gcc45_common.sh + +# Directory the lib is built in (set this *after* loading gcc45_common.sh) +BUILDDIR=".build_${BUILD_TARGET}_${FULLPKG}_gcc${GCC_VERSION}${GCC_SYSTEM}" + +# == override resp. specify build actions == + +conf_pre() +{ + echo; +} + +conf_post() +{ + modify_libtool_nolibprefix ${BUILDDIR}/libtool +} + +install() +{ + install_pre; + + # Install library, import library and static library + ${CP} ${CP_FLAGS} ${BUILDDIR}/.libs/jpeg-8.dll $PREFIX/$BIN_DIR + ${CP} ${CP_FLAGS} ${BUILDDIR}/.libs/libjpeg.dll.a $PREFIX/$LIB_DIR + ${CP} ${CP_FLAGS} ${BUILDDIR}/.libs/libjpeg.a $PREFIX/$STATICLIB_DIR + + install_common; + install_post; +} + +install_strip() +{ + install + $STRIP $STRIP_FLAGS $PREFIX/$BIN_DIR/jpeg-8.dll +} + +uninstall() +{ + uninstall_pre; + + # Install library, import library and static library + ${RM} ${RM_FLAGS} ${SHAREDLIB_PATH}/jpeg-8.dll + ${RM} ${RM_FLAGS} ${LIBRARY_PATH}/libjpeg.dll.a + ${RM} ${RM_FLAGS} ${STATICLIB_PATH}/libjpeg.a + + uninstall_common; + uninstall_post; +} + +pkg_pre() +{ + # No extra patch required + PATCHFILE="" +} + +all() { + download + unpack + applypatch + mkdirs + conf + build + install +} + +main $* Added: trunk/octave-forge/admin/Windows/mingw32/libpng/build-1.2.43-5.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/libpng/build-1.2.43-5.sh (rev 0) +++ trunk/octave-forge/admin/Windows/mingw32/libpng/build-1.2.43-5.sh 2010-06-05 16:38:20 UTC (rev 7403) @@ -0,0 +1,111 @@ +#! /usr/bin/sh + +# Name of package +PKG=libpng +# Version of Package +VER=1.2.43 +# Release of (this patched) package +REL=5 +# Name&Version of Package +PKGVER=${PKG}-${VER} +# Full name of this patched Package +FULLPKG=${PKGVER}-${REL} + +# Name of source file(s) +SRCFILE=${PKGVER}.tar.xz +# Name of Patch file +PATCHFILE=${FULLPKG}.patch + +# URL(s) of source code file(s) +URL="ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-$VER.tar.xz" + +# Top dir of this building process (i.e. where the patch file and source file(s) reside) +TOPDIR=`pwd` +# Directory source code is extraced to (relative to TOPDIR) +SRCDIR=${PKGVER} +# Directory original source code is extracted to (for generating diffs) (relative to TOPDIR) +SRCDIR_ORIG=${SRCDIR}-orig + +# Make file to use (optional) +MAKEFILE=makefile.mingw +# Any extra flags to pass make to +MAKE_XTRA= + +# Header files to install +HEADERS_INSTALL="png.h pngconf.h" +HEADERS_BUILD_INSTALL="" + +# install subdirectory below $PREFIX/$INC_DIR (if any) +INCLUDE_SUBDIR= + +# License file(s) to install +LICENSE_INSTALL="LICENSE" + +# pkg-config .pc files to install +PKG_CONFIG_INSTALL="libpng.pc" + +# Additional DIFF Flags for generating diff file +DIFF_FLAGS= + +# load common functions +source ../gcc45_common.sh + +# Directory the lib is built in (set this *after* loading gcc45_common.sh) +BUILDDIR=".build_${BUILD_TARGET}_${FULLPKG}_gcc${GCC_VERSION}${GCC_SYSTEM}" + +# == override resp. specify build actions == + +# Set *after* sourceing gcc45_common.sh, since we require $PREFIX to be set +MAKE_XTRA="prefix=$PREFIX" + +conf() +{ + conf_pre; + substvars ${SRCDIR}/scripts/${MAKEFILE} ${BUILDDIR}/${MAKEFILE} + conf_post; +} + +install() +{ + install_pre; + + # Install library, import library and static library + ${CP} ${CP_FLAGS} ${BUILDDIR}/png12.dll $PREFIX/$BIN_DIR + ${CP} ${CP_FLAGS} ${BUILDDIR}/libpng.dll.a $PREFIX/$LIB_DIR + ${CP} ${CP_FLAGS} ${BUILDDIR}/libpng.a $PREFIX/$STATICLIB_DIR + + install_common; + install_post; +} + +uninstall() +{ + uninstall_pre; + + # Install library, import library and static library + ${RM} ${RM_FLAGS} $PREFIX/$BIN_DIR/png12.dll + ${RM} ${RM_FLAGS} $PREFIX/$LIB_DIR/libpng.dll.a + ${RM} ${RM_FLAGS} $PREFIX/$STATICLIB_DIR/libpng.a + + uninstall_common; + uninstall_post; +} + +check() +{ + check_pre; + ( cd ${BUILDDIR} && make_common test ) + check_post; +} + +all() { + download + unpack + applypatch + mkdirs + conf + build + install +} + +main $* Added: trunk/octave-forge/admin/Windows/mingw32/libpng/libpng-1.2.43-5.patch =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/libpng/libpng-1.2.43-5.patch (rev 0) +++ trunk/octave-forge/admin/Windows/mingw32/libpng/libpng-1.2.43-5.patch 2010-06-05 16:38:20 UTC (rev 7403) @@ -0,0 +1,121 @@ +diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg -x '*.orig' -x '*.rej' libpng-1.2.43-orig/scripts/libpng.pc.in libpng-1.2.43/scripts/libpng.pc.in +--- libpng-1.2.43-orig/scripts/libpng.pc.in 2010-02-25 12:55:53 +0100 ++++ libpng-1.2.43/scripts/libpng.pc.in 2010-06-05 18:28:25 +0200 +@@ -1,7 +1,7 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ + libdir=@libdir@ +-includedir=@includedir@/libpng12 ++includedir=@includedir@ + + Name: libpng + Description: Loads and saves PNG files +diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg -x '*.orig' -x '*.rej' libpng-1.2.43-orig/scripts/makefile.mingw libpng-1.2.43/scripts/makefile.mingw +--- libpng-1.2.43-orig/scripts/makefile.mingw 2010-02-25 12:55:54 +0100 ++++ libpng-1.2.43/scripts/makefile.mingw 2010-06-05 18:28:25 +0200 +@@ -18,6 +18,8 @@ + # the MINGW project) and not under CMD.EXE which does not provide + # "cat" or "sed". + ++SRCDIR=@SRCDIR@ ++ + # This makefile intends to support building outside the src directory + # if desired. When invoking it, specify an argument to SRCDIR on the + # command line that points to the top of the directory where your source +@@ -40,9 +42,9 @@ + + # If you're using a cross-compiler, add the appropriate prefix (e.g., + # "i386-mingw32msvc-") to the following three commands: +-CC=gcc +-AR=ar +-RANLIB=ranlib ++CC?=gcc ++AR?=ar ++RANLIB?=ranlib + + MKDIR_P=/bin/mkdir -pv + +@@ -74,9 +76,9 @@ + # -W -Wall -O $(ALIGN) -funroll-loops \ + # -fomit-frame-pointer) # $(WARNMORE) -g -DPNG_DEBUG=5 + ### Normal (non-asm) compilation +-CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ +- -W -Wall -O3 $(ALIGN) -funroll-loops -DPNG_NO_MMX_CODE \ +- -fomit-frame-pointer) # $(WARNMORE) -g -DPNG_DEBUG=5 ++override CFLAGS += \ ++ -Wall -O3 $(ALIGN) -funroll-loops -DPNG_NO_MMX_CODE \ ++ -fomit-frame-pointer # $(WARNMORE) -g -DPNG_DEBUG=5 + + LIBNAME = libpng12 + PNGMAJ = 0 +@@ -84,16 +86,17 @@ + PNGMIN = 1.2.43 + PNGVER = $(PNGMAJ).$(PNGMIN) + +-SHAREDLIB=libpng$(MINGDLL).dll ++SHAREDLIB=png$(MINGDLL).dll + STATLIB=libpng.a + IMPLIB=libpng.dll.a + SHAREDDEF=libpng.def + LIBS=$(SHAREDLIB) $(STATLIB) + EXE=.exe + +-LDFLAGS=$(strip -L. $(MINGW_LDFLAGS) -lpng $(addprefix -L,$(ZLIBLIB)) -lz) +-LDSFLAGS=$(strip -shared -L. $(MINGW_LDFLAGS)) +-LDEXTRA=-Wl,--out-implib=$(IMPLIB) $(addprefix -L,$(ZLIBLIB)) -lz ++#LDFLAGS=$(strip -L. $(MINGW_LDFLAGS) -lpng $(addprefix -L,$(ZLIBLIB)) -lz) ++#LDSFLAGS=$(strip -shared -L. $(MINGW_LDFLAGS)) ++LDSFLAGS=$(LDFLAGS) ++LDEXTRA=-Wl,--out-implib=$(IMPLIB) -lz + + INCPATH=$(prefix)/include + LIBPATH=$(exec_prefix)/lib +@@ -120,9 +123,8 @@ + + %.o : %.c + $(CC) -c $(CFLAGS) -o $@ $< +-%.pic.o : CFLAGS += -DPNG_BUILD_DLL + %.pic.o : %.c +- $(CC) -c $(CFLAGS) -o $@ $< ++ $(CC) -c $(CFLAGS) -DPNG_BUILD_DLL -o $@ $< + + all: all-static all-shared libpng.pc libpng-config libpng.pc libpng-config + +@@ -134,15 +136,16 @@ + $(addprefix $(D),$(INCPATH)'\n' $(LIBPATH)'\n' $(BINPATH)'\n' \ + $(MANPATH)'\n' $(MAN3PATH)'\n' $(MAN5PATH)'\n')'\n' + +-libpng.pc: scripts/libpng.pc.in ++libpng.pc: $(SRCDIR)/scripts/libpng.pc.in + @echo -e Making pkg-config file for this libpng installation..'\n' \ + using PREFIX=\"$(prefix)\"'\n' +- cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \ ++ cat $< | sed -e s!@prefix@!$(prefix)! \ + -e s!@exec_prefix@!$(exec_prefix)! \ + -e s!@libdir@!$(LIBPATH)! \ + -e s!@includedir@!$(INCPATH)! \ +- -e s!@includedir@!$(INCPATH)! \ +- -e s!-lpng12!-lpng12\ -lz\ -lm! > libpng.pc ++ -e s!-lpng12!-lpng\ -lz\ -lm! \ ++ -e 's!-L[^ ]\+!!g' \ ++ -e 's!-I[^ ]\+!!g' > libpng.pc + + libpng-config: scripts/libpng-config-head.in scripts/libpng-config-body.in + @echo -e Making $(LIBNAME) libpng-config file for this libpng \ +@@ -169,13 +172,13 @@ + sed -e 's/\([^;]*\);/;/' > $@ + + $(SHAREDLIB): $(OBJSDLL) $(SHAREDDEF) +- $(CC) $(LDSFLAGS) -o $@ $(OBJSDLL) -L. $(LDEXTRA) ++ $(CC) -shared $(LDSFLAGS) -o $@ $(OBJSDLL) $(SHAREDDEF) -L. $(LDEXTRA) + + pngtest$(EXE): pngtest.pic.o $(SHAREDLIB) +- $(CC) $(CFLAGS) $< $(LDFLAGS) -o $@ ++ $(CC) -WL,-Bdynamic $< $(LDFLAGS) -o $@ -L. -lpng -lz + + pngtest-stat$(EXE): pngtest.o $(STATLIB) +- $(CC) -static $(CFLAGS) $< $(LDFLAGS) -o $@ ++ $(CC) -Wl,-Bstatic $< $(LDFLAGS) -o $@ -L. -lpng -L$(prefix)/staticlib -lz + + test: test-static test-shared + Added: trunk/octave-forge/admin/Windows/mingw32/libtiff/build-3.9.2-5.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/libtiff/build-3.9.2-5.sh (rev 0) +++ trunk/octave-forge/admin/Windows/mingw32/libtiff/build-3.9.2-5.sh 2010-06-05 16:38:20 UTC (rev 7403) @@ -0,0 +1,121 @@ +#! /usr/bin/sh + +# Name of package +PKG=tiff +# Version of Package +VER=3.9.2 +# Release of (this patched) package +REL=5 +# Name&Version of Package +PKGVER=${PKG}-${VER} +# Full name of this patched Package +FULLPKG=${PKGVER}-${REL} + +# Name of source file(s) +SRCFILE=${PKGVER}.tar.gz +# Name of Patch file +PATCHFILE=${FULLPKG}.patch + +# URL(s) of source code file(s) +URL="ftp://ftp.remotesensing.org/pub/libtiff/tiff-$VER.tar.gz" + +# Top dir of this building process (i.e. where the patch file and source file(s) reside) +TOPDIR=`pwd` +# Directory source code is extraced to (relative to TOPDIR) +SRCDIR=${PKGVER} +# Directory original source code is extracted to (for generating diffs) (relative to TOPDIR) +SRCDIR_ORIG=${SRCDIR}-orig + +# Make file to use (optional) +MAKEFILE= +# Any extra flags to pass make to +MAKE_XTRA= + +# Header files to install +HEADERS_INSTALL=" +libtiff/tiff.h +libtiff/tiffvers.h +libtiff/tiffio.h" +HEADERS_BUILD_INSTALL=" +libtiff/tiffconf.h" + +# install subdirectory below $PREFIX/$INC_DIR (if any) +INCLUDE_SUBDIR= + +# License file(s) to install +LICENSE_INSTALL="COPYRIGHT" + +# pkg-config .pc files to install +PKG_CONFIG_INSTALL="" + +# Additional DIFF Flags for generating diff file +DIFF_FLAGS= + +# load common functions +source ../gcc45_common.sh + +# Directory the lib is built in (set this *after* loading gcc45_common.sh) +BUILDDIR=".build_${BUILD_TARGET}_${FULLPKG}_gcc${GCC_VERSION}${GCC_SYSTEM}" + +# == override resp. specify build actions == + +conf_pre() +{ + CONFIGURE_XTRA_ARGS="\ + --disable-cxx" +} + +conf_post() +{ + modify_libtool_nolibprefix ${BUILDDIR}/libtool +} + +install() +{ + install_pre; + + # Install library, import library and static library + ${CP} ${CP_FLAGS} ${BUILDDIR}/libtiff/.libs/tiff-3.dll $PREFIX/$BIN_DIR + ${CP} ${CP_FLAGS} ${BUILDDIR}/libtiff/.libs/libtiff.dll.a $PREFIX/$LIB_DIR + ${CP} ${CP_FLAGS} ${BUILDDIR}/libtiff/.libs/libtiff.a $PREFIX/$STATICLIB_DIR + + install_common; + install_post; +} + +install_strip() +{ + install; + $STRIP $STRIP_FLAGS $PREFIX/$BIN_DIR/tiff-3.dll +} + +uninstall() +{ + uninstall_pre; + + # Install library, import library and static library + ${RM} ${RM_FLAGS} $PREFIX/$BIN_DIR/tiff-3.dll + ${RM} ${RM_FLAGS} $PREFIX/$LIB_DIR/libtiff.dll.a + ${RM} ${RM_FLAGS} $PREFIX/$STATICLIB_DIR/libtiff.a + + uninstall_common; + uninstall_post; +} + +pkg_pre() +{ + # No extra patch required + PATCHFILE="" +} + +all() { + download + unpack + applypatch + mkdirs + conf + build + install +} + +main $* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lin...@us...> - 2010-06-06 15:13:42
|
Revision: 7405 http://octave.svn.sourceforge.net/octave/?rev=7405&view=rev Author: lindnerb Date: 2010-06-06 15:13:35 +0000 (Sun, 06 Jun 2010) Log Message: ----------- mingw32 (gcc-4.5.0): add gmp/glpk/freetype/fontconfig/fltk/iconv/gettext, adapt gcc45_common.sh adaptions to gcc45_common.sh: *) call configure with relative path in --srcdir because GMP requires it *) add $PREFIX/bin to path before calling configure *) include $INC_SUBDIR in install_pre and uninstall_post Modified Paths: -------------- trunk/octave-forge/admin/Windows/mingw32/gcc45_build_deps.sh trunk/octave-forge/admin/Windows/mingw32/gcc45_common.sh Added Paths: ----------- trunk/octave-forge/admin/Windows/mingw32/fltk/build-1.1.10-5.sh trunk/octave-forge/admin/Windows/mingw32/fltk/fltk-1.1.10-5.patch trunk/octave-forge/admin/Windows/mingw32/gettext/build-0.17-5.sh trunk/octave-forge/admin/Windows/mingw32/gettext/gettext-0.17-5.patch trunk/octave-forge/admin/Windows/mingw32/glpk/build-4.43-5.sh trunk/octave-forge/admin/Windows/mingw32/glpk/glpk-4.43-5.patch trunk/octave-forge/admin/Windows/mingw32/gmp/build-5.0.1-5.sh trunk/octave-forge/admin/Windows/mingw32/iconv/build-1.13-5.sh trunk/octave-forge/admin/Windows/mingw32/libfontconfig/build-2.8.0-5.sh trunk/octave-forge/admin/Windows/mingw32/libfontconfig/fontconfig-2.8.0-5.patch trunk/octave-forge/admin/Windows/mingw32/libfreetype/build-2.3.12-5.sh trunk/octave-forge/admin/Windows/mingw32/libfreetype/freetype-2.3.12-5.patch Added: trunk/octave-forge/admin/Windows/mingw32/fltk/build-1.1.10-5.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/fltk/build-1.1.10-5.sh (rev 0) +++ trunk/octave-forge/admin/Windows/mingw32/fltk/build-1.1.10-5.sh 2010-06-06 15:13:35 UTC (rev 7405) @@ -0,0 +1,277 @@ +#! /usr/bin/sh + +# Name of package +PKG=fltk +# Version of Package +VER=1.1.10 +# Release of (this patched) package +REL=5 +# Name&Version of Package +PKGVER=${PKG}-${VER} +# Full name of this patched Package +FULLPKG=${PKGVER}-${REL} + +# Name of source file(s) +SRCFILE=${PKGVER}-source.tar.bz2 +# Name of Patch file +PATCHFILE=${FULLPKG}.patch + +# URL(s) of source code file(s) +URL="http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/$VER/fltk-$VER-source.tar.bz2" + +# Top dir of this building process (i.e. where the patch file and source file(s) reside) +TOPDIR=`pwd` +# Directory source code is extraced to (relative to TOPDIR) +SRCDIR=${PKGVER} +# Directory original source code is extracted to (for generating diffs) (relative to TOPDIR) +SRCDIR_ORIG=${SRCDIR}-orig + +# Make file to use (optional) +MAKEFILE= +# Any extra flags to pass make to +MAKE_XTRA= + +# Header files to install +HEADERS_INSTALL=" +fl/dirent.h +fl/Enumerations.H +fl/filename.H +fl/Fl.H +fl/Fl_Adjuster.H +fl/fl_ask.H +fl/Fl_Bitmap.H +fl/Fl_BMP_Image.H +fl/Fl_Box.H +fl/Fl_Browser.H +fl/Fl_Browser_.H +fl/Fl_Button.H +fl/Fl_Chart.H +fl/Fl_Check_Browser.H +fl/Fl_Check_Button.H +fl/Fl_Choice.H +fl/Fl_Clock.H +fl/Fl_Color_Chooser.H +fl/Fl_Counter.H +fl/Fl_Dial.H +fl/Fl_Double_Window.H +fl/fl_draw.H +fl/Fl_Export.H +fl/Fl_File_Browser.H +fl/Fl_File_Chooser.H +fl/Fl_File_Icon.H +fl/Fl_File_Input.H +fl/Fl_Fill_Dial.H +fl/Fl_Fill_Slider.H +fl/Fl_Float_Input.H +fl/Fl_FormsBitmap.H +fl/Fl_FormsPixmap.H +fl/Fl_Free.H +fl/Fl_GIF_Image.H +fl/Fl_Gl_Window.H +fl/Fl_Group.H +fl/Fl_Help_Dialog.H +fl/Fl_Help_View.H +fl/Fl_Hold_Browser.H +fl/Fl_Hor_Fill_Slider.H +fl/Fl_Hor_Nice_Slider.H +fl/Fl_Hor_Slider.H +fl/Fl_Hor_Value_Slider.H +fl/Fl_Image.H +fl/Fl_Input.H +fl/Fl_Input_.H +fl/Fl_Input_Choice.H +fl/Fl_Int_Input.H +fl/Fl_JPEG_Image.H +fl/Fl_Light_Button.H +fl/Fl_Line_Dial.H +fl/Fl_Menu.H +fl/Fl_Menu_.H +fl/Fl_Menu_Bar.H +fl/Fl_Menu_Button.H +fl/Fl_Menu_Item.H +fl/Fl_Menu_Window.H +fl/fl_message.H +fl/Fl_Multi_Browser.H +fl/Fl_Multi_Label.H +fl/Fl_Multiline_Input.H +fl/Fl_Multiline_Output.H +fl/Fl_Nice_Slider.H +fl/Fl_Object.H +fl/Fl_Output.H +fl/Fl_Overlay_Window.H +fl/Fl_Pack.H +fl/Fl_Pixmap.H +fl/Fl_PNG_Image.H +fl/Fl_PNM_Image.H +fl/Fl_Positioner.H +fl/Fl_Preferences.H +fl/Fl_Progress.H +fl/Fl_Radio_Button.H +fl/Fl_Radio_Light_Button.H +fl/Fl_Radio_Round_Button.H +fl/Fl_Repeat_Button.H +fl/Fl_Return_Button.H +fl/Fl_RGB_Image.H +fl/Fl_Roller.H +fl/Fl_Round_Button.H +fl/Fl_Round_Clock.H +fl/Fl_Scroll.H +fl/Fl_Scrollbar.H +fl/Fl_Secret_Input.H +fl/Fl_Select_Browser.H +fl/Fl_Shared_Image.H +fl/fl_show_colormap.H +fl/fl_show_input.H +fl/Fl_Simple_Counter.H +fl/Fl_Single_Window.H +fl/Fl_Slider.H +fl/Fl_Spinner.H +fl/Fl_Sys_Menu_Bar.H +fl/Fl_Tabs.H +fl/Fl_Text_Buffer.H +fl/Fl_Text_Display.H +fl/Fl_Text_Editor.H +fl/Fl_Tile.H +fl/Fl_Tiled_Image.H +fl/Fl_Timer.H +fl/Fl_Toggle_Button.H +fl/Fl_Toggle_Light_Button.H +fl/Fl_Toggle_Round_Button.H +fl/Fl_Tooltip.H +fl/Fl_Valuator.H +fl/Fl_Value_Input.H +fl/Fl_Value_Output.H +fl/Fl_Value_Slider.H +fl/Fl_Widget.H +fl/Fl_Window.H +fl/Fl_Wizard.H +fl/Fl_XBM_Image.H +fl/Fl_XPM_Image.H +fl/forms.H +fl/gl.h +fl/gl_draw.H +fl/gl2opengl.h +fl/glu.h +fl/glut.H +fl/mac.H +fl/math.h +fl/names.h +fl/win32.H +fl/x.H" +HEADERS_BUILD_INSTALL= + +# install subdirectory below $PREFIX/$INC_DIR (if any) +INC_SUBDIR=FL + +# License file(s) to install +LICENSE_INSTALL="COPYING" + +# pkg-config .pc files to install +PKG_CONFIG_INSTALL= + +# Additional DIFF Flags for generating diff file +DIFF_FLAGS= + +# load common functions +source ../gcc45_common.sh + +# Directory the lib is built in (set this *after* loading gcc45_common.sh) +BUILDDIR=".build_${BUILD_TARGET}_${FULLPKG}_gcc${GCC_VERSION}${GCC_SYSTEM}" + +# == override resp. specify build actions == + +mkdirs_post() +{ + mkdir -vp ${BUILDDIR}/src + mkdir -vp ${BUILDDIR}/lib +} + +conf_pre() +{ + CONFIGURE_XTRA_ARGS="\ + --enable-shared \ + --enable-gl \ + --enable-threads \ + CFLAGS=-DFL_DLL \ + CXXFLAGS=-DFL_DLL" +} + +conf_post() +{ + + substvars ${SRCDIR}/src/makefile ${BUILDDIR}/src/makefile + substvars ${SRCDIR}/makefile ${BUILDDIR}/makefile + + sed -e \ + "s@../FL@\$(SRCDIR)/FL@g" \ + ${SRCDIR}/src/makedepend > ${BUILDDIR}/src/makedepend + + # Modify fltk-config + sed \ + -e "/CFLAGS=/ s+-mwindows++g" \ + -e "/CFLAGS=/ s+-mno-cygwin++g" \ + -e "/CXXFLAGS=/ s+-mwindows++g" \ + -e "/CXXFLAGS=/ s+-mno-cygwin++g" \ + -e "/LDFLAGS=/ s+-mwindows++g" \ + -e "/LDFLAGS=/ s+-mno-cygwin++g" \ + ${BUILDDIR}/fltk-config > ${BUILDDIR}/fltk-config.mod + ${CP} ${CP_FLAGS} ${BUILDDIR}/fltk-config.mod ${BUILDDIR}/fltk-config + +} + +install() +{ + install_pre; + + # Install library, import library and static library + for a in mgwfltknox_forms-1.1.dll mgwfltknox_gl-1.1.dll mgwfltknox_images-1.1.dll mgwfltknox-1.1.dll; do + ${CP} ${CP_FLAGS} ${BUILDDIR}/src/$a $PREFIX/$BIN_DIR + done + + for a in fltk fltk_forms fltk_gl fltk_images; do + ${CP} ${CP_FLAGS} ${BUILDDIR}/src/lib$a.dll.a $PREFIX/$LIB_DIR + done + + ${CP} ${CP_FLAGS} ${BUILDDIR}/fltk-config $PREFIX/$BIN_DIR + + install_common; + install_post; +} + +install_strip() +{ + install + for a in mgwfltknox_forms-1.1.dll mgwfltknox_gl-1.1.dll mgwfltknox_images-1.1.dll mgwfltknox-1.1.dll; do + $STRIP $STRIP_FLAGS $PREFIX/$BIN_DIR/$a + done +} + +uninstall() +{ + uninstall_pre; + + for a in mgwfltknox_forms-1.1.dll mgwfltknox_gl-1.1.dll mgwfltknox_images-1.1.dll mgwfltknox-1.1.dll; do + ${RM} ${RM_FLAGS} $PREFIX/$BIN_DIR/$a + done + + for a in fltk fltk_forms fltk_gl fltk_images; do + ${RM} ${RM_FLAGS} $PREFIX/$LIB_DIR/lib$a.dll.a + done + + ${RM} ${RM_FLAGS} $PREFIX/$BIN_DIR/fltk-config + + uninstall_common; + uninstall_post; +} + +all() { + download + unpack + applypatch + mkdirs + conf + build + install +} + +main $* Added: trunk/octave-forge/admin/Windows/mingw32/fltk/fltk-1.1.10-5.patch =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/fltk/fltk-1.1.10-5.patch (rev 0) +++ trunk/octave-forge/admin/Windows/mingw32/fltk/fltk-1.1.10-5.patch 2010-06-06 15:13:35 UTC (rev 7405) @@ -0,0 +1,281 @@ +diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg -x '*.orig' fltk-1.1.10-orig/Makefile fltk-1.1.10/Makefile +--- fltk-1.1.10-orig/Makefile 2009-07-02 11:42:17 +0200 ++++ fltk-1.1.10/Makefile 2010-01-17 14:09:38 +0100 +@@ -27,12 +27,12 @@ + + include makeinclude + +-DIRS = $(IMAGEDIRS) src fluid test documentation ++DIRS = $(IMAGEDIRS) src + + all: makeinclude fltk-config + for dir in $(DIRS); do\ + echo "=== making $$dir ===";\ +- (cd $$dir; $(MAKE) $(MFLAGS)) || exit 1;\ ++ (cd $$dir; $(MAKE)) || exit 1;\ + done + + install: makeinclude +diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg -x '*.orig' fltk-1.1.10-orig/configure fltk-1.1.10/configure +--- fltk-1.1.10-orig/configure 2009-12-27 16:24:34 +0100 ++++ fltk-1.1.10/configure 2010-01-17 13:03:51 +0100 +@@ -1989,7 +1989,7 @@ + #----------------------------------------------------------- + LDFLAGS="$LDFLAGS -Wl,--enable-auto-import -Wl,--enable-runtime-pseudo-reloc" + DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -shared \ +- -Wl,--whole-archive -Wl,--export-all-symbols \ ++ -Wl,--whole-archive \ + -Wl,--enable-runtime-pseudo-reloc -Wl,--enable-auto-import \ + -Wl,--enable-auto-image-base -o \$@" + ;; +diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg -x '*.orig' fltk-1.1.10-orig/fltk-config.in fltk-1.1.10/fltk-config.in +--- fltk-1.1.10-orig/fltk-config.in 2008-12-29 18:24:51 +0100 ++++ fltk-1.1.10/fltk-config.in 2010-01-17 12:58:40 +0100 +@@ -212,13 +212,13 @@ + done + + if test "$includedir" != /usr/include; then +- includes=-I$includedir ++ includes= + else + includes= + fi + + if test "$libdir" != /usr/lib -a "$libdir" != /usr/lib32; then +- libs=-L$libdir ++ libs= + else + libs= + fi +diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg -x '*.orig' fltk-1.1.10-orig/fluid/Makefile fltk-1.1.10/fluid/Makefile +--- fltk-1.1.10-orig/fluid/Makefile 2008-12-29 21:21:29 +0100 ++++ fltk-1.1.10/fluid/Makefile 2010-01-17 12:59:14 +0100 +@@ -57,14 +57,14 @@ + fluid$(EXEEXT): $(OBJECTS) $(LIBNAME) $(FLLIBNAME) \ + $(IMGLIBNAME) + echo Linking $@... +- $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDLIBS) ++ $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(CXXLIBS) $(LDLIBS) + $(OSX_ONLY) $(INSTALL_BIN) fluid fluid.app/Contents/MacOS + $(POSTBUILD) $@ ../FL/mac.r + + fluid-shared$(EXEEXT): $(OBJECTS) ../src/$(DSONAME) ../src/$(FLDSONAME) \ + ../src/$(IMGDSONAME) + echo Linking $@... +- $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(LDLIBS) ++ $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(CXXLIBS) $(LDLIBS) + $(POSTBUILD) $@ ../FL/mac.r + + clean: +diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg -x '*.orig' fltk-1.1.10-orig/makeinclude.in fltk-1.1.10/makeinclude.in +--- fltk-1.1.10-orig/makeinclude.in 2008-12-29 21:21:29 +0100 ++++ fltk-1.1.10/makeinclude.in 2010-01-17 13:00:30 +0100 +@@ -55,8 +55,8 @@ + # flags for C++ compiler: + ARCHFLAGS = @ARCHFLAGS@ + OPTIM = @OPTIM@ +-CFLAGS = $(OPTIM) @LARGEFILE@ @PTHREAD_FLAGS@ @CPPFLAGS@ @CFLAGS@ +-CXXFLAGS = $(OPTIM) @LARGEFILE@ @PTHREAD_FLAGS@ @CPPFLAGS@ @CXXFLAGS@ ++CFLAGS = $(OPTIM) @LARGEFILE@ @PTHREAD_FLAGS@ @CPPFLAGS@ @CFLAGS@ -DFL_LIBRARY ++CXXFLAGS = $(OPTIM) @LARGEFILE@ @PTHREAD_FLAGS@ @CPPFLAGS@ @CXXFLAGS@ -DFL_LIBRARY + + # program to make the archive: + LIBNAME = @LIBNAME@ +@@ -70,7 +70,7 @@ + FLDSONAME = @FLDSONAME@ + GLDSONAME = @GLDSONAME@ + IMGDSONAME = @IMGDSONAME@ +-DSOCOMMAND = @DSOCOMMAND@ ++DSOCOMMAND = @DSOCOMMAND@ $(LDFLAGS) + + LIBBASENAME = @LIBBASENAME@ + FLLIBBASENAME = @FLLIBBASENAME@ +@@ -81,7 +81,7 @@ + AUDIOLIBS = @AUDIOLIBS@ + DSOFLAGS = -L. @DSOFLAGS@ + LDFLAGS = $(OPTIM) @LDFLAGS@ +-LDLIBS = @LIBS@ ++LDLIBS = $(CXXLIBS) @LIBS@ + GLDLIBS = @GLLIB@ @LIBS@ + LINKFLTK = @LINKFLTK@ + LINKFLTKGL = @LINKFLTKGL@ +@@ -132,7 +132,7 @@ + UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@ + + # Be quiet when building... +-.SILENT: ++#.SILENT: + + # Build commands and filename extensions... + .SUFFIXES: .0 .1 .3 .6 .c .cxx .h .fl .man .o .z $(EXEEXT) +@@ -144,11 +144,11 @@ + + .c.o: + echo Compiling $<... +- $(CC) -I.. $(ARCHFLAGS) @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CFLAGS) -c $< ++ $(CC) -I.. -I$(SRCDIR) $(ARCHFLAGS) @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CFLAGS) -c $< + + .cxx.o: + echo Compiling $<... +- $(CXX) -I.. $(ARCHFLAGS) @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CXXFLAGS) -c $< ++ $(CXX) -I.. -I$(SRCDIR) $(ARCHFLAGS) @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CXXFLAGS) -c $< + + .man.0 .man.1 .man.3 .man.6: + echo Formatting $<... +diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg -x '*.orig' fltk-1.1.10-orig/src/Makefile fltk-1.1.10/src/Makefile +--- fltk-1.1.10-orig/src/Makefile 2009-07-02 11:42:17 +0200 ++++ fltk-1.1.10/src/Makefile 2010-01-17 13:02:13 +0100 +@@ -25,6 +25,8 @@ + # http://www.fltk.org/str.php + # + ++SRCDIR=@SRCDIR@ ++ + CPPFILES = \ + Fl.cxx \ + Fl_Adjuster.cxx \ +@@ -190,6 +192,12 @@ + + ################################################################ + ++vpath %.cxx $(SRCDIR)/src ++vpath %.c $(SRCDIR)/src ++vpath %.h $(SRCDIR)/src ++vpath %.H $(SRCDIR)/src ++vpath %.xpm $(SRCDIR)/src ++ + include ../makeinclude + + OBJECTS = $(CPPFILES:.cxx=.o) $(CFILES:.c=.o) +@@ -436,53 +444,53 @@ + fl_set_fonts.o: fl_set_fonts_mac.cxx fl_set_fonts_x.cxx \ + fl_set_fonts_xft.cxx fl_set_fonts_win32.cxx + +-fl_arci.o: ../FL/mac.H ../FL/win32.H +-Fl_arg.o: ../FL/mac.H ../FL/win32.H +-fl_ask.o: ../FL/mac.H ../FL/win32.H +-Fl_Bitmap.o: ../FL/mac.H ../FL/win32.H +-fl_color.o: ../FL/mac.H ../FL/win32.H +-fl_cursor.o: ../FL/mac.H ../FL/win32.H +-fl_dnd.o: ../FL/mac.H ../FL/win32.H +-Fl.o: ../FL/mac.H ../FL/win32.H Fl_win32.cxx Fl_mac.cxx +-Fl_Double_Window.o: ../FL/mac.H ../FL/win32.H +-fl_draw_image.o: ../FL/mac.H ../FL/win32.H +-fl_draw_image_mac.o: ../FL/mac.H ../FL/win32.H +-fl_draw_image_win32.o: ../FL/mac.H ../FL/win32.H +-fl_draw_pixmap.o: ../FL/mac.H ../FL/win32.H +-fl_encoding_latin1.o: ../FL/mac.H ../FL/win32.H +-fl_encoding_mac_roman.o: ../FL/mac.H ../FL/win32.H +-Fl_File_Chooser2.o: ../FL/mac.H ../FL/win32.H +-fl_font.o: ../FL/mac.H ../FL/win32.H +-Fl_get_key.o: ../FL/mac.H ../FL/win32.H +-Fl_get_system_colors.o: ../FL/mac.H ../FL/win32.H +-Fl_Gl_Choice.o: ../FL/mac.H ../FL/win32.H +-Fl_Gl_Overlay.o: ../FL/mac.H ../FL/win32.H +-Fl_Gl_Window.o: ../FL/mac.H ../FL/win32.H +-Fl_grab.o: ../FL/mac.H ../FL/win32.H +-Fl_Image.o: ../FL/mac.H ../FL/win32.H +-fl_line_style.o: ../FL/mac.H ../FL/win32.H +-Fl_mac.o: ../FL/mac.H ../FL/win32.H +-Fl_Menu_Window.o: ../FL/mac.H ../FL/win32.H +-fl_overlay.o: ../FL/mac.H ../FL/win32.H +-fl_overlay_visual.o: ../FL/mac.H ../FL/win32.H +-Fl_Overlay_Window.o: ../FL/mac.H ../FL/win32.H +-Fl_own_colormap.o: ../FL/mac.H ../FL/win32.H +-Fl_Pixmap.o: ../FL/mac.H ../FL/win32.H +-fl_read_image.o: ../FL/mac.H ../FL/win32.H +-fl_read_image_mac.o: ../FL/mac.H ../FL/win32.H +-fl_read_image_win32.o: ../FL/mac.H ../FL/win32.H +-fl_rect.o: ../FL/mac.H ../FL/win32.H +-fl_scroll_area.o: ../FL/mac.H ../FL/win32.H +-fl_set_font.o: ../FL/mac.H ../FL/win32.H +-fl_set_fonts.o: ../FL/mac.H ../FL/win32.H +-fl_shortcut.o: ../FL/mac.H ../FL/win32.H +-fl_vertex.o: ../FL/mac.H ../FL/win32.H +-Fl_visual.o: ../FL/mac.H ../FL/win32.H +-Fl_Window_fullscreen.o: ../FL/mac.H ../FL/win32.H +-Fl_Window_iconize.o: ../FL/mac.H ../FL/win32.H +-Fl_x.o: ../FL/mac.H ../FL/win32.H +-gl_draw.o: ../FL/mac.H ../FL/win32.H +-gl_start.o: ../FL/mac.H ../FL/win32.H ++fl_arci.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H ++Fl_arg.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H ++fl_ask.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H ++Fl_Bitmap.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H ++fl_color.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H ++fl_cursor.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H ++fl_dnd.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H ++Fl.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H Fl_win32.cxx Fl_mac.cxx ++Fl_Double_Window.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H ++fl_draw_image.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H ++fl_draw_image_mac.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H ++fl_draw_image_win32.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H ++fl_draw_pixmap.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H ++fl_encoding_latin1.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H ++fl_encoding_mac_roman.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H ++Fl_File_Chooser2.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H ++fl_font.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H ++Fl_get_key.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H ++Fl_get_system_colors.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H ++Fl_Gl_Choice.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H ++Fl_Gl_Overlay.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H ++Fl_Gl_Window.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H ++Fl_grab.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H ++Fl_Image.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H ++fl_line_style.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H ++Fl_mac.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H ++Fl_Menu_Window.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H ++fl_overlay.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H ++fl_overlay_visual.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H ++Fl_Overlay_Window.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H ++Fl_own_colormap.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H ++Fl_Pixmap.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H ++fl_read_image.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H ++fl_read_image_mac.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H ++fl_read_image_win32.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H ++fl_rect.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H ++fl_scroll_area.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H ++fl_set_font.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H ++fl_set_fonts.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H ++fl_shortcut.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H ++fl_vertex.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H ++Fl_visual.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H ++Fl_Window_fullscreen.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H ++Fl_Window_iconize.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H ++Fl_x.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H ++gl_draw.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H ++gl_start.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H + + ################################################################ + +diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg -x '*.orig' fltk-1.1.10-orig/src/fl_rect.cxx fltk-1.1.10/src/fl_rect.cxx +--- fltk-1.1.10-orig/src/fl_rect.cxx 2007-02-12 17:41:41 +0100 ++++ fltk-1.1.10/src/fl_rect.cxx 2010-01-17 13:02:44 +0100 +@@ -423,7 +423,7 @@ + #define STACK_MAX (STACK_SIZE - 1) + static Fl_Region rstack[STACK_SIZE]; + static int rstackptr=0; +-int fl_clip_state_number=0; // used by gl_begin.cxx to update GL clip ++FL_EXPORT int fl_clip_state_number=0; // used by gl_begin.cxx to update GL clip + + #if !defined(WIN32) && !defined(__APPLE__) + // Missing X call: (is this the fastest way to init a 1-rectangle region?) +diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg -x '*.orig' fltk-1.1.10-orig/src/flstring.c fltk-1.1.10/src/flstring.c +--- fltk-1.1.10-orig/src/flstring.c 2005-04-16 02:13:17 +0200 ++++ fltk-1.1.10/src/flstring.c 2010-01-17 13:03:15 +0100 +@@ -32,6 +32,7 @@ + * 'fl_strlcat()' - Safely concatenate two strings. + */ + ++FL_EXPORT + size_t /* O - Length of string */ + fl_strlcat(char *dst, /* O - Destination string */ + const char *src, /* I - Source string */ +@@ -72,6 +73,7 @@ + * 'fl_strlcpy()' - Safely copy two strings. + */ + ++FL_EXPORT + size_t /* O - Length of string */ + fl_strlcpy(char *dst, /* O - Destination string */ + const char *src, /* I - Source string */ Modified: trunk/octave-forge/admin/Windows/mingw32/gcc45_build_deps.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/gcc45_build_deps.sh 2010-06-05 16:39:08 UTC (rev 7404) +++ trunk/octave-forge/admin/Windows/mingw32/gcc45_build_deps.sh 2010-06-06 15:13:35 UTC (rev 7405) @@ -26,7 +26,16 @@ VER_JPEG=8b-$REL VER_TIFF=3.9.2-$REL VER_PNG=1.2.43-$REL +VER_FREETYPE=2.3.12-$REL +VER_FONTCONFIG=2.8.0-$REL +VER_FLTK=1.1.10-$REL +VER_GMP=5.1.0-$REL +VER_GLPK=4.43-$REL + +VER_ICONV=1.13-$REL +VER_GETTEXT=0.17-$REL + # Mind the dependency of libraries: # CBLAS depends on BLAS # LAPACK depends on BLAS @@ -64,3 +73,12 @@ ( cd libjpeg && build-${VER_JPEG}.sh ${ACTION} ); ( cd libtiff && build-${VER_TIFF}.sh ${ACTION} ); ( cd libpng && build-${VER_PNG}.sh ${ACTION} ); +( cd libfreetype && build-${VER_FREETYPE}.sh ${ACTION} ); +( cd libfontconfig && build-${VER_FONTCONFIG}.sh ${ACTION} ); +( cd libfltk && build-${VER_FLTK}.sh ${ACTION} ); + +( cd gmp && build-${VER_GMP}.sh ${ACTION} ); +( cd glpk && build-${VER_GLPK}.sh ${ACTION} ); + +( cd iconv && build-${VER_ICONV}.sh ${ACTION} ); +( cd gettext && build-${VER_GETTEXT}.sh ${ACTION} ); Modified: trunk/octave-forge/admin/Windows/mingw32/gcc45_common.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/gcc45_common.sh 2010-06-05 16:39:08 UTC (rev 7404) +++ trunk/octave-forge/admin/Windows/mingw32/gcc45_common.sh 2010-06-06 15:13:35 UTC (rev 7405) @@ -237,7 +237,7 @@ conf_common() { echo ../$SRCDIR/configure \ - --srcdir=$TOPDIR/$SRCDIR \ + --srcdir=../$SRCDIR \ --prefix=$PREFIX \ CC="gcc -shared-libgcc" \ CXX="g++ -shared-libgcc" \ @@ -245,8 +245,9 @@ LDFLAGS="-Wl,--enable-runtime-pseudo-reloc-v2" \ $CONFIGURE_XTRA_ARGS - ( cd $BUILDDIR && ../$SRCDIR/configure \ - --srcdir=$TOPDIR/$SRCDIR \ + ( PATH=$PREFIX/bin:$PATH + cd $BUILDDIR && ../$SRCDIR/configure \ + --srcdir=../$SRCDIR \ --prefix=$PREFIX \ CC="gcc -shared-libgcc" \ CXX="g++ -shared-libgcc" \ @@ -309,7 +310,7 @@ # == install == install_pre() { - for a in $BIN_DIR $LIB_DIR $STATICLIB_DIR $INC_DIR $LIC_DIR $LIC_DIR/$PKG $ETC_DIR $SHARE_DIR $PKGCONFIG_DIR; do + for a in $BIN_DIR $LIB_DIR $STATICLIB_DIR ${INC_DIR}${INC_SUBDIR:+/$INC_SUBDIR} $LIC_DIR $LIC_DIR/$PKG $ETC_DIR $SHARE_DIR $PKGCONFIG_DIR; do if [ ! -e $PREFIX/$a ]; then mkdir -vp $PREFIX/$a; fi done } @@ -352,7 +353,7 @@ uninstall_post() { # Remove installation directories if empty - for a in $BIN_DIR $LIB_DIR $STATICLIB_DIR $INC_DIR $LIC_DIR/$PKG $LIC_DIR $ETC_DIR $SHARE_DIR $PKGCONFIG_DIR; do + for a in $BIN_DIR $LIB_DIR $STATICLIB_DIR ${INC_DIR}${INC_SUBDIR:+/$INC_SUBDIR} $INC_DIR $LIC_DIR/$PKG $LIC_DIR $ETC_DIR $SHARE_DIR $PKGCONFIG_DIR; do rmdir --ignore-fail-on-non-empty $PREFIX/$a done } Added: trunk/octave-forge/admin/Windows/mingw32/gettext/build-0.17-5.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/gettext/build-0.17-5.sh (rev 0) +++ trunk/octave-forge/admin/Windows/mingw32/gettext/build-0.17-5.sh 2010-06-06 15:13:35 UTC (rev 7405) @@ -0,0 +1,128 @@ +#! /usr/bin/sh + +# Name of package +PKG=gettext +# Version of Package +VER=0.17 +# Release of (this patched) package +REL=5 +# Name&Version of Package +PKGVER=${PKG}-${VER} +# Full name of this patched Package +FULLPKG=${PKGVER}-${REL} + +# Name of source file(s) +SRCFILE=${PKGVER}.tar.gz +# Name of Patch file +PATCHFILE=${FULLPKG}.patch + +# URL(s) of source code file(s) +URL="http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/gettext-$VER.tar.gz" + +# Top dir of this building process (i.e. where the patch file and source file(s) reside) +TOPDIR=`pwd` +# Directory source code is extraced to (relative to TOPDIR) +SRCDIR=${PKGVER} +# Directory original source code is extracted to (for generating diffs) (relative to TOPDIR) +SRCDIR_ORIG=${SRCDIR}-orig + +# Make file to use (optional) +MAKEFILE= +# Any extra flags to pass make to +MAKE_XTRA="CPP=cpp" + +# Header files to install +HEADERS_INSTALL= +HEADERS_BUILD_INSTALL="gettext-runtime/intl/libintl.h" + +# install subdirectory below $PREFIX/$INC_DIR (if any) +INC_SUBDIR= + +# License file(s) to install +LICENSE_INSTALL="COPYING" + +# pkg-config .pc files to install +PKG_CONFIG_INSTALL="" + +# Additional DIFF Flags for generating diff file +DIFF_FLAGS="-x *configure -x config.h.in" + +# load common functions +source ../gcc45_common.sh + +# Directory the lib is built in (set this *after* loading gcc45_common.sh) +BUILDDIR=".build_${BUILD_TARGET}_${FULLPKG}_gcc${GCC_VERSION}${GCC_SYSTEM}" + +# == override resp. specify build actions == + +conf_pre() +{ + CONFIGURE_XTRA_ARGS="\ + --disable-java \ + --disable-native-java \ + --disable-csharp \ + --enable-relocatable \ + --disable-openmp \ + --disable-largefile \ + --enable-static \ + --enable-shared \ + --disable-threads" + +} + +conf_post() +{ + touch ${BUILDDIR}/gettext-runtime/have_configure + modify_libtool_all ${BUILDDIR}/gettext-runtime/libtool +} + +build() +{ + build_pre; + ( cd ${BUILDDIR}/gettext-runtime && make_common ) + build_post; +} + +install() +{ + install_pre; + + # Install library, import library and static library + ${CP} ${CP_FLAGS} ${BUILDDIR}/gettext-runtime/intl/.libs/intl.dll $PREFIX/$BIN_DIR + ${CP} ${CP_FLAGS} ${BUILDDIR}/gettext-runtime/intl/.libs/libintl.dll.a $PREFIX/$LIB_DIR + ${CP} ${CP_FLAGS} ${BUILDDIR}/gettext-runtime/intl/.libs/libintl.dll.a $PREFIX/$STATICLIB_DIR + + install_common; + install_post; +} + +install_strip() +{ + install + $STRIP $STRIP_FLAGS $PREFIX/$BIN_DIR/intl.dll +} + +uninstall() +{ + uninstall_pre; + + # Install library, import library and static library + ${RM} ${RM_FLAGS} $PREFIX/$BIN_DIR/intl.dll + ${RM} ${RM_FLAGS} $PREFIX/$LIB_DIR/libintl.dll.a + ${RM} ${RM_FLAGS} $PREFIX/$STATICLIB_DIR/libintl.dll.a + + uninstall_common; + uninstall_post; +} + +all() { + download + unpack + applypatch + mkdirs + conf + build + install +} + +main $* Added: trunk/octave-forge/admin/Windows/mingw32/gettext/gettext-0.17-5.patch =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/gettext/gettext-0.17-5.patch (rev 0) +++ trunk/octave-forge/admin/Windows/mingw32/gettext/gettext-0.17-5.patch 2010-06-06 15:13:35 UTC (rev 7405) @@ -0,0 +1,151 @@ +diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg -x '*.orig' -x '*configure' -x config.h.in gettext-0.17-orig/gettext-runtime/intl/Makefile.in gettext-0.17/gettext-runtime/intl/Makefile.in +--- gettext-0.17-orig/gettext-runtime/intl/Makefile.in 2009-09-14 20:24:12 +0200 ++++ gettext-0.17/gettext-runtime/intl/Makefile.in 2009-09-14 20:24:52 +0200 +@@ -85,7 +85,7 @@ + CPPFLAGS = @CPPFLAGS@ + CFLAGS = @CFLAGS@ @CFLAG_VISIBILITY@ + LDFLAGS = @LDFLAGS@ $(LDFLAGS_@WOE32DLL@) +-LDFLAGS_yes = -Wl,--export-all-symbols ++LDFLAGS_yes = + LDFLAGS_no = + LIBS = @LIBS@ + +@@ -179,8 +179,9 @@ + libgnuintl.h_vms Makefile.vms libgnuintl.h.msvc-static \ + libgnuintl.h.msvc-shared Makefile.msvc + +-all: all-@USE_INCLUDED_LIBINTL@ +-all-yes: libintl.$la libintl.h charset.alias ref-add.sed ref-del.sed ++all: all-@USE_INCLUDED_LIBINTL@-@WOE32DLL@ ++all-yes-no: libintl.$la libintl.h charset.alias ref-add.sed ref-del.sed ++all-yes-yes: libintl.$la libintl.h charset.alias ref-add.sed ref-del.sed + all-no: all-no-@BUILD_INCLUDED_LIBINTL@ + all-no-yes: libgnuintl.$la + all-no-no: +@@ -194,8 +195,8 @@ + $(LIBTOOL) --mode=link \ + $(CC) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ \ + $(OBJECTS) @LTLIBICONV@ @INTL_MACOSX_LIBS@ $(LIBS) @LTLIBTHREAD@ @LTLIBC@ \ +- $(OBJECTS_RES_@WOE32@) \ +- -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \ ++ -Wl,$(OBJECTS_RES_@WOE32@) -Wl,$(srcdir)/intl.def \ ++ -module -avoid-version \ + -rpath $(libdir) \ + -no-undefined + +@@ -284,7 +285,7 @@ + sed_extract_major='/^[0-9]/{'$${nl}'s/^\([0-9]*\).*/\1/p'$${nl}q$${nl}'}'$${nl}'c\'$${nl}0$${nl}q; \ + sed_extract_minor='/^[0-9][0-9]*[.][0-9]/{'$${nl}'s/^[0-9]*[.]\([0-9]*\).*/\1/p'$${nl}q$${nl}'}'$${nl}'c\'$${nl}0$${nl}q; \ + sed_extract_subminor='/^[0-9][0-9]*[.][0-9][0-9]*[.][0-9]/{'$${nl}'s/^[0-9]*[.][0-9]*[.]\([0-9]*\).*/\1/p'$${nl}q$${nl}'}'$${nl}'c\'$${nl}0$${nl}q; \ +- $(WINDRES) \ ++ $(WINDRES) --preprocessor=$(CPP) \ + "-DPACKAGE_VERSION_STRING=\\\"$(VERSION)\\\"" \ + "-DPACKAGE_VERSION_MAJOR="`echo '$(VERSION)' | sed -n -e "$$sed_extract_major"` \ + "-DPACKAGE_VERSION_MINOR="`echo '$(VERSION)' | sed -n -e "$$sed_extract_minor"` \ +diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg -x '*.orig' -x '*configure' -x config.h.in gettext-0.17-orig/gettext-runtime/intl/intl.def gettext-0.17/gettext-runtime/intl/intl.def +--- gettext-0.17-orig/gettext-runtime/intl/intl.def 1970-01-01 01:00:00 +0100 ++++ gettext-0.17/gettext-runtime/intl/intl.def 2009-09-14 20:24:52 +0200 +@@ -0,0 +1,30 @@ ++LIBRARY intl.dll ++EXPORTS ++_nl_msg_cat_cntr DATA ++bind_textdomain_codeset ++bindtextdomain ++dcgettext ++dcngettext ++dgettext ++dngettext ++gettext ++libintl_bind_textdomain_codeset ++libintl_bindtextdomain ++libintl_dcgettext ++libintl_dcngettext ++libintl_dgettext ++libintl_dngettext ++libintl_fprintf ++libintl_gettext ++libintl_ngettext ++libintl_printf ++libintl_set_relocation_prefix ++libintl_snprintf ++libintl_sprintf ++libintl_textdomain ++libintl_vfprintf ++libintl_vprintf ++libintl_vsprintf ++libintl_vsnprintf ++ngettext ++textdomain +diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg -x '*.orig' -x '*configure' -x config.h.in gettext-0.17-orig/gettext-runtime/intl/libgnuintl.h.in gettext-0.17/gettext-runtime/intl/libgnuintl.h.in +--- gettext-0.17-orig/gettext-runtime/intl/libgnuintl.h.in 2009-09-14 20:24:12 +0200 ++++ gettext-0.17/gettext-runtime/intl/libgnuintl.h.in 2009-09-14 20:24:52 +0200 +@@ -330,7 +330,7 @@ + extern int vfprintf (FILE *, const char *, va_list); + + #undef printf +-#if defined __NetBSD__ || defined __BEOS__ || defined __CYGWIN__ || defined __MINGW32__ ++#if defined __NetBSD__ || defined __BEOS__ || defined __CYGWIN__ + /* Don't break __attribute__((format(printf,M,N))). + This redefinition is only possible because the libc in NetBSD, Cygwin, + mingw does not have a function __printf__. */ +diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg -x '*.orig' -x '*configure' -x config.h.in gettext-0.17-orig/gettext-runtime/intl/printf.c gettext-0.17/gettext-runtime/intl/printf.c +--- gettext-0.17-orig/gettext-runtime/intl/printf.c 2009-09-14 20:24:12 +0200 ++++ gettext-0.17/gettext-runtime/intl/printf.c 2009-09-14 20:24:52 +0200 +@@ -69,7 +69,7 @@ + #define STATIC static + + /* This needs to be consistent with libgnuintl.h.in. */ +-#if defined __NetBSD__ || defined __BEOS__ || defined __CYGWIN__ || defined __MINGW32__ ++#if defined __NetBSD__ || defined __BEOS__ || defined __CYGWIN__ + /* Don't break __attribute__((format(printf,M,N))). + This redefinition is only possible because the libc in NetBSD, Cygwin, + mingw does not have a function __printf__. */ +diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg -x '*.orig' -x '*configure' -x config.h.in gettext-0.17-orig/gettext-runtime/src/Makefile.in gettext-0.17/gettext-runtime/src/Makefile.in +--- gettext-0.17-orig/gettext-runtime/src/Makefile.in 2009-09-14 20:24:13 +0200 ++++ gettext-0.17/gettext-runtime/src/Makefile.in 2009-09-14 20:28:00 +0200 +@@ -861,7 +861,7 @@ + uninstall-binSCRIPTS + + @WOE...@ge...s : $(top_srcdir)/../windows/gettext.rc +-@WOE32_TRUE@ $(WINDRES) `$(SHELL) $(top_srcdir)/../windows/windres-options --escape $(VERSION)` -i $(top_srcdir)/../windows/gettext.rc -o gettext.res --output-format=coff ++@WOE32_TRUE@ $(WINDRES) `$(SHELL) $(top_srcdir)/../windows/windres-options --escape $(VERSION)` --preprocessor=$(CPP) -i $(top_srcdir)/../windows/gettext.rc -o gettext.res --output-format=coff + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg -x '*.orig' -x '*configure' -x config.h.in gettext-0.17-orig/gettext-tools/libgettextpo/Makefile.in gettext-0.17/gettext-tools/libgettextpo/Makefile.in +--- gettext-0.17-orig/gettext-tools/libgettextpo/Makefile.in 2009-09-14 20:24:13 +0200 ++++ gettext-0.17/gettext-tools/libgettextpo/Makefile.in 2009-09-14 20:24:52 +0200 +@@ -1372,7 +1372,7 @@ + uninstall-nodist_includeHEADERS + + @WOE...@li...s : $(srcdir)/libgettextpo.rc +-@WOE32_TRUE@ $(WINDRES) `$(SHELL) $(top_srcdir)/../windows/windres-options --escape $(VERSION)` -i $(srcdir)/libgettextpo.rc -o libgettextpo.res --output-format=coff ++@WOE32_TRUE@ $(WINDRES) `$(SHELL) $(top_srcdir)/../windows/windres-options --escape $(VERSION)` --preprocessor=$(CPP) -i $(srcdir)/libgettextpo.rc -o libgettextpo.res --output-format=coff + + # Hide symbols that are defined by libgettextpo_la_AUXSOURCES or libgnu.la + # from the global namespace, by prefixing them with "libgettextpo_". +diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg -x '*.orig' -x '*configure' -x config.h.in gettext-0.17-orig/gettext-tools/src/Makefile.in gettext-0.17/gettext-tools/src/Makefile.in +--- gettext-0.17-orig/gettext-tools/src/Makefile.in 2009-09-14 20:24:15 +0200 ++++ gettext-0.17/gettext-tools/src/Makefile.in 2009-09-14 20:24:52 +0200 +@@ -2218,7 +2218,7 @@ + uninstall-tcl: + $(RM) $(DESTDIR)$(pkgdatadir)/msgunfmt.tcl + @WOE...@ge...s : $(top_srcdir)/../windows/gettext.rc +-@WOE32_TRUE@ $(WINDRES) `$(SHELL) $(top_srcdir)/../windows/windres-options --escape $(VERSION)` -i $(top_srcdir)/../windows/gettext.rc -o gettext.res --output-format=coff ++@WOE32_TRUE@ $(WINDRES) `$(SHELL) $(top_srcdir)/../windows/windres-options --escape $(VERSION)` --preprocessor=$(CPP) -i $(top_srcdir)/../windows/gettext.rc -o gettext.res --output-format=coff + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg -x '*.orig' -x '*configure' -x config.h.in gettext-0.17-orig/gettext-tools/woe32dll/gettextlib-exports.c gettext-0.17/gettext-tools/woe32dll/gettextlib-exports.c +--- gettext-0.17-orig/gettext-tools/woe32dll/gettextlib-exports.c 2009-09-14 20:24:13 +0200 ++++ gettext-0.17/gettext-tools/woe32dll/gettextlib-exports.c 2009-09-14 20:24:52 +0200 +@@ -26,7 +26,7 @@ + VARIABLE(gl_array_list_implementation) + VARIABLE(gl_linkedhash_list_implementation) + VARIABLE(program_name) +-VARIABLE(rpl_optarg) +-VARIABLE(rpl_optind) ++/* VARIABLE(rpl_optarg) */ ++/* VARIABLE(rpl_optind) */ + VARIABLE(simple_backup_suffix) + VARIABLE(styled_ostream_typeinfo) Added: trunk/octave-forge/admin/Windows/mingw32/glpk/build-4.43-5.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/glpk/build-4.43-5.sh (rev 0) +++ trunk/octave-forge/admin/Windows/mingw32/glpk/build-4.43-5.sh 2010-06-06 15:13:35 UTC (rev 7405) @@ -0,0 +1,109 @@ +#! /usr/bin/sh + +# Name of package +PKG=glpk +# Version of Package +VER=4.43 +# Release of (this patched) package +REL=5 +# Name&Version of Package +PKGVER=${PKG}-${VER} +# Full name of this patched Package +FULLPKG=${PKGVER}-${REL} + +# Name of source file(s) +SRCFILE=${PKGVER}.tar.gz +# Name of Patch file +PATCHFILE=${FULLPKG}.patch + +# URL(s) of source code file(s) +URL="http://gd.tuwien.ac.at/gnu/gnusrc/glpk/glpk-$VER.tar.gz" + +# Top dir of this building process (i.e. where the patch file and source file(s) reside) +TOPDIR=`pwd` +# Directory source code is extraced to (relative to TOPDIR) +SRCDIR=${PKGVER} +# Directory original source code is extracted to (for generating diffs) (relative to TOPDIR) +SRCDIR_ORIG=${SRCDIR}-orig + +# Make file to use (optional) +MAKEFILE= +# Any extra flags to pass make to +MAKE_XTRA= + +# Header files to install +HEADERS_INSTALL="include/glpk.h" +HEADERS_BUILD_INSTALL="" + +# install subdirectory below $PREFIX/$INC_DIR (if any) +INC_SUBDIR=glpk/ + +# License file(s) to install +LICENSE_INSTALL="COPYING" + +# pkg-config .pc files to install +PKG_CONFIG_INSTALL="" + +# Additional DIFF Flags for generating diff file +DIFF_FLAGS= + +# load common functions +source ../gcc45_common.sh + +# Directory the lib is built in (set this *after* loading gcc45_common.sh) +BUILDDIR=".build_${BUILD_TARGET}_${FULLPKG}_gcc${GCC_VERSION}${GCC_SYSTEM}" + +# == override resp. specify build actions == + +conf_pre() +{ + CONFIGURE_XTRA_ARGS="\ + --with-gmp \ + --enable-shared \ + --enable-static" +} + +install() +{ + install_pre; + + # Install library, import library and static library + ${CP} ${CP_FLAGS} ${BUILDDIR}/src/glpk.dll $PREFIX/$BIN_DIR + ${CP} ${CP_FLAGS} ${BUILDDIR}/src/libglpk.dll.a $PREFIX/$LIB_DIR + ${CP} ${CP_FLAGS} ${BUILDDIR}/src/.libs/libglpk.a $PREFIX/$STATICLIB_DIR + + install_common; + install_post; + install_pre; +} + +install_strip() +{ + install + $STRIP $STRIP_FLAGS $PREFIX/$BIN_DIR/glpk.dll +} + +uninstall() +{ + uninstall_pre; + + # Install library, import library and static library + ${RM} ${RM_FLAGS} $PREFIX/$BIN_DIR/glpk.dll + ${RM} ${RM_FLAGS} $PREFIX/$LIB_DIR/libglpk.dll.a + ${RM} ${RM_FLAGS} $PREFIX/$STATICLIB_DIR/libglpk.a + + uninstall_common; + uninstall_post; +} + +all() { + download + unpack + applypatch + mkdirs + conf + build + install +} + +main $* Added: trunk/octave-forge/admin/Windows/mingw32/glpk/glpk-4.43-5.patch =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/glpk/glpk-4.43-5.patch (rev 0) +++ trunk/octave-forge/admin/Windows/mingw32/glpk/glpk-4.43-5.patch 2010-06-06 15:13:35 UTC (rev 7405) @@ -0,0 +1,28 @@ +diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg -x '*.orig' -x '*.rej' glpk-4.43-orig/src/Makefile.in glpk-4.43/src/Makefile.in +--- glpk-4.43-orig/src/Makefile.in 2010-02-20 10:00:00 +0100 ++++ glpk-4.43/src/Makefile.in 2010-06-06 12:30:55 +0200 +@@ -233,7 +233,7 @@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + INCLUDES = -I$(srcdir)/../include +-lib_LTLIBRARIES = libglpk.la ++lib_LTLIBRARIES = libglpk.la glpk.dll + libglpk_la_LDFLAGS = -version-info 28:0:28 \ + -export-symbols-regex '^(glp_|_glp_lpx_).*' + +@@ -416,6 +416,15 @@ + libglpk.la: $(libglpk_la_OBJECTS) $(libglpk_la_DEPENDENCIES) + $(libglpk_la_LINK) -rpath $(libdir) $(libglpk_la_OBJECTS) $(libglpk_la_LIBADD) $(LIBS) + ++glpk.dll : libglpk.la ++ $(CC) -shared -o $@ \ ++ $(LDFLAGS) \ ++ -Wl,--export-all-symbols \ ++ -Wl,--whole-archive .libs/libglpk.a \ ++ -Wl,--out-implib=libglpk.dll.a \ ++ -Wl,--output-def=$.exp \ ++ -Wl,--no-whole-archive $(LIBS) ++ + mostlyclean-compile: + -rm -f *.$(OBJEXT) + Added: trunk/octave-forge/admin/Windows/mingw32/gmp/build-5.0.1-5.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/gmp/build-5.0.1-5.sh (rev 0) +++ trunk/octave-forge/admin/Windows/mingw32/gmp/build-5.0.1-5.sh 2010-06-06 15:13:35 UTC (rev 7405) @@ -0,0 +1,130 @@ +#! /usr/bin/sh + +# Name of package +PKG=gmp +# Version of Package +VER=5.0.1 +# Release of (this patched) package +REL=5 +# Name&Version of Package +PKGVER=${PKG}-${VER} +# Full name of this patched Package +FULLPKG=${PKGVER}-${REL} + +# Name of source file(s) +SRCFILE=${PKGVER}.tar.bz2 +# Name of Patch file +PATCHFILE=${FULLPKG}.patch + +# URL(s) of source code file(s) +URL="http://gd.tuwien.ac.at/gnu/gnusrc/gmp/gmp-$VER.tar.bz2" + +# Top dir of this building process (i.e. where the patch file and source file(s) reside) +TOPDIR=`pwd` +# Directory source code is extraced to (relative to TOPDIR) +SRCDIR=${PKGVER} +# Directory original source code is extracted to (for generating diffs) (relative to TOPDIR) +SRCDIR_ORIG=${SRCDIR}-orig + +# Make file to use (optional) +MAKEFILE= +# Any extra flags to pass make to +MAKE_XTRA= + +# Header files to install +HEADERS_INSTALL= +HEADERS_BUILD_INSTALL="gmp.h" + +# install subdirectory below $PREFIX/$INC_DIR (if any) +INC_SUBDIR= + +# License file(s) to install +LICENSE_INSTALL="COPYING COPYING.lib" + +# pkg-config .pc files to install +PKG_CONFIG_INSTALL="" + +# Additional DIFF Flags for generating diff file +DIFF_FLAGS= + +# load common functions +source ../gcc45_common.sh + +# Directory the lib is built in (set this *after* loading gcc44_common.sh) +BUILDDIR=".build_${BUILD_TARGET}_${FULLPKG}_gcc${GCC_VERSION}${GCC_SYSTEM}" + +# == override resp. specify build actions == + +# MIND that GMP requires a relative path for SRCDIR because configure +# hard-codes paths into test scripts and msys paths do not work +# with mingw32 gcc... + +conf_pre() +{ + # GMP cannot build shared and static library at the same time + CONFIGURE_XTRA_ARGS="\ + --enable-shared \ + --disable-static \ + --enable-fat" +} + +conf_post() +{ + modify_libtool_all ${BUILDDIR}/libtool +} + +# Running "make check" will produce all-failed tests if built with +# --enable-shared. This is due to strange method of creating executable +# within libtool. +# However, when building with --enable-static, make check reports ALL tests +# as passed. +# Tested using mingw mingw32-gcc-4.5.0-dw2, 06-jun-2010 with default gcc flags + +install() +{ + install_pre; + + # Install library, import library and static library + ${CP} ${CP_FLAGS} ${BUILDDIR}/.libs/gmp.dll $PREFIX/$BIN_DIR + ${CP} ${CP_FLAGS} ${BUILDDIR}/.libs/libgmp.dll.a $PREFIX/$LIB_DIR + + install_common; + install_post; +} + +install_strip() +{ + install + $STRIP $STRIP_FLAGS $PREFIX/$BIN_DIR/gmp.dll +} + +uninstall() +{ + uninstall_pre; + + # Install library, import library and static library + ${RM} ${RM_FLAGS} $PREFIX/$BIN_DIR/gmp.dll + ${RM} ${RM_FLAGS} $PREFIX/$LIB_DIR/libgmp.dll.a + + uninstall_common; + uninstall_post; +} + +pkg_pre() +{ + # No extra patch required + PATCHFILE="" +} + + +all() { + download + unpack + applypatch + mkdirs + conf + build + install +} + +main $* Added: trunk/octave-forge/admin/Windows/mingw32/iconv/build-1.13-5.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/iconv/build-1.13-5.sh (rev 0) +++ trunk/octave-forge/admin/Windows/mingw32/iconv/build-1.13-5.sh 2010-06-06 15:13:35 UTC (rev 7405) @@ -0,0 +1,132 @@ +#! /usr/bin/sh + +# Name of package +PKG=libiconv +# Version of Package +VER=1.13 +# Release of (this patched) package +REL=5 +# Name&Version of Package +PKGVER=${PKG}-${VER} +# Full name of this patched Package +FULLPKG=${PKGVER}-${REL} + +# Name of source file(s) +SRCFILE=${PKGVER}.tar.gz +# Name of Patch file +PATCHFILE=${FULLPKG}.patch + +# URL(s) of source code file(s) +URL="http://gd.tuwien.ac.at/gnu/gnusrc/libiconv/libiconv-$VER.tar.gz" + +# Top dir of this building process (i.e. where the patch file and source file(s) reside) +TOPDIR=`pwd` +# Directory source code is extraced to (relative to TOPDIR) +SRCDIR=${PKGVER} +# Directory original source code is extracted to (for generating diffs) (relative to TOPDIR) +SRCDIR_ORIG=${SRCDIR}-orig + +# Make file to use (optional) +MAKEFILE= +# Any extra flags to pass make to +MAKE_XTRA= + +# Header files to install +HEADERS_INSTALL= +HEADERS_BUILD_INSTALL=" +include/iconv.h \ +libcharset/include/libcharset.h \ +libcharset/include/localcharset.h" + +# install subdirectory below $PREFIX/$INC_DIR (if any) +INC_SUBDIR= + +# License file(s) to install +LICENSE_INSTALL="COPYING COPYING.lib" + +# pkg-config .pc files to install +PKG_CONFIG_INSTALL="" + +# Additional DIFF Flags for generating diff file +DIFF_FLAGS= + +# load common functions +source ../gcc45_common.sh + +# Directory the lib is built in (set this *after* loading gcc44_common.sh) +BUILDDIR=".build_${BUILD_TARGET}_${FULLPKG}_gcc${GCC_VERSION}${GCC_SYSTEM}" + +# == override resp. specify build actions == + +conf_pre() +{ + CONFIGURE_XTRA_ARGS="\ + --enable-shared \ + --enable-static \ + --enable-relocatable" +} + +conf_post() +{ + modify_libtool_all ${BUILDDIR}/libtool + modify_libtool_all ${BUILDDIR}/libcharset/libtool +} + +install() +{ + install_pre; + + # Install library, import library and static library + ${CP} ${CP_FLAGS} ${BUILDDIR}/lib/.libs/iconv.dll $PREFIX/$BIN_DIR + ${CP} ${CP_FLAGS} ${BUILDDIR}/lib/.libs/libiconv.dll.a $PREFIX/$LIB_DIR + ${CP} ${CP_FLAGS} ${BUILDDIR}/lib/.libs/libiconv.dll.a $PREFIX/$STATICLIB_DIR + + ${CP} ${CP_FLAGS} ${BUILDDIR}/libcharset/lib/.libs/charset.dll $PREFIX/$BIN_DIR + ${CP} ${CP_FLAGS} ${BUILDDIR}/libcharset/lib/.libs/libcharset.dll.a $PREFIX/$LIB_DIR + ${CP} ${CP_FLAGS} ${BUILDDIR}/libcharset/lib/.libs/libcharset.dll.a $PREFIX/$STATICLIB_DIR + + install_common; + install_post; +} + +install_strip() +{ + install + $STRIP $STRIP_FLAGS $PREFIX/$BIN_DIR/intl.dll + $STRIP $STRIP_FLAGS $PREFIX/$BIN_DIR/charset.dll +} + +uninstall() +{ + uninstall_pre; + + # Install library, import library and static library + ${RM} ${RM_FLAGS} $PREFIX/$BIN_DIR/iconv.dll + ${RM} ${RM_FLAGS} $PREFIX/$LIB_DIR/libiconv.dll.a + ${RM} ${RM_FLAGS} $PREFIX/$STATICLIB_DIR/libiconv.dll.a + + ${RM} ${RM_FLAGS} $PREFIX/$BIN_DIR/charset.dll + ${RM} ${RM_FLAGS} $PREFIX/$LIB_DIR/libcharset.dll.a + ${RM} ${RM_FLAGS} $PREFIX/$STATICLIB_DIR/libcharset.dll.a + + uninstall_common; + uninstall_post; +} + +pkg_pre() +{ + # No extra patch required + PATCHFILE="" +} + +all() { + download + unpack + applypatch + mkdirs + conf + build + install +} + +main $* Added: trunk/octave-forge/admin/Windows/mingw32/libfontconfig/build-2.8.0-5.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/libfontconfig/build-2.8.0-5.sh (rev 0) +++ trunk/octave-forge/admin/Windows/mingw32/libfontconfig/build-2.8.0-5.sh 2010-06-06 15:13:35 UTC (rev 7405) @@ -0,0 +1,126 @@ +#! /usr/bin/sh + +# Name of package +PKG=fontconfig +# Version of Package +VER=2.8.0 +# Release of (this patched) package +REL=5 +# Name&Version of Package +PKGVER=${PKG}-${VER} +# Full name of this patched Package +FULLPKG=${PKGVER}-${REL} + +# Name of source file(s) +SRCFILE=${PKGVER}.tar.gz +# Name of Patch file +PATCHFILE=${FULLPKG}.patch + +# URL(s) of source code file(s) +URL="http://fontconfig.org/release/fontconfig-$VER.tar.gz" + +# Top dir of this building process (i.e. where the patch file and source file(s) reside) +TOPDIR=`pwd` +# Directory source code is extraced to (relative to TOPDIR) +SRCDIR=${PKGVER} +# Directory original source code is extracted to (for generating diffs) (relative to TOPDIR) +SRCDIR_ORIG=${SRCDIR}-orig + +# Make file to use (optional) +MAKEFILE= +# Any extra flags to pass make to +MAKE_XTRA= + +# Header files to install +HEADERS_INSTALL=" +fontconfig/fontconfig.h +fontconfig/fcfreetype.h" +HEADERS_BUILD_INSTALL= + +# install subdirectory below $PREFIX/$INC_DIR (if any) +INC_SUBDIR=fontconfig/ + +# License file(s) to install +LICENSE_INSTALL="COPYING" + +# pkg-config .pc files to install +PKG_CONFIG_INSTALL="fontconfig.pc" + +# Additional DIFF Flags for generating diff file +DIFF_FLAGS= + +# load common functions +source ../gcc45_common.sh + +# Directory the lib is built in (set this *after* loading gcc45_common.sh) +BUILDDIR=".build_${BUILD_TARGET}_${FULLPKG}_gcc${GCC_VERSION}${GCC_SYSTEM}" + +# == override resp. specify build actions == + +conf_pre() +{ + CONFIGURE_XTRA_ARGS="\ + --with-default-fonts" +} + +conf_post() +{ + modify_libtool_all ${BUILDDIR}/libtool +} + +build_post() +{ + ( cd ${BUILDDIR} && make_common fonts.conf ) +} + +install() +{ + install_pre; + + # Install library, import library and static library + ${CP} ${CP_FLAGS} ${BUILDDIR}/src/.libs/fontconfig.dll $PREFIX/$BIN_DIR + ${CP} ${CP_FLAGS} ${BUILDDIR}/src/.libs/libfontconfig.dll.a $PREFIX/$LIB_DIR + ${CP} ${CP_FLAGS} ${BUILDDIR}/src/.libs/libfontconfig.dll.a $PREFIX/$STATICLIB_DIR + + # Install fonts.conf to /etc/fonts + mkdir -vp ${ETC_PATH}/fonts + ${CP} ${CP_FLAGS} ${BUILDDIR}/fonts.conf ${ETC_PATH}/fonts + + install_common; + install_post; +} + +install_strip() +{ + install + $STRIP $STRIP_FLAGS $PREFIX/$BIN_DIR/fontconfig.dll +} + +uninstall() +{ + uninstall_pre; + + # Install library, import library and static library + ${RM} ${RM_FLAGS} $PREFIX/$BIN_DIR/fontconfig.dll + ${RM} ${RM_FLAGS} $PREFIX/$LIB_DIR/libfontconfig.dll.a + ${RM} ${RM_FLAGS} $PREFIX/$STATICLIB_DIR/libfontconfig.dll.a + + # Uninstall /etc/fonts/fonts.conf + ${RM} ${RM_FLAGS} ${ETC_PATH}/fonts/fonts.conf + rmdir --ignore-fail-on-non-empty ${ETC_PATH}/fonts + + uninstall_common; + uninstall_post; +} + +all() { + download + unpack + applypatch + mkdirs + conf + build + install +} + +main $* Added: trunk/octave-forge/admin/Windows/mingw32/libfontconfig/fontconfig-2.8.0-5.patch =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/libfontconfig/fontconfig-2.8.0-5.patch (rev 0) +++ trunk/octave-forge/admin/Windows/mingw32/libfontconfig/fontconfig-2.8.0-5.patch 2010-06-06 15:13:35 UTC (rev 7405) @@ -0,0 +1,12 @@ +diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg -x '*.orig' fontconfig-2.8.0-orig/src/Makefile.in fontconfig-2.8.0/src/Makefile.in +--- fontconfig-2.8.0-orig/src/Makefile.in 2009-12-14 21:39:50 +0100 ++++ fontconfig-2.8.0/src/Makefile.in 2009-12-14 21:39:44 +0100 +@@ -738,7 +738,7 @@ + (cat $(PUBLIC_FILES) $(PUBLIC_FT_FILES) || echo 'FcERROR ()' ) | \ + grep '^Fc[^ ]* *(' | sed -e 's/ *(.*$$//' -e 's/^/ /' | \ + sort; \ +- echo LIBRARY libfontconfig-@LIBT_CURRENT_MINUS_AGE@.dll; \ ++ echo LIBRARY fontconfig.dll; \ + echo VERSION @LIBT_CURRENT@.@LIBT_REVISION@) >$@ + @ ! grep -q FcERROR $@ || ($(RM) $@; false) + Added: trunk/octave-forge/admin/Windows/mingw32/libfreetype/build-2.3.12-5.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/libfreetype/build-2.3.12-5.sh (rev 0) +++ trunk/octave-forge/admin/Windows/mingw32/libfreetype/build-2.3.12-5.sh 2010-06-06 15:13:35 UTC (rev 7405) @@ -0,0 +1,194 @@ +#! /usr/bin/sh + +# Name of package +PKG=freetype +# Version of Package +VER=2.3.12 +# Release of (this patched) package +REL=5 +# Name&Version of Package +PKGVER=${PKG}-${VER} +# Full name of this patched Package +FULLPKG=${PKGVER}-${REL} + +# Name of source file(s) +SRCFILE=${PKGVER}.tar.bz2 +# Name of Patch file +PATCHFILE=${FULLPKG}.patch + +# URL(s) of source code file(s) +URL="http://downloads.sourceforge.net/project/freetype/freetype2/$VER/freetype-$VER.tar.bz2" + +# Top dir of this building process (i.e. where the patch file and source file(s) reside) +TOPDIR=`pwd` +# Directory source code is extraced to (relative to TOPDIR) +SRCDIR=${PKGVER} +# Directory original source code is extracted to (for generating diffs) (relative to TOPDIR) +SRCDIR_ORIG=${SRCDIR}-orig + +# Make file to use (optional) +MAKEFILE= +# Any extra flags to pass make to +MAKE_XTRA= + +# Header files to install +HEADERS_INSTALL="include/ft2build.h" +HEADERS_BUILD_INSTALL= +HEADERS2_INSTALL=" +freetype.h +ftbbox.h +ftbdf.h +ftbitmap.h +ftcache.h +ftchapters.h +ftcid.h +fterrdef.h +fterrors.h +ftgasp.h +ftglyph.h +ftgxval.h +ftgzip.h +ftimage.h +ftincrem.h +ftlcdfil.h +ftlist.h +ftlzw.h +ftmac.h +ftmm.h +ftmodapi.h +ftmoderr.h +ftotval.h +ftoutln.h +ftpfr.h +ftrender.h +ftsizes.h +ftsnames.h +ftstroke.h +ftsynth.h +ftsystem.h +fttrigon.h +fttypes.h +ftwinfnt.h +ftxf86.h +t1tables.h +ttnameid.h +tttables.h +tttags.h +ttunpat.h" +HEADERS3_INSTALL=" +ftheader.h +ftoption.h +ftstdlib.h" +HEADERS4_INSTALL=" +ftconfig.h +ftmodule.h" + +# install subdirectory below $PREFIX/$INC_DIR (if any) +INC_SUBDIR= + +# License file(s) to install +LICENSE_INSTALL= + +# pkg-config .pc files to install +PKG_CONFIG_INSTALL="freetype2.pc" + +# Additional DIFF Flags for generating diff file +DIFF_FLAGS= + +# load common functions +source ../gcc45_common.sh + +# Directory the lib is built in (set this *after* loading gcc45_common.sh) +BUILDDIR=".build_${BUILD_TARGET}_${FULLPKG}_gcc${GCC_VERSION}${GCC_SYSTEM}" + +# == override resp. specify build actions == + +conf_post() +{ + modify_libtool_nolibprefix ${BUILDDIR}/libtool +} + +install() +{ + install_pre; + + # Install library, import library and static library + ${CP} ${CP_FLAGS} ${BUILDDIR}/.libs/freetype-6.dll $PREFIX/$BIN_DIR + ${CP} ${CP_FLAGS} ${BUILDDIR}/.libs/libfreetype.dll.a $PREFIX/$LIB_DIR + ${CP} ${CP_FLAGS} ${BUILDDIR}/.libs/libfreetype.dll.a $PREFIX/$STATICLIB_DIR + + ${CP} ${CP_FLAGS} ${BUILDDIR}/freetype-config $PREFIX/$BIN_DIR + + if ! [ -e ${INCLUDE_PATH}/freetype ]; then mkdir -v $PREFIX/$INC_DIR/freetype; fi + if ! [ -e ${INCLUDE_PATH}/freetype/config ]; then mkdir -v $PREFIX/$INC_DIR/freetype/config; fi + + for a in $HEADERS2_INSTALL; do + ${CP} ${CP_FLAGS} ${SRCDIR}/include/freetype/$a $PREFIX/$INC_DIR/freetype + done + + for a in $HEADERS3_INSTALL; do + ${CP} ${CP_FLAGS} ${SRCDIR}/include/freetype/config/$a $PREFIX/$INC_DIR/freetype/config + done + + for a in $HEADERS4_INSTALL; do + ${CP} ${CP_FLAGS} ${BUILDDIR}/$a $PREFIX/$INC_DIR/freetype/config + done + + # Install license file + ${CP} ${CP_FLAGS} ${SRCDIR}/docs/GPL.txt $PREFIX/$LIC_DIR/$PKG + ${CP} ${CP_FLAGS} ${SRCDIR}/docs/LICENSE.txt $PREFIX/$LIC_DIR/$PKG + ${CP} ${CP_FLAGS} ${SRCDIR}/src/pcf/README $PREFIX/$LIC_DIR/$PKG/README.PCF + + install_common; + install_post; +} + +install_strip() +{ + install + $STRIP $STRIP_FLAGS $PREFIX/$BIN_DIR/freetype-6.dll +} + +uninstall() +{ + uninstall_pre; + + # Install library, import library and static library + ${RM} ${RM_FLAGS} $PREFIX/$BIN_DIR/freetype-6.dll + ${RM} ${RM_FLAGS} $PREFIX/$LIB_DIR/libfreetype.dll.a + ${RM} ${RM_FLAGS} $PREFIX/$STATICLIB_DIR/libfreetype.a + + # Uninstall headers + for a in $HEADERS2_INSTALL; do + ${RM} ${RM_FLAGS} $PREFIX/$INC_DIR/freetype/$a + done + + for a in $HEADERS3_INSTALL $HEADERS4_INSTALL; do + ${RM} ${RM_FLAGS} $PREFIX/$INC_DIR/freetype/config/$a + done + + rmdir --ignore-fail-on-non-empty $PREFIX/$INC_DIR/freetype/config + rmdir --ignore-fail-on-non-empty $PREFIX/$INC_DIR/freetype + + ${RM} ${RM_FLAGS} $PREFIX/$BIN_DIR/freetype-config + + # Uninstall license file + ${RM} ${RM_FLAGS} $PREFIX/$LIC_DIR/$PKG/GPL.txt + ${RM} ${RM_FLAGS} $PREFIX/$LIC_DIR/$PKG/LICENSE.txt + ${RM} ${RM_FLAGS} $PREFIX/$LIC_DIR/$PKG/README.PCF + + uninstall_common; + uninstall_post; +} + +all() { + download + unpack + applypatch + mkdirs + conf + build + install +} + +main $* Added: trunk/octave-forge/admin/Windows/mingw32/libfreetype/freetype-2.3.12-5.patch =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/libfreetype/freetype-2.3.12-5.patch (rev 0) +++ trunk/octave-forge/admin/Windows/mingw32/libfreetype/freetype-2.3.12-5.patch 2010-06-06 15:13:35 UTC (rev 7405) @@ -0,0 +1,42 @@ +diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg -x '*.orig' -x '*.rej' freetype-2.3.12-orig/builds/unix/freetype-config.in freetype-2.3.12/builds/unix/freetype-config.in +--- freetype-2.3.12-orig/builds/unix/freetype-config.in 2009-12-22 00:23:42 +0100 ++++ freetype-2.3.12/builds/unix/freetype-config.in 2010-06-06 15:25:02 +0200 +@@ -131,12 +131,8 @@ + fi + + if test "$echo_cflags" = "yes" ; then +- cflags="-I${SYSROOT}$includedir/freetype2" +- if test "${SYSROOT}$includedir" != "/usr/include" ; then +- echo $cflags -I${SYSROOT}$includedir +- else ++ cflags="" + echo $cflags +- fi + fi + + if test "$echo_libs" = "yes" ; then +@@ -145,11 +141,7 @@ + eval "rpath=\"$hardcode_libdir_flag_spec\"" + fi + libs="-lfreetype @LIBZ@ @FT2_EXTRA_LIBS@" +- if test "${SYSROOT}$libdir" != "/usr/lib" && test "${SYSROOT}$libdir" != "/usr/lib64"; then +- echo -L${SYSROOT}$libdir $libs +- else +- echo $libs +- fi ++ echo $libs + fi + + if test "$echo_libtool" = "yes" ; then +diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg -x '*.orig' -x '*.rej' freetype-2.3.12-orig/builds/unix/freetype2.in freetype-2.3.12/builds/unix/freetype2.in +--- freetype-2.3.12-orig/builds/unix/freetype2.in 2009-07-03 15:28:24 +0200 ++++ freetype-2.3.12/builds/unix/freetype2.in 2010-06-06 15:22:53 +0200 +@@ -7,6 +7,6 @@ + Description: A free, high-quality, and portable font engine. + Version: @ft_version@ + Requires: +-Libs: -L${libdir} -lfreetype ++Libs: -lfreetype + Libs.private: @LIBZ@ @FT2_EXTRA_LIBS@ +-Cflags: -I${includedir}/freetype2 -I${includedir} ++Cflags: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lin...@us...> - 2010-06-06 15:32:46
|
Revision: 7406 http://octave.svn.sourceforge.net/octave/?rev=7406&view=rev Author: lindnerb Date: 2010-06-06 15:32:40 +0000 (Sun, 06 Jun 2010) Log Message: ----------- mingw32 (gcc-4.5.0): add bzip2/wmf/graphicsmagick Modified Paths: -------------- trunk/octave-forge/admin/Windows/mingw32/gcc45_build_deps.sh Added Paths: ----------- trunk/octave-forge/admin/Windows/mingw32/bzip2/build-1.0.5-5.sh trunk/octave-forge/admin/Windows/mingw32/bzip2/bzip2-1.0.5-5.patch trunk/octave-forge/admin/Windows/mingw32/graphicsmagick/GraphicsMagick-1.3.12-5.patch trunk/octave-forge/admin/Windows/mingw32/graphicsmagick/build-1.3.12-5.sh trunk/octave-forge/admin/Windows/mingw32/wmf/build-0.2.8.4-5.sh trunk/octave-forge/admin/Windows/mingw32/wmf/libwmf-0.2.8.4-5.patch Added: trunk/octave-forge/admin/Windows/mingw32/bzip2/build-1.0.5-5.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/bzip2/build-1.0.5-5.sh (rev 0) +++ trunk/octave-forge/admin/Windows/mingw32/bzip2/build-1.0.5-5.sh 2010-06-06 15:32:40 UTC (rev 7406) @@ -0,0 +1,107 @@ +#! /usr/bin/sh + +# Name of package +PKG=bzip2 +# Version of Package +VER=1.0.5 +# Release of (this patched) package +REL=5 +# Name&Version of Package +PKGVER=${PKG}-${VER} +# Full name of this patched Package +FULLPKG=${PKGVER}-${REL} + +# Name of source file(s) +SRCFILE=${PKGVER}.tar.gz +# Name of Patch file +PATCHFILE=${FULLPKG}.patch + +# URL(s) of source code file(s) +URL="http://www.bzip.org/$VER/bzip2-$VER.tar.gz" + +# Top dir of this building process (i.e. where the patch file and source file(s) reside) +TOPDIR=`pwd` +# Directory source code is extraced to (relative to TOPDIR) +SRCDIR=${PKGVER} +# Directory original source code is extracted to (for generating diffs) (relative to TOPDIR) +SRCDIR_ORIG=${SRCDIR}-orig + +# Make file to use (optional) +MAKEFILE=makefile +# Any extra flags to pass make to +MAKE_XTRA= + +# Header files to install +HEADERS_INSTALL="bzlib.h" +HEADERS_BUILD_INSTALL= + +# install subdirectory below $PREFIX/$INC_DIR (if any) +INC_SUBDIR= + +# License file(s) to install +LICENSE_INSTALL="LICENSE" + +# pkg-config .pc files to install +PKG_CONFIG_INSTALL= + +# Additional DIFF Flags for generating diff file +DIFF_FLAGS= + +# load common functions +source ../gcc45_common.sh + +# Directory the lib is built in (set this *after* loading gcc45_common.sh) +BUILDDIR=".build_${BUILD_TARGET}_${FULLPKG}_gcc${GCC_VERSION}${GCC_SYSTEM}" + +# == override resp. specify build actions == + +conf() +{ + conf_pre; + substvars ${SRCDIR}/${MAKEFILE} ${BUILDDIR}/${MAKEFILE} + conf_post; +} + +install() +{ + install_pre; + + # Install library, import library and static library + ${CP} ${CP_FLAGS} ${BUILDDIR}/bzip2.dll $PREFIX/$BIN_DIR + ${CP} ${CP_FLAGS} ${BUILDDIR}/libbz2.dll.a $PREFIX/$LIB_DIR + ${CP} ${CP_FLAGS} ${BUILDDIR}/libbz2.a $PREFIX/$STATICLIB_DIR + + install_common; + install_post; +} + +install_strip() +{ + install; + $STRIP $STRIP_FLAGS $PREFIX/$BIN_DIR/bzip2.dll +} + +uninstall() +{ + uninstall_pre; + + # Install library, import library and static library + ${RM} ${RM_FLAGS} $PREFIX/$BIN_DIR/bzip2.dll + ${RM} ${RM_FLAGS} $PREFIX/$LIB_DIR/libbz2.dll.a + ${RM} ${RM_FLAGS} $PREFIX/$STATICLIB_DIR/libbz2.a + + uninstall_common; + uninstall_post; +} + +all() { + download + unpack + applypatch + mkdirs + conf + build + install +} + +main $* Added: trunk/octave-forge/admin/Windows/mingw32/bzip2/bzip2-1.0.5-5.patch =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/bzip2/bzip2-1.0.5-5.patch (rev 0) +++ trunk/octave-forge/admin/Windows/mingw32/bzip2/bzip2-1.0.5-5.patch 2010-06-06 15:32:40 UTC (rev 7406) @@ -0,0 +1,121 @@ +diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg bzip2-1.0.5-orig/Makefile bzip2-1.0.5/Makefile +--- bzip2-1.0.5-orig/Makefile 2009-08-29 18:20:17 +0200 ++++ bzip2-1.0.5/Makefile 2009-08-29 18:19:38 +0200 +@@ -12,16 +12,20 @@ + # in the file LICENSE. + # ------------------------------------------------------------------ + ++SRCDIR=@SRCDIR@ ++ ++vpath %.c $(SRCDIR) ++ + SHELL=/bin/sh + + # To assist in cross-compiling +-CC=gcc +-AR=ar +-RANLIB=ranlib +-LDFLAGS= ++CC?=gcc ++AR?=ar ++RANLIB?=ranlib ++LDFLAGS?= + + BIGFILES=-D_FILE_OFFSET_BITS=64 +-CFLAGS=-Wall -Winline -O2 -g $(BIGFILES) ++override CFLAGS+=-Wall -Winline -O2 -g $(BIGFILES) + + # Where you want it installed when you do 'make install' + PREFIX=/usr/local +@@ -35,11 +39,20 @@ + decompress.o \ + bzlib.o + +-all: libbz2.a bzip2 bzip2recover test ++all: libbz2.a bzip2dll bzip2 bzip2recover + + bzip2: libbz2.a bzip2.o + $(CC) $(CFLAGS) $(LDFLAGS) -o bzip2 bzip2.o -L. -lbz2 + ++bzip2dll : bzip2.dll ++ ++bzip2.dll : $(OBJS) $(SRCDIR)/libbz2.def ++ $(CC) -shared -o $@ \ ++ $(LDFLAGS) \ ++ -Wl,--output-def=$@.exp \ ++ -Wl,--out-implib=libbz2.dll.a \ ++ $(OBJS) ++ + bzip2recover: bzip2recover.o + $(CC) $(CFLAGS) $(LDFLAGS) -o bzip2recover bzip2recover.o + +@@ -54,20 +67,20 @@ + + check: test + test: bzip2 +- @cat words1 +- ./bzip2 -1 < sample1.ref > sample1.rb2 +- ./bzip2 -2 < sample2.ref > sample2.rb2 +- ./bzip2 -3 < sample3.ref > sample3.rb2 +- ./bzip2 -d < sample1.bz2 > sample1.tst +- ./bzip2 -d < sample2.bz2 > sample2.tst +- ./bzip2 -ds < sample3.bz2 > sample3.tst +- cmp sample1.bz2 sample1.rb2 +- cmp sample2.bz2 sample2.rb2 +- cmp sample3.bz2 sample3.rb2 +- cmp sample1.tst sample1.ref +- cmp sample2.tst sample2.ref +- cmp sample3.tst sample3.ref +- @cat words3 ++ @cat $(SRCDIR)/words1 ++ ./bzip2 -1 < $(SRCDIR)/sample1.ref > sample1.rb2 ++ ./bzip2 -2 < $(SRCDIR)/sample2.ref > sample2.rb2 ++ ./bzip2 -3 < $(SRCDIR)/sample3.ref > sample3.rb2 ++ ./bzip2 -d < $(SRCDIR)/sample1.bz2 > sample1.tst ++ ./bzip2 -d < $(SRCDIR)/sample2.bz2 > sample2.tst ++ ./bzip2 -ds < $(SRCDIR)/sample3.bz2 > sample3.tst ++ cmp $(SRCDIR)/sample1.bz2 sample1.rb2 ++ cmp $(SRCDIR)/sample2.bz2 sample2.rb2 ++ cmp $(SRCDIR)/sample3.bz2 sample3.rb2 ++ cmp sample1.tst $(SRCDIR)/sample1.ref ++ cmp sample2.tst $(SRCDIR)/sample2.ref ++ cmp sample3.tst $(SRCDIR)/sample3.ref ++ @cat $(SRCDIR)/words3 + + install: bzip2 bzip2recover + if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi +@@ -114,24 +127,24 @@ + sample1.tst sample2.tst sample3.tst + + blocksort.o: blocksort.c +- @cat words0 +- $(CC) $(CFLAGS) -c blocksort.c ++ @cat $(SRCDIR)/words0 ++ $(CC) $(CFLAGS) -c $< + huffman.o: huffman.c +- $(CC) $(CFLAGS) -c huffman.c ++ $(CC) $(CFLAGS) -c $< + crctable.o: crctable.c +- $(CC) $(CFLAGS) -c crctable.c ++ $(CC) $(CFLAGS) -c $< + randtable.o: randtable.c +- $(CC) $(CFLAGS) -c randtable.c ++ $(CC) $(CFLAGS) -c $< + compress.o: compress.c +- $(CC) $(CFLAGS) -c compress.c ++ $(CC) $(CFLAGS) -c $< + decompress.o: decompress.c +- $(CC) $(CFLAGS) -c decompress.c ++ $(CC) $(CFLAGS) -c $< + bzlib.o: bzlib.c +- $(CC) $(CFLAGS) -c bzlib.c ++ $(CC) $(CFLAGS) -c $< + bzip2.o: bzip2.c +- $(CC) $(CFLAGS) -c bzip2.c ++ $(CC) $(CFLAGS) -c $< + bzip2recover.o: bzip2recover.c +- $(CC) $(CFLAGS) -c bzip2recover.c ++ $(CC) $(CFLAGS) -c $< + + + distclean: clean Modified: trunk/octave-forge/admin/Windows/mingw32/gcc45_build_deps.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/gcc45_build_deps.sh 2010-06-06 15:13:35 UTC (rev 7405) +++ trunk/octave-forge/admin/Windows/mingw32/gcc45_build_deps.sh 2010-06-06 15:32:40 UTC (rev 7406) @@ -30,6 +30,10 @@ VER_FONTCONFIG=2.8.0-$REL VER_FLTK=1.1.10-$REL +VER_WMF=0.2.8.4-$REL +VER_BZIP2=1.0.5-$REL +VER_GRAPHICSMAGICK=1.3.12-$REL + VER_GMP=5.1.0-$REL VER_GLPK=4.43-$REL @@ -77,6 +81,10 @@ ( cd libfontconfig && build-${VER_FONTCONFIG}.sh ${ACTION} ); ( cd libfltk && build-${VER_FLTK}.sh ${ACTION} ); +( cd wmf && build-${VER_WMF}.sh ${ACTION} ); +( cd bzip2 && build-${VER_BZIP2}.sh ${ACTION} ); +( cd graphicsmagick && build-${VER_GRAPHICSMAGICK}.sh ${ACTION} ); + ( cd gmp && build-${VER_GMP}.sh ${ACTION} ); ( cd glpk && build-${VER_GLPK}.sh ${ACTION} ); Added: trunk/octave-forge/admin/Windows/mingw32/graphicsmagick/GraphicsMagick-1.3.12-5.patch =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/graphicsmagick/GraphicsMagick-1.3.12-5.patch (rev 0) +++ trunk/octave-forge/admin/Windows/mingw32/graphicsmagick/GraphicsMagick-1.3.12-5.patch 2010-06-06 15:32:40 UTC (rev 7406) @@ -0,0 +1,104 @@ +diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg -x '*.orig' -x '*.rej' GraphicsMagick-1.3.12-orig/Magick++/bin/GraphicsMagick++-config.in GraphicsMagick-1.3.12/Magick++/bin/GraphicsMagick++-config.in +--- GraphicsMagick-1.3.12-orig/Magick++/bin/GraphicsMagick++-config.in 2008-05-05 04:32:49 +0200 ++++ GraphicsMagick-1.3.12/Magick++/bin/GraphicsMagick++-config.in 2010-06-06 17:05:30 +0200 +@@ -30,13 +30,13 @@ + echo @PACKAGE_VERSION@ + ;; + --cppflags) +- echo '@MAGICK_API_CPPFLAGS@' ++ echo '@MAGICK_API_CPPFLAGS@' | sed -e "s+-I[^ ]*++g" + ;; + --cxxflags) + echo '@CXXFLAGS@' + ;; + --ldflags) +- echo '@MAGICK_API_LDFLAGS@' ++ echo '@MAGICK_API_LDFLAGS@' | sed -e "s+-L[^ ]*++g" + ;; + --libs) + echo '-lGraphicsMagick++ @MAGICK_API_LIBS@' +diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg -x '*.orig' -x '*.rej' GraphicsMagick-1.3.12-orig/magick/GraphicsMagick-config.in GraphicsMagick-1.3.12/magick/GraphicsMagick-config.in +--- GraphicsMagick-1.3.12-orig/magick/GraphicsMagick-config.in 2003-07-12 20:33:04 +0200 ++++ GraphicsMagick-1.3.12/magick/GraphicsMagick-config.in 2010-06-06 17:05:30 +0200 +@@ -33,10 +33,10 @@ + echo '@CFLAGS@' + ;; + --cppflags) +- echo '@MAGICK_API_CPPFLAGS@' ++ echo '@MAGICK_API_CPPFLAGS@' | sed -e "s+-I[^ ]*++g" + ;; + --ldflags) +- echo '@MAGICK_API_LDFLAGS@' ++ echo '@MAGICK_API_LDFLAGS@' | sed -e "s+-L[^ ]*++g" + ;; + --libs) + echo '@MAGICK_API_LIBS@' +diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg -x '*.orig' -x '*.rej' GraphicsMagick-1.3.12-orig/magick/GraphicsMagick.pc.in GraphicsMagick-1.3.12/magick/GraphicsMagick.pc.in +--- GraphicsMagick-1.3.12-orig/magick/GraphicsMagick.pc.in 2007-04-09 03:15:04 +0200 ++++ GraphicsMagick-1.3.12/magick/GraphicsMagick.pc.in 2010-06-06 17:05:30 +0200 +@@ -7,5 +7,5 @@ + Name: GraphicsMagick + Version: @PACKAGE_VERSION@ + Description: GraphicsMagick image processing library +-Libs: -L${libdir} -lGraphicsMagick +-Cflags: -I${includedir} @MAGICK_API_PC_CPPFLAGS@ ++Libs: -lGraphicsMagick ++Cflags: @MAGICK_API_PC_CPPFLAGS@ +diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg -x '*.orig' -x '*.rej' GraphicsMagick-1.3.12-orig/magick/blob.c GraphicsMagick-1.3.12/magick/blob.c +--- GraphicsMagick-1.3.12-orig/magick/blob.c 2010-02-28 21:40:40 +0100 ++++ GraphicsMagick-1.3.12/magick/blob.c 2010-06-06 17:05:30 +0200 +@@ -1535,7 +1535,7 @@ + % + */ + +-#if !defined(UseInstalledMagick) && defined(POSIX) ++#if !defined(UseInstalledMagick) + static void ChopPathComponents(char *path,const unsigned long components) + { + long +@@ -1683,7 +1683,7 @@ + magick_home=getenv("MAGICK_HOME"); + if (magick_home) + { +-#if defined(POSIX) ++ + FormatString(path,"%.1024s/share/%s/",magick_home, + MagickShareConfigSubDir); + AddConfigurePath(path_map,&path_index,path,exception); +@@ -1691,11 +1691,11 @@ + FormatString(path,"%.1024s/lib/%s/",magick_home, + MagickLibConfigSubDir); + AddConfigurePath(path_map,&path_index,path,exception); +-#else ++ + FormatString(path,"%.1024s%s",magick_home, + DirectorySeparator); + AddConfigurePath(path_map,&path_index,path,exception); +-#endif /* defined(POSIX) */ ++ + } + } + +@@ -1711,7 +1711,7 @@ + + if (*SetClientPath((char *) NULL) != '\0') + { +-#if defined(POSIX) ++ + char + prefix[MaxTextExtent]; + +@@ -1726,11 +1726,11 @@ + + FormatString(path,"%.1024s/share/%s/",prefix,MagickShareConfigSubDir); + AddConfigurePath(path_map,&path_index,path,exception); +-#else /* defined(POSIX) */ ++ + FormatString(path,"%.1024s%s",SetClientPath((char *) NULL), + DirectorySeparator); + AddConfigurePath(path_map,&path_index,path,exception); +-#endif /* !defined(POSIX) */ ++ + } + + /* Added: trunk/octave-forge/admin/Windows/mingw32/graphicsmagick/build-1.3.12-5.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/graphicsmagick/build-1.3.12-5.sh (rev 0) +++ trunk/octave-forge/admin/Windows/mingw32/graphicsmagick/build-1.3.12-5.sh 2010-06-06 15:32:40 UTC (rev 7406) @@ -0,0 +1,296 @@ +#! /usr/bin/sh + +# Name of package +PKG=GraphicsMagick +# Version of Package +VER=1.3.12 +# Release of (this patched) package +REL=5 +# Name&Version of Package +PKGVER=${PKG}-${VER} +# Full name of this patched Package +FULLPKG=${PKGVER}-${REL} + +# Name of source file(s) +SRCFILE=${PKGVER}.tar.lzma +# Name of Patch file +PATCHFILE=${FULLPKG}.patch + +# URL(s) of source code file(s) +URL="http://downloads.sourceforge.net/project/graphicsmagick/graphicsmagick/$VER/GraphicsMagick-$VER.tar.lzma" + +# Top dir of this building process (i.e. where the patch file and source file(s) reside) +TOPDIR=`pwd` +# Directory source code is extraced to (relative to TOPDIR) +SRCDIR=${PKGVER} +# Directory original source code is extracted to (for generating diffs) (relative to TOPDIR) +SRCDIR_ORIG=${SRCDIR}-orig + +# Make file to use (optional) +MAKEFILE= +# Any extra flags to pass make to +MAKE_XTRA= + +# Header files to install +HEADERS_INSTALL= +HEADERS_BUILD_INSTALL= + +MAGICKPP_HEADERS=" +Blob.h \ +CoderInfo.h \ +Color.h \ +Drawable.h \ +Exception.h \ +Geometry.h \ +Image.h \ +Include.h \ +Montage.h \ +Pixels.h \ +STL.h \ +TypeMetric.h" + +MAGICK_HEADERS=" +api.h \ +attribute.h \ +average.h \ +blob.h \ +cdl.h \ +channel.h \ +color.h \ +colormap.h \ +colorspace.h \ +command.h \ +compare.h \ +composite.h \ +compress.h \ +confirm_access.h \ +constitute.h \ +decorate.h \ +delegate.h \ +describe.h \ +deprecate.h \ +draw.h \ +effect.h \ +enhance.h \ +error.h \ +forward.h \ +fx.h \ +gem.h \ +gradient.h \ +hclut.h \ +image.h \ +list.h \ +log.h \ +magic.h \ +magick.h \ +magick_types.h \ +memory.h \ +module.h \ +monitor.h \ +montage.h \ +operator.h \ +paint.h \ +pixel_cache.h \ +pixel_iterator.h \ +plasma.h \ +profile.h \ +quantize.h \ +random.h \ +registry.h \ +render.h \ +resize.h \ +resource.h \ +shear.h \ +signature.h \ +statistics.h \ +symbols.h \ +texture.h \ +timer.h \ +transform.h \ +utility.h \ +version.h +" +MGK_CONFIG_SRC="colors.mgk log.mgk magic.mgk modules.mgk" +#MGK_CONFIG_BUILD="delegates.mgk type.mgk type-ghostscript.mgk type-windows.mgk" +MGK_CONFIG_BUILD="delegates.mgk" + +# install subdirectory below $PREFIX/$INC_DIR (if any) +INC_SUBDIR= + +# License file(s) to install +LICENSE_INSTALL= + +# pkg-config .pc files to install +PKG_CONFIG_INSTALL="Magick/GraphicsMagick.pc Magick++/lib/GraphicsMagick++.pc wand/GraphicsMagickWand.pc" + +# Additional DIFF Flags for generating diff file +DIFF_FLAGS= + +# Executables +TOOLS="gm.exe" + +# load common functions +source ../gcc45_common.sh + +# Directory the lib is built in (set this *after* loading gcc45_common.sh) +BUILDDIR=".build_${BUILD_TARGET}_${FULLPKG}_gcc${GCC_VERSION}${GCC_SYSTEM}" + +# == override resp. specify build actions == + +# +# To check a successful build and installation, you can issue the commands +# gm convert -list delegates +# gm convert -list magic +# gm convert -list format +# gm convert -list module +# gm convert -list ressource +# gm convert -list type +# + +conf_pre() +{ + CONFIGURE_XTRA_ARGS="\ + CPPFLAGS=-DProvideDllMain \ + --enable-shared \ + --without-perl \ + --without-x \ + --with-quantum-depth=16 \ + --disable-installed" +} + +conf_post() +{ + modify_libtool_all ${BUILDDIR}/libtool +} + +install() +{ + install_pre; + + # Install library, import library and static library + ${CP} ${CP_FLAGS} ${BUILDDIR}/magick/.libs/GraphicsMagick.dll $PREFIX/$BIN_DIR + ${CP} ${CP_FLAGS} ${BUILDDIR}/magick/.libs/libGraphicsMagick.dll.a $PREFIX/$LIB_DIR + ${CP} ${CP_FLAGS} ${BUILDDIR}/magick/.libs/libGraphicsMagick.a $PREFIX/$STATICLIB_DIR + + ${CP} ${CP_FLAGS} ${BUILDDIR}/magick/GraphicsMagick-config $PREFIX/$BIN_DIR + + ${CP} ${CP_FLAGS} ${BUILDDIR}/magick++/lib/.libs/GraphicsMagick++.dll $PREFIX/$BIN_DIR + ${CP} ${CP_FLAGS} ${BUILDDIR}/magick++/lib/.libs/libGraphicsMagick++.dll.a $PREFIX/$LIB_DIR + ${CP} ${CP_FLAGS} ${BUILDDIR}/magick++/lib/.libs/libGraphicsMagick++.a $PREFIX/$STATICLIB_DIR + + ${CP} ${CP_FLAGS} ${BUILDDIR}/magick++/bin/GraphicsMagick++-config $PREFIX/$BIN_DIR + + ${CP} ${CP_FLAGS} ${BUILDDIR}/wand/.libs/GraphicsMagickWand.dll $PREFIX/$BIN_DIR + ${CP} ${CP_FLAGS} ${BUILDDIR}/wand/.libs/libGraphicsMagickWand.dll.a $PREFIX/$LIB_DIR + ${CP} ${CP_FLAGS} ${BUILDDIR}/wand/.libs/libGraphicsMagickWand.a $PREFIX/$STATICLIB_DIR + + # Install executable tools + for a in ${TOOLS}; do + ${CP} ${CP_FLAGS} ${BUILDDIR}/utilities/.libs/$a $PREFIX/$BIN_DIR + done + + mkdir -vp $PREFIX/$INC_DIR/magick + for a in ${MAGICK_HEADERS}; do + ${CP} ${CP_FLAGS} ${SRCDIR}/Magick/$a $PREFIX/$INC_DIR/magick + done + ${CP} ${CP_FLAGS} ${BUILDDIR}/Magick/magick_config_api.h $PREFIX/$INC_DIR/magick/magick_config.h + + mkdir -vp $PREFIX/$INC_DIR/Magick++ + ${CP} ${CP_TOOLS} ${SRCDIR}/magick++/lib/Magick++.h $PREFIX/$INC_DIR + for a in ${MAGICKPP_HEADERS}; do + ${CP} ${CP_FLAGS} ${SRCDIR}/magick++/lib/Magick++/$a $PREFIX/$INC_DIR/Magick++ + done + + mkdir -vp $PREFIX/$SHARE_DIR/$PKGVER/config +# for a in ${MGK_CONFIG_SRC}; do +# ${CP} ${CP_FLAGS} ${SRCDIR}/config/$a $PREFIX/$SHARE_DIR/${PKGVER}/config +# done; + + for a in ${MGK_CONFIG_BUILD}; do + ${CP} ${CP_FLAGS} ${BUILDDIR}/config/$a $PREFIX/$SHARE_DIR/${PKGVER}/config + done; + + # Install license file + mkdir -vp $PREFIX/$LIC_DIR/$PKG + ${CP} ${CP_FLAGS} ${SRCDIR}/Copyright.txt $PREFIX/$LIC_DIR/$PKG + mkdir -vp $PREFIX/$LIC_DIR/$PKG/Magick++ + ${CP} ${CP_FLAGS} ${SRCDIR}/Magick++/COPYING $PREFIX/$LIC_DIR/$PKG/Magick++ + + install_common; + install_post; +} + +install_strip() +{ + install; + $STRIP $STRIP_FLAGS $PREFIX/$BIN_DIR/GraphicsMagick.dll + $STRIP $STRIP_FLAGS $PREFIX/$BIN_DIR/GraphicsMagick++.dll + $STRIP $STRIP_FLAGS $PREFIX/$BIN_DIR/GraphicsWand.dll +} + +uninstall() +{ + uninstall_pre; + + # Install library, import library and static library + ${RM} ${RM_FLAGS} ${SHAREDLIB_PATH}/GraphicsMagick.dll + ${RM} ${RM_FLAGS} ${LIBRARY_PATH}/libGraphicsMagick.dll.a + ${RM} ${RM_FLAGS} ${STATICLIB_PATH}/libGraphicsMagick.a + + ${RM} ${RM_FLAGS} ${SHAREDLIB_PATH}/GraphicsMagick++.dll + ${RM} ${RM_FLAGS} ${LIBRARY_PATH}/libGraphicsMagick++.dll.a + ${RM} ${RM_FLAGS} ${STATICLIB_PATH}/libGraphicsMagick++.a + + ${RM} ${RM_FLAGS} ${SHAREDLIB_PATH}/GraphicsMagickWand.dll + ${RM} ${RM_FLAGS} ${LIBRARY_PATH}/libGraphicsMagickWand.dll.a + ${RM} ${RM_FLAGS} ${STATICLIB_PATH}/libGraphicsMagickWand.a + + ${RM} ${RM_FLAGS} ${BINARY_PATH}/GraphicsMagick-config + ${RM} ${RM_FLAGS} ${BINARY_PATH}/GraphicsMagick++-config + + # Uninstall executable tools + for a in ${TOOLS}; do + ${RM} ${RM_FLAGS} ${BINARY_PATH}/$a + done + + # Uninstall headers + for a in $MAGICK_HEADERS magick_config.h; do + ${RM} ${RM_FLAGS} ${INCLUDE_PATH}/magick/$a + done + rmdir --ignore-fail-on-non-empty ${INCLUDE_PATH}/magick + + for a in $MAGICKPP_HEADERS; do + ${RM} ${RM_FLAGS} ${INCLUDE_PATH}/magick++/$a + done + rmdir --ignore-fail-on-non-empty ${INCLUDE_PATH}/magick++ + ${RM} ${RM_FLAGS} ${INCLUDE_PATH}/Magick++.h + + for a in $MGK_CONFIG_SRC $MGK_CONFIG_BUILD; do + ${RM} ${RM_FLAGS} ${SHARE_PATH}/${PKGVER}/config/$a + done + rmdir --ignore-fail-on-non-empty ${SHARE_PATH}/${PKGVER}/config + + # Uninstall pkg-config .pc files + for a in $PKG_CONFIG_INSTALL; do + ${RM} ${RM_FLAGS} ${PKGCONFIGDATA_PATH}/`basename $a` + done + + # Uninstall license file + ${RM} ${RM_FLAGS} ${LICENSE_PATH}/${PKG}/Copyright.txt + ${RM} ${RM_FLAGS} ${LICENSE_PATH}/${PKG}/Magick++/COPYING + rmdir --ignore-fail-on-non-empty ${LICENSE_PATH}/${PKG}/Magick++ + + uninstall_post; +} + +all() { + download + unpack + applypatch + mkdirs + conf + build + install +} + +main $* Added: trunk/octave-forge/admin/Windows/mingw32/wmf/build-0.2.8.4-5.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/wmf/build-0.2.8.4-5.sh (rev 0) +++ trunk/octave-forge/admin/Windows/mingw32/wmf/build-0.2.8.4-5.sh 2010-06-06 15:32:40 UTC (rev 7406) @@ -0,0 +1,115 @@ +#! /usr/bin/sh + +# Name of package +PKG=libwmf +# Version of Package +VER=0.2.8.4 +# Release of (this patched) package +REL=5 +# Name&Version of Package +PKGVER=${PKG}-${VER} +# Full name of this patched Package +FULLPKG=${PKGVER}-${REL} + +# Name of source file(s) +SRCFILE=${PKGVER}.tar.gz +# Name of Patch file +PATCHFILE=${FULLPKG}.patch + +# URL(s) of source code file(s) +URL="http://downloads.sourceforge.net/wvware/libwmf-$VER.tar.gz" + +# Top dir of this building process (i.e. where the patch file and source file(s) reside) +TOPDIR=`pwd` +# Directory source code is extraced to (relative to TOPDIR) +SRCDIR=${PKGVER} +# Directory original source code is extracted to (for generating diffs) (relative to TOPDIR) +SRCDIR_ORIG=${SRCDIR}-orig + +# Make file to use (optional) +MAKEFILE= +# Any extra flags to pass make to +MAKE_XTRA= + +# Header files to install +HEADERS_INSTALL=" +include/libwmf/api.h \ +include/libwmf/color.h \ +include/libwmf/defs.h \ +include/libwmf/fund.h \ +include/libwmf/ipa.h \ +include/libwmf/types.h \ +include/libwmf/macro.h \ +include/libwmf/font.h \ +include/libwmf/canvas.h \ +include/libwmf/foreign.h \ +include/libwmf/eps.h \ +include/libwmf/fig.h \ +include/libwmf/svg.h \ +include/libwmf/gd.h \ +include/libwmf/x.h" +HEADERS_BUILD_INSTALL= + +# install subdirectory below $PREFIX/$INC_DIR (if any) +INC_SUBDIR=libwmf + +# License file(s) to install +LICENSE_INSTALL="COPYING" + +# pkg-config .pc files to install +PKG_CONFIG_INSTALL= + +# Additional DIFF Flags for generating diff file +DIFF_FLAGS= + +# load common functions +source ../gcc45_common.sh + +# Directory the lib is built in (set this *after* loading gcc45_common.sh) +BUILDDIR=".build_${BUILD_TARGET}_${FULLPKG}_gcc${GCC_VERSION}${GCC_SYSTEM}" + +# == override resp. specify build actions == + +install() +{ + install_pre; + + # Install library, import library and static library + ${CP} ${CP_FLAGS} ${BUILDDIR}/src/.libs/libwmflite-0-2-7.dll $PREFIX/$BIN_DIR + ${CP} ${CP_FLAGS} ${BUILDDIR}/src/.libs/libwmflite.dll.a $PREFIX/$LIB_DIR + ${CP} ${CP_FLAGS} ${BUILDDIR}/src/.libs/libwmflite.a $PREFIX/$STATICLIB_DIR + + install_common; + install_post; +} + +install_strip() +{ + install; + $STRIP $SRRIP_FLAGS $PREFIX/$BIN_DIR/libwmflite-0-2-7.dll +} + +uninstall() +{ + uninstall_pre; + + # Install library, import library and static library + ${RM} ${RM_FLAGS} $PREFIX/$BIN_DIR/libwmflite-0-2-7.dll + ${RM} ${RM_FLAGS} $PREFIX/$LIB_DIR/libwmflite.dll.a + ${RM} ${RM_FLAGS} $PREFIX/$STATICLIB_DIR/libwmflite.a + + uninstall_common; + uninstall_post; +} + +all() { + download + unpack + applypatch + mkdirs + conf + build + install +} + +main $* Added: trunk/octave-forge/admin/Windows/mingw32/wmf/libwmf-0.2.8.4-5.patch =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/wmf/libwmf-0.2.8.4-5.patch (rev 0) +++ trunk/octave-forge/admin/Windows/mingw32/wmf/libwmf-0.2.8.4-5.patch 2010-06-06 15:32:40 UTC (rev 7406) @@ -0,0 +1,245 @@ +diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg libwmf-0.2.8.4-orig/configure libwmf-0.2.8.4/configure +--- libwmf-0.2.8.4-orig/configure 2009-08-30 16:11:01 +0200 ++++ libwmf-0.2.8.4/configure 2009-08-30 16:11:35 +0200 +@@ -7292,7 +7292,7 @@ + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + + if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then +- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--out-implib,$lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then +@@ -7301,7 +7301,7 @@ + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ +- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' ++ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--out-implib,$lib' + else + ld_shlibs=no + fi +@@ -10628,7 +10628,7 @@ + enable_shared_with_static_runtimes_CXX=yes + + if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then +- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' ++ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--out-implib,$lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then +@@ -10637,7 +10637,7 @@ + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ +- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' ++ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--out-implib,$lib' + else + ld_shlibs_CXX=no + fi +@@ -14201,7 +14201,7 @@ + export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + + if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then +- archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' ++ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--out-implib,$lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then +@@ -14210,7 +14210,7 @@ + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ +- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' ++ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--out-implib,$lib' + else + ld_shlibs=no + fi +@@ -16549,7 +16549,7 @@ + export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + + if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then +- archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' ++ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--out-implib,$lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then +@@ -16558,7 +16558,7 @@ + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ +- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' ++ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--out-implib,$lib' + else + ld_shlibs=no + fi +diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg libwmf-0.2.8.4-orig/src/Makefile.in libwmf-0.2.8.4/src/Makefile.in +--- libwmf-0.2.8.4-orig/src/Makefile.in 2009-08-30 16:11:01 +0200 ++++ libwmf-0.2.8.4/src/Makefile.in 2009-08-30 16:11:35 +0200 +@@ -397,9 +397,9 @@ + io-wmf.la: $(io_wmf_la_OBJECTS) $(io_wmf_la_DEPENDENCIES) + $(LINK) $(am_io_wmf_la_rpath) $(io_wmf_la_LDFLAGS) $(io_wmf_la_OBJECTS) $(io_wmf_la_LIBADD) $(LIBS) + libwmf.la: $(libwmf_la_OBJECTS) $(libwmf_la_DEPENDENCIES) +- $(LINK) $(am_libwmf_la_rpath) $(libwmf_la_LDFLAGS) $(libwmf_la_OBJECTS) $(libwmf_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libwmf_la_rpath) $(libwmf_la_LDFLAGS) $(srcdir)/libwmf.def $(libwmf_la_OBJECTS) $(libwmf_la_LIBADD) $(LIBS) + libwmflite.la: $(libwmflite_la_OBJECTS) $(libwmflite_la_DEPENDENCIES) +- $(LINK) -rpath $(libdir) $(libwmflite_la_LDFLAGS) $(libwmflite_la_OBJECTS) $(libwmflite_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(libdir) $(libwmflite_la_LDFLAGS) $(srcdir)/libwmflite.def $(libwmflite_la_OBJECTS) $(libwmflite_la_LIBADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg libwmf-0.2.8.4-orig/src/extra/gd/gd.h libwmf-0.2.8.4/src/extra/gd/gd.h +--- libwmf-0.2.8.4-orig/src/extra/gd/gd.h 2009-08-30 16:11:01 +0200 ++++ libwmf-0.2.8.4/src/extra/gd/gd.h 2009-08-30 16:11:35 +0200 +@@ -6,8 +6,8 @@ + #endif + + /* default fontpath for unix systems */ +-#define DEFAULT_FONTPATH "/usr/share/fonts/truetype" +-#define PATHSEPARATOR ":" ++#define DEFAULT_FONTPATH "C:\\WINDOWS\\FONTS;C:\\WINNT\\FONTS" ++#define PATHSEPARATOR ";" + + /* gd.h: declarations file for the graphic-draw module. + * Permission to use, copy, modify, and distribute this software and its +diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg libwmf-0.2.8.4-orig/src/font.c libwmf-0.2.8.4/src/font.c +--- libwmf-0.2.8.4-orig/src/font.c 2009-08-30 16:11:01 +0200 ++++ libwmf-0.2.8.4/src/font.c 2009-08-30 16:11:35 +0200 +@@ -45,7 +45,7 @@ + + if (retval[0] == '\0') + { strcpy (retval, _libwmf_get_fontdir ()); +- strcat (retval, "\\share\\libwmf\\fonts\\fontmap"); ++ strcat (retval, "\\fontmap"); + } + + return retval; +diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg libwmf-0.2.8.4-orig/src/libwmf.def libwmf-0.2.8.4/src/libwmf.def +--- libwmf-0.2.8.4-orig/src/libwmf.def 1970-01-01 01:00:00 +0100 ++++ libwmf-0.2.8.4/src/libwmf.def 2009-08-30 16:11:35 +0200 +@@ -0,0 +1,48 @@ ++EXPORTS ++wmf_api_create ++wmf_api_destroy ++wmf_eps_function ++wmf_fig_function ++wmf_foreign_function ++wmf_gd_function ++wmf_gd_image_pixels ++wmf_help ++wmf_image_free ++wmf_image_load_jpg ++wmf_image_load_png ++wmf_image_save_eps ++wmf_ipa_bmp_b64 ++wmf_ipa_bmp_color ++wmf_ipa_bmp_copy ++wmf_ipa_bmp_eps ++wmf_ipa_bmp_free ++wmf_ipa_bmp_interpolate ++wmf_ipa_bmp_jpg ++wmf_ipa_bmp_png ++wmf_ipa_bmp_read ++wmf_ipa_bmp_setcolor ++wmf_ipa_draw_text ++wmf_ipa_font_dir ++wmf_ipa_font_init ++wmf_ipa_font_lookup ++wmf_ipa_font_map ++wmf_ipa_font_map_gs ++wmf_ipa_font_map_set ++wmf_ipa_font_map_xml ++wmf_ipa_font_stringwidth ++wmf_ipa_page_format ++wmf_ipa_page_height ++wmf_ipa_page_width ++wmf_plot_function ++wmf_stream_create ++wmf_stream_destroy ++wmf_stream_printf ++wmf_stream_reset ++wmf_stream_rezet ++wmf_stream_sputs ++wmf_stream_zputs ++wmf_svg_function ++wmf_wmfxml_import ++wmf_x_function ++wmf_ztream_create ++wmf_ztream_destroy +diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg libwmf-0.2.8.4-orig/src/libwmflite.def libwmf-0.2.8.4/src/libwmflite.def +--- libwmf-0.2.8.4-orig/src/libwmflite.def 1970-01-01 01:00:00 +0100 ++++ libwmf-0.2.8.4/src/libwmflite.def 2009-08-30 16:11:35 +0200 +@@ -0,0 +1,73 @@ ++EXPORTS ++wmf_aldus_checksum ++wmf_assert ++wmf_attr_add ++wmf_attr_clear ++wmf_attr_free ++wmf_attr_new ++wmf_attr_query ++wmf_bbuf_input ++wmf_calloc ++wmf_canvas ++wmf_canvas_arc ++wmf_canvas_bitmap ++wmf_canvas_done ++wmf_canvas_ellipse ++wmf_canvas_line ++wmf_canvas_polygon ++wmf_canvas_polygons ++wmf_canvas_polyline ++wmf_canvas_rect ++wmf_canvas_roundrect ++wmf_canvas_set_background ++wmf_canvas_set_bgcolor ++wmf_canvas_set_brush ++wmf_canvas_set_font ++wmf_canvas_set_pen ++wmf_canvas_set_polyfill ++wmf_canvas_set_textcolor ++wmf_canvas_text ++wmf_debug ++wmf_detach ++wmf_display_size ++wmf_error ++wmf_file_close ++wmf_file_open ++wmf_file_read ++wmf_file_seek ++wmf_file_tell ++wmf_free ++wmf_header_read ++wmf_ipa_color ++wmf_ipa_color_add ++wmf_ipa_color_count ++wmf_ipa_color_index ++wmf_ipa_color_init ++wmf_lite_create ++wmf_lite_destroy ++wmf_malloc ++wmf_mem_close ++wmf_mem_open ++wmf_mem_read ++wmf_mem_seek ++wmf_mem_tell ++wmf_play ++wmf_player_init ++wmf_printf ++wmf_read_16 ++wmf_read_32 ++wmf_realloc ++wmf_rgb_black ++wmf_rgb_color ++wmf_rgb_white ++wmf_scan ++wmf_set_viewport_origin ++wmf_size ++wmf_status_function ++wmf_str_append ++wmf_strbuf_grow ++wmf_strdup ++wmf_strstr ++wmf_write ++wmf_write_begin ++wmf_write_end This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lin...@us...> - 2010-06-14 12:16:05
|
Revision: 7433 http://octave.svn.sourceforge.net/octave/?rev=7433&view=rev Author: lindnerb Date: 2010-06-14 12:15:58 +0000 (Mon, 14 Jun 2010) Log Message: ----------- mingw32 (gcc-4.5.0): add libregex/less/texinfo Modified Paths: -------------- trunk/octave-forge/admin/Windows/mingw32/gcc45_build_deps.sh Added Paths: ----------- trunk/octave-forge/admin/Windows/mingw32/less/build-436-5.sh trunk/octave-forge/admin/Windows/mingw32/less/less-436-5.patch trunk/octave-forge/admin/Windows/mingw32/regex/build-2.5.1-5.sh trunk/octave-forge/admin/Windows/mingw32/regex/mingw-libgnurx-2.5.1-5.patch trunk/octave-forge/admin/Windows/mingw32/texinfo/build-4.13a-5.sh Modified: trunk/octave-forge/admin/Windows/mingw32/gcc45_build_deps.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/gcc45_build_deps.sh 2010-06-14 11:26:22 UTC (rev 7432) +++ trunk/octave-forge/admin/Windows/mingw32/gcc45_build_deps.sh 2010-06-14 12:15:58 UTC (rev 7433) @@ -22,6 +22,8 @@ VER_NCURSES=5.7-$REL VER_FFTW3=5.7-$REL VER_PCRE=8.00-$REL +VER_REGEX=2.5.1-$REL +VER_LESS=436-$REL VER_JPEG=8b-$REL VER_TIFF=3.9.2-$REL @@ -40,6 +42,8 @@ VER_ICONV=1.13-$REL VER_GETTEXT=0.17-$REL +VER_TEXINFO=4.13a-$REL + # Mind the dependency of libraries: # CBLAS depends on BLAS # LAPACK depends on BLAS @@ -73,6 +77,8 @@ ( cd libncurses && build-${VER_NCURSES}.sh ${ACTION} ); ( cd fftw3 && build-${VER_FFTW3}.sh ${ACTION} ); ( cd pcre && build-${VER_PCRE}.sh ${ACTION} ); +( cd regex && build-${VER_REGEX}.sh ${ACTION} ); +( cd less && build-${VER_LESS}.sh ${ACTION} ); ( cd libjpeg && build-${VER_JPEG}.sh ${ACTION} ); ( cd libtiff && build-${VER_TIFF}.sh ${ACTION} ); @@ -90,3 +96,5 @@ ( cd iconv && build-${VER_ICONV}.sh ${ACTION} ); ( cd gettext && build-${VER_GETTEXT}.sh ${ACTION} ); + +( cd texinfo && build-${VER_TEXINFO}.sh ${ACTION} ); Added: trunk/octave-forge/admin/Windows/mingw32/less/build-436-5.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/less/build-436-5.sh (rev 0) +++ trunk/octave-forge/admin/Windows/mingw32/less/build-436-5.sh 2010-06-14 12:15:58 UTC (rev 7433) @@ -0,0 +1,102 @@ +#! /usr/bin/sh + +# Name of package +PKG=less +# Version of Package +VER=436 +# Release of (this patched) package +REL=5 +# Name&Version of Package +PKGVER=${PKG}-${VER} +# Full name of this patched Package +FULLPKG=${PKGVER}-${REL} + +# Name of source file(s) +SRCFILE=${PKGVER}.tar.gz +# Name of Patch file +PATCHFILE=${FULLPKG}.patch + +# URL(s) of source code file(s) +URL="http://www.greenwoodsoftware.com/less/less-436.tar.gz" + +# Top dir of this building process (i.e. where the patch file and source file(s) reside) +TOPDIR=`pwd` +# Directory source code is extraced to (relative to TOPDIR) +SRCDIR=${PKGVER} +# Directory original source code is extracted to (for generating diffs) (relative to TOPDIR) +SRCDIR_ORIG=${SRCDIR}-orig + +# Make file to use (optional) +MAKEFILE=makefile.mingw32 +# Any extra flags to pass make to +MAKE_XTRA= + +# Header files to install +HEADERS_INSTALL= +HEADERS_BUILD_INSTALL= + +# install subdirectory below $PREFIX/$INC_DIR (if any) +INCLUDE_SUBDIR= + +# License file(s) to install +LICENSE_INSTALL="COPYING LICENSE" + +# pkg-config .pc files to install +PKG_CONFIG_INSTALL="" + +# Additional DIFF Flags for generating diff file +DIFF_FLAGS= + +# load common functions +source ../gcc45_common.sh + +# Directory the lib is built in (set this *after* loading gcc45_common.sh) +BUILDDIR=".build_${BUILD_TARGET}_${FULLPKG}_gcc${GCC_VERSION}${GCC_SYSTEM}" + +# == override resp. specify build actions == + +conf() +{ + conf_pre; + substvars ${SRCDIR}/${MAKEFILE} ${BUILDDIR}/${MAKEFILE} + conf_post; +} + +install() +{ + install_pre; + + ${CP} ${CP_FLAGS} ${BUILDDIR}/less.exe $PREFIX/$BIN_DIR + + install_common; + install_post; +} + +install_strip() +{ + install; + $STRIP $STRIP_FLAGS $PREFIX/$BIN_DIR/less.exe +} + +uninstall() +{ + uninstall_pre; + + ${RM} ${RM_FLAGS} $PREFIX/$BIN_DIR/less.exe + + uninstall_common; + uninstall_post; +} + + +all() { + download + unpack + applypatch + mkdirs + conf + build + install +} + +main $* Property changes on: trunk/octave-forge/admin/Windows/mingw32/less/build-436-5.sh ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Author Rev Date URL Added: svn:eol-style + LF Added: trunk/octave-forge/admin/Windows/mingw32/less/less-436-5.patch =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/less/less-436-5.patch (rev 0) +++ trunk/octave-forge/admin/Windows/mingw32/less/less-436-5.patch 2010-06-14 12:15:58 UTC (rev 7433) @@ -0,0 +1,140 @@ +diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg less-436-orig/Makefile.mingw32 less-436/Makefile.mingw32 +--- less-436-orig/Makefile.mingw32 1970-01-01 01:00:00 +0100 ++++ less-436/Makefile.mingw32 2009-08-30 12:40:05 +0200 +@@ -0,0 +1,57 @@ ++# Makefile for less. ++# Windows version ++# mingw32 gcc ++ ++SRCDIR = @SRCDIR@ ++ ++vpath %.c $(SRCDIR) ++vpath %.h $(SRCDIR) ++ ++#### Start of system configuration section. #### ++# ++# Borland's make knows its own location in the ++# filesystem. ++# ++ ++override LDFLAGS += -mconsole ++LD = $(CC) ++LIBS = -lregex -lpcre ++override CFLAGS += -O3 ++ ++EXT=.exe ++ ++#### End of system configuration section. #### ++ ++# This rule allows us to supply the necessary -D options ++# in addition to whatever the user asks for. ++.c.o: ++ $(CC) -c -I. -I$(SRCDIR) $(CPPFLAGS) $(CFLAGS) $< ++ ++OBJ = \ ++ main.o screen.o brac.o ch.o charset.o cmdbuf.o \ ++ command.o cvt.o decode.o edit.o filename.o forwback.o \ ++ help.o ifile.o input.o jump.o line.o linenum.o \ ++ lsystem.o mark.o optfunc.o option.o opttbl.o os.o \ ++ output.o pattern.o position.o prompt.o search.o signal.o \ ++ tags.o ttyin.o version.o regexp.o ++ ++all: less$(EXT) lesskey$(EXT) ++ ++# This is really horrible, but the command line is too long for ++# MS-DOS if we try to link $(OBJ). ++less$(EXT): defines.h $(OBJ) ++ $(CC) $(LDFLAGS) -o $@ $(OBJ) $(LIBS) ++ ++lesskey$(EXT): lesskey.o version.o ++ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) ++ ++defines.h: $(SRCDIR)/defines.wn ++ -rm $@ ++ -cp $< $@ ++ ++$(OBJ): less.h defines.h ++ ++clean: ++ -rm *.o ++ -rm less$(EXT) ++ -rm lesskey$(EXT) +diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg less-436-orig/defines.wn less-436/defines.wn +--- less-436-orig/defines.wn 2009-08-30 12:40:18 +0200 ++++ less-436/defines.wn 2009-08-30 12:33:49 +0200 +@@ -60,7 +60,7 @@ + * EDIT_PGM is the name of the (default) editor to be invoked. + */ + #define EDITOR (!SECURE) +-#define EDIT_PGM "edit" ++#define EDIT_PGM "notepad" + + /* + * TAGS is 1 if you wish to support tag files. +@@ -113,10 +113,10 @@ + * LESSHISTFILE is the filename of the history file + * (in the HOME directory). + */ +-#define LESSKEYFILE "_less" ++#define LESSKEYFILE ".less" + #define LESSKEYFILE_SYS "c:\\_sysless" +-#define DEF_LESSKEYINFILE "_lesskey" +-#define LESSHISTFILE "_lesshst" ++#define DEF_LESSKEYINFILE ".lesskey" ++#define LESSHISTFILE ".lesshst" + + + /* Settings always true for Windows systems. */ +@@ -165,6 +165,15 @@ + */ + #define HAVE_DUP 1 + ++/* Define to 1 if you have the memcpy() function. */ ++#define HAVE_MEMCPY 1 ++ ++/* Define to 1 if you have the strchr() function. */ ++#define HAVE_STRCHR 1 ++ ++/* Define to 1 if you have the strstr() function. */ ++#define HAVE_STRSTR 1 ++ + /* + * Sizes of various buffers. + */ +@@ -200,9 +209,10 @@ + /* #undef HAVE_POSIX_REGCOMP */ + /* #undef HAVE_RE_COMP */ + /* #undef HAVE_REGCMP */ +-#define HAVE_V8_REGCOMP 1 ++/* #define HAVE_V8_REGCOMP 1 */ + /* #undef NO_REGEX */ +-#define HAVE_REGEXEC2 1 ++/* #define HAVE_REGEXEC2 1 */ ++#define HAVE_PCRE 1 + + /* Define HAVE_VOID if your compiler supports the "void" type. */ + #define HAVE_VOID 1 +diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg less-436-orig/lglob.h less-436/lglob.h +--- less-436-orig/lglob.h 2009-08-30 12:40:18 +0200 ++++ less-436/lglob.h 2009-08-30 12:33:49 +0200 +@@ -57,7 +57,7 @@ + char ext[_MAX_EXT]; \ + int handle; + #else +-#if MSDOS_COMPILER==WIN32C && defined(_MSC_VER) ++#if MSDOS_COMPILER==WIN32C && (defined(_MSC_VER) || defined(__MINGW32__) ) + + #define GLOB_FIRST_NAME(filename,fndp,h) h = _findfirst(filename, fndp) + #define GLOB_FIRST_FAILED(handle) ((handle) == -1) +diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg less-436-orig/lsystem.c less-436/lsystem.c +--- less-436-orig/lsystem.c 2009-08-30 12:40:18 +0200 ++++ less-436/lsystem.c 2009-08-30 12:33:49 +0200 +@@ -20,7 +20,7 @@ + + #if MSDOS_COMPILER + #include <dos.h> +-#ifdef _MSC_VER ++#if defined(_MSC_VER) || defined(__MINGW32__) + #include <direct.h> + #define setdisk(n) _chdrive((n)+1) + #else Property changes on: trunk/octave-forge/admin/Windows/mingw32/less/less-436-5.patch ___________________________________________________________________ Added: svn:eol-style + LF Added: trunk/octave-forge/admin/Windows/mingw32/regex/build-2.5.1-5.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/regex/build-2.5.1-5.sh (rev 0) +++ trunk/octave-forge/admin/Windows/mingw32/regex/build-2.5.1-5.sh 2010-06-14 12:15:58 UTC (rev 7433) @@ -0,0 +1,101 @@ +#! /usr/bin/sh + +# Name of package +PKG=mingw-libgnurx +# Version of Package +VER=2.5.1 +# Release of (this patched) package +REL=5 +# Name&Version of Package +PKGVER=${PKG}-${VER} +# Full name of this patched Package +FULLPKG=${PKGVER}-${REL} + +# Name of source file(s) +SRCFILE=${PKGVER}-src.tar.gz +# Name of Patch file +PATCHFILE=${FULLPKG}.patch + +# URL(s) of source code file(s) +URL="http://downloads.sourceforge.net/mingw/mingw-libgnurx-2.5.1-src.tar.gz" + +# Top dir of this building process (i.e. where the patch file and source file(s) reside) +TOPDIR=`pwd` +# Directory source code is extraced to (relative to TOPDIR) +SRCDIR=${PKGVER} +# Directory original source code is extracted to (for generating diffs) (relative to TOPDIR) +SRCDIR_ORIG=${SRCDIR}-orig + +# Make file to use (optional) +MAKEFILE= +# Any extra flags to pass make to +MAKE_XTRA= + +# Header files to install +HEADERS_INSTALL="regex.h" +HEADERS_BUILD_INSTALL= + +# install subdirectory below $PREFIX/$INC_DIR (if any) +INCLUDE_SUBDIR= + +# License file(s) to install +LICENSE_INSTALL="README COPYING.LIB" + +# pkg-config .pc files to install +PKG_CONFIG_INSTALL="" + +# Additional DIFF Flags for generating diff file +DIFF_FLAGS= + +# load common functions +source ../gcc45_common.sh + +# Directory the lib is built in (set this *after* loading gcc45_common.sh) +BUILDDIR=".build_${BUILD_TARGET}_${FULLPKG}_gcc${GCC_VERSION}${GCC_SYSTEM}" + +# == override resp. specify build actions == + + +install() +{ + install_pre; + + # Install library, import library and static library + ${CP} ${CP_FLAGS} ${BUILDDIR}/gnurx.dll $PREFIX/$BIN_DIR + ${CP} ${CP_FLAGS} ${BUILDDIR}/libregex.dll.a $PREFIX/$LIB_DIR + ${CP} ${CP_FLAGS} ${BUILDDIR}/libregex.a $PREFIX/$STATICLIB_DIR + + install_common; + install_post; +} + +install_strip() +{ + install; + $STRIP $STRIP_FLAGS $PREFIX/$BIN_DIR/gnurx.dll +} + +uninstall() +{ + uninstall_pre; + + # Install library, import library and static library + ${RM} ${RM_FLAGS} $PREFIX/$BIN_DIR/gnurx.dll + ${RM} ${RM_FLAGS} $PREFIX/$LIB_DIR/libregex.dll.a + ${RM} ${RM_FLAGS} $PREFIX/$STATICLIB_DIR/libregex.a + + uninstall_common; + uninstall_post; +} + +all() { + download + unpack + applypatch + mkdirs + conf + build + install +} + +main $* Property changes on: trunk/octave-forge/admin/Windows/mingw32/regex/build-2.5.1-5.sh ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Author Rev Date URL Added: svn:eol-style + LF Added: trunk/octave-forge/admin/Windows/mingw32/regex/mingw-libgnurx-2.5.1-5.patch =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/regex/mingw-libgnurx-2.5.1-5.patch (rev 0) +++ trunk/octave-forge/admin/Windows/mingw32/regex/mingw-libgnurx-2.5.1-5.patch 2010-06-14 12:15:58 UTC (rev 7433) @@ -0,0 +1,42 @@ +diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg mingw-libgnurx-2.5.1-orig/Makefile.in mingw-libgnurx-2.5.1/Makefile.in +--- mingw-libgnurx-2.5.1-orig/Makefile.in 2009-08-29 19:28:29 +0200 ++++ mingw-libgnurx-2.5.1/Makefile.in 2009-08-29 19:27:50 +0200 +@@ -56,7 +56,7 @@ + ZIPCMD = @ZIPCMD@ + ZIPEXT = @ZIPEXT@ + +-all: libgnurx-$(DLLVERSION).dll libgnurx.dll.a libregex.a @GNURX_LIB@ ++all: gnurx.dll libregex.a @GNURX_LIB@ + + Makefile: config.status Makefile.in + ./config.status +@@ -66,11 +66,11 @@ + + $(OBJECTS): Makefile + +-libgnurx-$(DLLVERSION).dll libgnurx.dll.a: $(OBJECTS) +- $(CC) $(CFLAGS) -shared -o libgnurx-$(DLLVERSION).dll $(LDFLAGS) $(OBJECTS) ++gnurx.dll: $(OBJECTS) ++ $(CC) $(CFLAGS) -shared -o $@ $(LDFLAGS) $(OBJECTS) + +-libregex.a: libgnurx.dll.a +- cp -p libgnurx.dll.a $@ ++libregex.a: $(OBJECTS) ++ $(AR) cru $@ $(OBJECTS) + + gnurx.lib: libgnurx-$(DLLVERSION).dll + $(MSVCLIB) -def:libgnurx.def -out:gnurx.lib +diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg mingw-libgnurx-2.5.1-orig/configure mingw-libgnurx-2.5.1/configure +--- mingw-libgnurx-2.5.1-orig/configure 2009-08-29 19:28:29 +0200 ++++ mingw-libgnurx-2.5.1/configure 2009-08-29 19:27:50 +0200 +@@ -2392,8 +2392,8 @@ + + CC_QUALIFIED="$CC $CC_QUALIFIED" + +- LDFLAGS="$LDFLAGS -Wl,--enable-auto-image-base -Wl,--out-implib,libgnurx.dll.a" +- test -n "${GNURX_LIB}" && LDFLAGS="$LDFLAGS -Wl,--output-def,libgnurx.def" ++ LDFLAGS="$LDFLAGS -Wl,--enable-auto-image-base -Wl,--out-implib,libregex.dll.a" ++ test -n "${GNURX_LIB}" && LDFLAGS="$LDFLAGS -Wl,--output-def,libregex.def" + ac_config_files="$ac_config_files Makefile" + + cat >confcache <<\_ACEOF Property changes on: trunk/octave-forge/admin/Windows/mingw32/regex/mingw-libgnurx-2.5.1-5.patch ___________________________________________________________________ Added: svn:eol-style + LF Added: trunk/octave-forge/admin/Windows/mingw32/texinfo/build-4.13a-5.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/texinfo/build-4.13a-5.sh (rev 0) +++ trunk/octave-forge/admin/Windows/mingw32/texinfo/build-4.13a-5.sh 2010-06-14 12:15:58 UTC (rev 7433) @@ -0,0 +1,111 @@ +#! /usr/bin/sh + +# Name of package +PKG=texinfo +# Version of Package +VER=4.13 +# Release of (this patched) package +REL=5 +# Name&Version of Package +PKGVER=${PKG}-${VER} +# Full name of this patched Package +FULLPKG=${PKGVER}-${REL} + +# Name of source file(s) +SRCFILE=${PKGVER}a.tar.gz +# Name of Patch file +PATCHFILE=${FULLPKG}.patch + +# URL(s) of source code file(s) +URL="http://gd.tuwien.ac.at/gnu/gnusrc/texinfo/texinfo-4.13a.tar.gz" + +# Top dir of this building process (i.e. where the patch file and source file(s) reside) +TOPDIR=`pwd` +# Directory source code is extraced to (relative to TOPDIR) +SRCDIR=${PKGVER} +# Directory original source code is extracted to (for generating diffs) (relative to TOPDIR) +SRCDIR_ORIG=${SRCDIR}-orig + +# Make file to use (optional) +MAKEFILE= +# Any extra flags to pass make to +MAKE_XTRA= + +# Header files to install +HEADERS_INSTALL= +HEADERS_BUILD_INSTALL= + +# install subdirectory below $PREFIX/$INC_DIR (if any) +INCLUDE_SUBDIR= + +# License file(s) to install +LICENSE_INSTALL="COPYING" + +# pkg-config .pc files to install +PKG_CONFIG_INSTALL="" + +# Additional DIFF Flags for generating diff file +DIFF_FLAGS= + +# load common functions +source ../gcc45_common.sh + +# Directory the lib is built in (set this *after* loading gcc45_common.sh) +BUILDDIR=".build_${BUILD_TARGET}_${FULLPKG}_gcc${GCC_VERSION}${GCC_SYSTEM}" + +# == override resp. specify build actions == + +conf_pre() +{ + CONFIGURE_XTRA_ARGS="\ + --disable-nls" +} + +build() +{ + build_pre; + ( cd ${BUILDDIR}/gnulib/lib && make_common ) + ( cd ${BUILDDIR}/lib && make_common ) + ( cd ${BUILDDIR}/makeinfo && make_common ) + build_post; +} + +install() +{ + install_pre; + + # Install library, import library and static library + ${CP} ${CP_FLAGS} ${BUILDDIR}/makeinfo/makeinfo.exe $PREFIX/$BIN_DIR + + install_common; + install_post; +} + +install_strip() +{ + install; + $STRIP $STRIP_FLAGS $PREFIX/$BIN_DIR/makeinfo.exe +} + +uninstall() +{ + uninstall_pre; + + # Install library, import library and static library + ${RM} ${RM_FLAGS} $PREFIX/$BIN_DIR/makeinfo.exe + + uninstall_common; + uninstall_post; +} + +all() { + download + unpack + applypatch + mkdirs + conf + build + install +} + +main $* Property changes on: trunk/octave-forge/admin/Windows/mingw32/texinfo/build-4.13a-5.sh ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Author Rev Date URL Added: svn:eol-style + LF This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lin...@us...> - 2010-06-21 13:07:14
|
Revision: 7450 http://octave.svn.sourceforge.net/octave/?rev=7450&view=rev Author: lindnerb Date: 2010-06-21 13:07:08 +0000 (Mon, 21 Jun 2010) Log Message: ----------- mingw32 (gcc-4.5.0): add glib/pkg-config Modified Paths: -------------- trunk/octave-forge/admin/Windows/mingw32/gcc45_build_deps.sh Added Paths: ----------- trunk/octave-forge/admin/Windows/mingw32/glib/build-2.24.0-5.sh trunk/octave-forge/admin/Windows/mingw32/pkg-config/build-0.23-5.sh trunk/octave-forge/admin/Windows/mingw32/pkg-config/pkg-config-0.23-5.patch Modified: trunk/octave-forge/admin/Windows/mingw32/gcc45_build_deps.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/gcc45_build_deps.sh 2010-06-21 13:05:10 UTC (rev 7449) +++ trunk/octave-forge/admin/Windows/mingw32/gcc45_build_deps.sh 2010-06-21 13:07:08 UTC (rev 7450) @@ -41,6 +41,8 @@ VER_ICONV=1.13-$REL VER_GETTEXT=0.17-$REL +VER_GLIB=2.24.0-$REL +VER_PKGCONFIG=0.23-$REL VER_TEXINFO=4.13a-$REL @@ -96,5 +98,7 @@ ( cd iconv && build-${VER_ICONV}.sh ${ACTION} ); ( cd gettext && build-${VER_GETTEXT}.sh ${ACTION} ); +( cd glib && build-${VER_GLIB}.sh ${ACTION} ); +( cd pkg-config && build-${VER_PKGCONFIG}.sh ${ACTION} ); ( cd texinfo && build-${VER_TEXINFO}.sh ${ACTION} ); Added: trunk/octave-forge/admin/Windows/mingw32/glib/build-2.24.0-5.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/glib/build-2.24.0-5.sh (rev 0) +++ trunk/octave-forge/admin/Windows/mingw32/glib/build-2.24.0-5.sh 2010-06-21 13:07:08 UTC (rev 7450) @@ -0,0 +1,377 @@ +#! /usr/bin/sh + +# Name of package +PKG=glib +# Version of Package +VER=2.24.0 +# Release of (this patched) package +REL=5 +# Name&Version of Package +PKGVER=${PKG}-${VER} +# Full name of this patched Package +FULLPKG=${PKGVER}-${REL} + +# Name of source file(s) +SRCFILE=${PKGVER}.tar.bz2 +# Name of Patch file +PATCHFILE=${FULLPKG}.patch + +# URL(s) of source code file(s) +URL="http://ftp.gnome.org/pub/gnome/sources/glib/2.24/glib-2.24.0.tar.bz2" + +# Top dir of this building process (i.e. where the patch file and source file(s) reside) +TOPDIR=`pwd` +# Directory source code is extraced to (relative to TOPDIR) +SRCDIR=${PKGVER} +# Directory original source code is extracted to (for generating diffs) (relative to TOPDIR) +SRCDIR_ORIG=${SRCDIR}-orig + +# Make file to use (optional) +MAKEFILE= +# Any extra flags to pass make to +MAKE_XTRA= + +# Header files to install +HEADERS_INSTALL=" +glib/glib.h +glib/glib-object.h +gmodule/gmodule.h" + +HEADERS_GLIB=" +galloca.h +garray.h +gasyncqueue.h +gatomic.h +gbacktrace.h +gbase64.h +gbitlock.h +gbookmarkfile.h +gcache.h +gchecksum.h +gcompletion.h +gconvert.h +gdataset.h +gdate.h +gdir.h +gerror.h +gfileutils.h +ghash.h +ghook.h +ghostutils.h +gi18n.h +gi18n-lib.h +giochannel.h +gkeyfile.h +glist.h +gmacros.h +gmain.h +gmappedfile.h +gmarkup.h +gmem.h +gmessages.h +gnode.h +goption.h +gpattern.h +gpoll.h +gprimes.h +gqsort.h +gquark.h +gqueue.h +grand.h +gregex.h +grel.h +gscanner.h +gsequence.h +gshell.h +gslice.h +gslist.h +gspawn.h +gstdio.h +gstrfuncs.h +gtestutils.h +gstring.h +gthread.h +gthreadpool.h +gtimer.h +gtree.h +gtypes.h +gunicode.h +gurifuncs.h +gutils.h +gvarianttype.h +gvariant.h +gwin32.h +gprintf.h +" + +HEADERS_GIO=" +gappinfo.h +gasyncinitable.h +gasyncresult.h +gbufferedinputstream.h +gbufferedoutputstream.h +gcancellable.h +gcontenttype.h +gcharsetconverter.h +gconverter.h +gconverterinputstream.h +gconverteroutputstream.h +gdatainputstream.h +gdataoutputstream.h +gdrive.h +gemblem.h +gemblemedicon.h +gfile.h +gfileattribute.h +gfileenumerator.h +gfileicon.h +gfileinfo.h +gfileinputstream.h +gfilemonitor.h +gfilenamecompleter.h +gfileoutputstream.h +gfileiostream.h +gfilterinputstream.h +gfilteroutputstream.h +gicon.h +ginetaddress.h +ginetsocketaddress.h +ginputstream.h +ginitable.h +gio.h +giotypes.h +gioenums.h +gioerror.h +giomodule.h +gioscheduler.h +giostream.h +gloadableicon.h +gmount.h +gmemoryinputstream.h +gmemoryoutputstream.h +gmountoperation.h +gnativevolumemonitor.h +gnetworkaddress.h +gnetworkservice.h +goutputstream.h +gresolver.h +gseekable.h +gsimpleasyncresult.h +gsocket.h +gsocketaddress.h +gsocketaddressenumerator.h +gsocketclient.h +gsocketconnectable.h +gsocketconnection.h +gsocketcontrolmessage.h +gsocketlistener.h +gsocketservice.h +gsrvtarget.h +gtcpconnection.h +gthreadedsocketservice.h +gthemedicon.h +gvfs.h +gvolume.h +gvolumemonitor.h +gzlibcompressor.h +gzlibdecompressor.h +" + +HEADERS_GOBJECT=" +gboxed.h +gclosure.h +genums.h +gobject.h +gparam.h +gparamspecs.h +gsignal.h +gsourceclosure.h +gtype.h +gtypemodule.h +gtypeplugin.h +gvalue.h +gvaluearray.h +gvaluecollector.h +gvaluetypes.h +gobjectnotifyqueue.c +gmarshal.h +" + +# install subdirectory below $PREFIX/$INC_DIR (if any) +INC_SUBDIR=glib-2.0 + +# License file(s) to install +LICENSE_INSTALL="COPYING" + +# pkg-config .pc files to install +PKG_CONFIG_INSTALL=" +glib-2.0.pc +gio-2.0.pc +gobject-2.0.pc +gmodule-2.0.pc +gmodule-no-export-2.0.pc +gthread-2.0.pc" + +# Additional DIFF Flags for generating diff file +DIFF_FLAGS= + +# load common functions +source ../gcc45_common.sh + +# Directory the lib is built in (set this *after* loading gcc45_common.sh) +BUILDDIR=".build_${BUILD_TARGET}_${FULLPKG}_gcc${GCC_VERSION}${GCC_SYSTEM}" + +# == override resp. specify build actions == + +conf_pre() +{ + # You must manually specify PCRE_LIBS because we do not have + # pkg-config built yet!! + CONFIGURE_XTRA_ARGS="\ + --disable-static \ + --enable-shared \ + PKG_CONFIG=${TOPDIR}/pkg-config \ + --disable-gtk-doc \ + --with-pcre=system \ + PCRE_LIBS=-lpcre \ + MSGFMT=${TOPDIR}/gettext/msgfmt" +} + +conf_post() +{ + modify_libtool_nolibprefix ${BUILDDIR}/libtool +} + +build_pre() +{ + ( cd ${BUILDDIR} && \ + make glibconfig.h.win32 && \ + make glibconfig.h && \ + mv glibconfig.h glibconfig.h.autogened && \ + cp -vp glibconfig.h.win32 glibconfig.h ) +} + +install() +{ + install_pre; + + # Install library, import library and static library + ${CP} ${CP_FLAGS} ${BUILDDIR}/gio/.libs/gio-2.0-0.dll $PREFIX/$BIN_DIR + ${CP} ${CP_FLAGS} ${BUILDDIR}/gio/.libs/libgio-2.0.dll.a $PREFIX/$LIB_DIR + + ${CP} ${CP_FLAGS} ${BUILDDIR}/glib/.libs/glib-2.0-0.dll $PREFIX/$BIN_DIR + ${CP} ${CP_FLAGS} ${BUILDDIR}/glib/.libs/libglib-2.0.dll.a $PREFIX/$LIB_DIR + ${CP} ${CP_FLAGS} ${BUILDDIR}/glib/.libs/gspawn-win32-helper.exe $PREFIX/$BIN_DIR + ${CP} ${CP_FLAGS} ${BUILDDIR}/glib/.libs/gspawn-win32-helper-console.exe $PREFIX/$BIN_DIR + + ${CP} ${CP_FLAGS} ${BUILDDIR}/gmodule/.libs/gmodule-2.0-0.dll $PREFIX/$BIN_DIR + ${CP} ${CP_FLAGS} ${BUILDDIR}/gmodule/.libs/libgmodule-2.0.dll.a $PREFIX/$LIB_DIR + + ${CP} ${CP_FLAGS} ${BUILDDIR}/gobject/.libs/gobject-2.0-0.dll $PREFIX/$BIN_DIR + ${CP} ${CP_FLAGS} ${BUILDDIR}/gobject/.libs/libgobject-2.0.dll.a $PREFIX/$LIB_DIR + + ${CP} ${CP_FLAGS} ${BUILDDIR}/gthread/.libs/gthread-2.0-0.dll $PREFIX/$BIN_DIR + ${CP} ${CP_FLAGS} ${BUILDDIR}/gthread/.libs/libgthread-2.0.dll.a $PREFIX/$LIB_DIR + + ${CP} ${CP_FLAGS} ${BUILDDIR}/gobject/glib-mkenums $PREFIX/$BIN_DIR + + mkdir -vp $PREFIX/$INC_DIR/$INC_SUBDIR/glib + mkdir -vp $PREFIX/$INC_DIR/$INC_SUBDIR/gio + mkdir -vp $PREFIX/$INC_DIR/$INC_SUBDIR/gobject + + # Install headers + for a in $HEADERS_GLIB; do + ${CP} ${CP_FLAGS} ${SRCDIR}/glib/$a $PREFIX/$INC_DIR/$INC_SUBDIR/glib/`basename $a` + done + + for a in $HEADERS_GIO; do + ${CP} ${CP_FLAGS} ${SRCDIR}/gio/$a $PREFIX/$INC_DIR/$INC_SUBDIR/gio/`basename $a` + done + + for a in $HEADERS_GOBJECT; do + ${CP} ${CP_FLAGS} ${SRCDIR}/gobject/$a $PREFIX/$INC_DIR/$INC_SUBDIR/gobject/`basename $a` + done + + ${CP} ${CP_FLAGS} ${BUILDDIR}/glibconfig.h $PREFIX/$INC_DIR/$INC_SUBDIR + + # Install license file + ${CP} ${CP_FLAGS} ${SRCDIR}/gmodule/COPYING $PREFIX/$LIC_DIR/${PKG}/COPYING.gmodule + + install_common; + install_post; +} + +install_strip() +{ + install; + for a in gio-2.0-0.dll glib-2.0-0.dll gmodule-2.0-0.dll gobject-2.0-0.dll gthread-2.0-0.dll; do + $STRIP $STRIP_FLAGS $PREFIX/$BIN_DIR/$a + done + + for a in gspawn-win32-helper.exe gspawn-win32-helper-console.exe; do + $STRIP $STRIP_FLAGS $PREFIX/$BIN_DIR/$a + done +} + +uninstall() +{ + uninstall_pre; + + # Install library, import library and static library + ${RM} ${RM_FLAGS} $PREFIX/$BIN_DIR/gio-2.0-0.dll + ${RM} ${RM_FLAGS} $PREFIX/$BIN_DIR/glib-2.0-0.dll + ${RM} ${RM_FLAGS} $PREFIX/$BIN_DIR/gmodule-2.0-0.dll + ${RM} ${RM_FLAGS} $PREFIX/$BIN_DIR/gobject-2.0-0.dll + ${RM} ${RM_FLAGS} $PREFIX/$BIN_DIR/gthread-2.0-0.dll + + ${RM} ${RM_FLAGS} $PREFIX/$LIB_DIR/libgio-2.0.dll.a + ${RM} ${RM_FLAGS} $PREFIX/$LIB_DIR/libglib-2.0.dll.a + ${RM} ${RM_FLAGS} $PREFIX/$LIB_DIR/libgmodule-2.0.dll.a + ${RM} ${RM_FLAGS} $PREFIX/$LIB_DIR/libgobject-2.0.dll.a + ${RM} ${RM_FLAGS} $PREFIX/$LIB_DIR/libgthread-2.0.dll.a + + ${RM} ${RM_FLAGS} $PREFIX/$BIN_DIR/gspawn-win32-helper.exe + ${RM} ${RM_FLAGS} $PREFIX/$BIN_DIR/gspawn-win32-helper-console.exe + + ${RM} ${RM_FLAGS} $PREFIX/$BIN_DIR/glib-mkenums + + uninstall_common; + + # Uninstall headers + for a in glibconfig.h; do + ${RM} ${RM_FLAGS} $PREFIX/$INC_DIR/$INC_SUBDIR/`basename $a` + done + + for a in $HEADERS_GLIB; do + ${RM} ${RM_FLAGS} $PREFIX/$INC_DIR/$INC_SUBDIR/glib/`basename $a` + done + + for a in $HEADERS_GIO; do + ${RM} ${RM_FLAGS} $PREFIX/$INC_DIR/$INC_SUBDIR/gio/`basename $a` + done + + for a in $HEADERS_GOBJECT; do + ${RM} ${RM_FLAGS} $PREFIX/$INC_DIR/$INC_SUBDIR/gobject/`basename $a` + done + + rmdir --ignore-fail-on-non-empty $PREFIX/$INC_DIR/$INC_SUBDIR/glib + rmdir --ignore-fail-on-non-empty $PREFIX/$INC_DIR/$INC_SUBDIR/gio + rmdir --ignore-fail-on-non-empty $PREFIX/$INC_DIR/$INC_SUBDIR/gobject + + # Uninstall license file + ${RM} ${RM_FLAGS} $PREFIX/$LIC_DIR/${PKG}/COPYING.gmodule + + uninstall_post; +} + +all() { + download + unpack + applypatch + mkdirs + conf + build + install +} + +main $* Property changes on: trunk/octave-forge/admin/Windows/mingw32/glib/build-2.24.0-5.sh ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Author Rev Date URL Added: svn:eol-style + LF Added: trunk/octave-forge/admin/Windows/mingw32/pkg-config/build-0.23-5.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/pkg-config/build-0.23-5.sh (rev 0) +++ trunk/octave-forge/admin/Windows/mingw32/pkg-config/build-0.23-5.sh 2010-06-21 13:07:08 UTC (rev 7450) @@ -0,0 +1,97 @@ +#! /usr/bin/sh + +# Name of package +PKG=pkg-config +# Version of Package +VER=0.23 +# Release of (this patched) package +REL=5 +# Name&Version of Package +PKGVER=${PKG}-${VER} +# Full name of this patched Package +FULLPKG=${PKGVER}-${REL} + +# Name of source file(s) +SRCFILE=${PKGVER}.tar.gz +# Name of Patch file +PATCHFILE=${FULLPKG}.patch + +# URL(s) of source code file(s) +URL="http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/pkg-config-0.23.tar.gz" + +# Top dir of this building process (i.e. where the patch file and source file(s) reside) +TOPDIR=`pwd` +# Directory source code is extraced to (relative to TOPDIR) +SRCDIR=${PKGVER} +# Directory original source code is extracted to (for generating diffs) (relative to TOPDIR) +SRCDIR_ORIG=${SRCDIR}-orig + +# Make file to use (optional) +MAKEFILE= +# Any extra flags to pass make to +MAKE_XTRA= + +# Header files to install +HEADERS_INSTALL= +HEADERS_BUILD_INSTALL= + +# install subdirectory below $PREFIX/$INC_DIR (if any) +INC_SUBDIR= + +# License file(s) to install +LICENSE_INSTALL="COPYING" + +# pkg-config .pc files to install +PKG_CONFIG_INSTALL="" + +# Additional DIFF Flags for generating diff file +DIFF_FLAGS= + +# load common functions +source ../gcc45_common.sh + +# Directory the lib is built in (set this *after* loading gcc45_common.sh) +BUILDDIR=".build_${BUILD_TARGET}_${FULLPKG}_gcc${GCC_VERSION}${GCC_SYSTEM}" + +# == override resp. specify build actions == + + +install() +{ + install_pre; + + # Install library, import library and static library + ${CP} ${CP_FLAGS} ${BUILDDIR}/pkg-config.exe $PREFIX/$BIN_DIR + + install_common; + install_post; +} + +install_strip() +{ + install; + $STRIP $STRIP_FLAGS $PREFIX/$BIN_DIR/pkg-config.exe +} + +uninstall() +{ + uninstall_pre; + + # Install library, import library and static library + ${RM} ${RM_FLAGS} $PREFIX/$BIN_DIR/pkg-config.exe + + uninstall_common; + uninstall_post; +} + +all() { + download + unpack + applypatch + mkdirs + conf + build + install +} + +main $* Property changes on: trunk/octave-forge/admin/Windows/mingw32/pkg-config/build-0.23-5.sh ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Author Rev Date URL Added: svn:eol-style + LF Added: trunk/octave-forge/admin/Windows/mingw32/pkg-config/pkg-config-0.23-5.patch =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/pkg-config/pkg-config-0.23-5.patch (rev 0) +++ trunk/octave-forge/admin/Windows/mingw32/pkg-config/pkg-config-0.23-5.patch 2010-06-21 13:07:08 UTC (rev 7450) @@ -0,0 +1,167 @@ +diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg pkg-config-0.23-orig/ChangeLog pkg-config-0.23/ChangeLog +--- pkg-config-0.23-orig/ChangeLog 2009-09-14 21:00:28 +0200 ++++ pkg-config-0.23/ChangeLog 2009-09-14 21:00:59 +0200 +@@ -1,3 +1,23 @@ ++2008-02-19 Tor Lillqvist <tm...@no...> ++ ++ * main.c: Remove the possibility to have a default PKG_CONFIG_PATH ++ in the Registry. It is much more flexible to just use environment ++ variables. In general the Registry is not used in the ports of ++ GTK+ or GNOME libraries and software to Windows. ++ ++ * parse.c (parse_line): On Windows, handle also .pc files found in ++ a share/pkgconfig folder when automatically redefining a prefix ++ variable for the package. ++ ++ * pkg-config.1: Corresponding changes. ++ ++2008-02-18 Tor Lillqvist <tm...@no...> ++ ++ * main.c: Fix some bitrot: On Windows, don't use the compile-time ++ PKG_CONFIG_PC_PATH, but deduce a default one at run-time based on ++ the location of the executable. This was originally what ++ pkg-config did on Windows, but it had bit-rotted. ++ + 2008-01-16 Tollef Fog Heen <tf...@er...> + + * NEWS, configure.in: Release 0.23 +diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg pkg-config-0.23-orig/main.c pkg-config-0.23/main.c +--- pkg-config-0.23-orig/main.c 2009-09-14 21:00:28 +0200 ++++ pkg-config-0.23/main.c 2009-09-14 21:00:59 +0200 +@@ -38,9 +38,13 @@ + + #ifdef G_OS_WIN32 + /* No hardcoded paths in the binary, thanks */ +-#undef PKGLIBDIR +-/* It's OK to leak this, as PKGLIBDIR is invoked only once */ +-#define PKG_CONFIG_PATH g_strconcat (g_win32_get_package_installation_directory (PACKAGE, NULL), "\\lib\\pkgconfig", NULL) ++/* It's OK to leak this */ ++#undef PKG_CONFIG_PC_PATH ++#define PKG_CONFIG_PC_PATH \ ++ g_strconcat (g_win32_get_package_installation_subdirectory (NULL, NULL, "lib/pkgconfig"), \ ++ ";", \ ++ g_win32_get_package_installation_subdirectory (NULL, NULL, "share/pkgconfig"), \ ++ NULL) + #endif + + static int want_debug_spew = 0; +@@ -296,57 +300,6 @@ + add_search_dirs(PKG_CONFIG_PC_PATH, G_SEARCHPATH_SEPARATOR_S); + } + +-#ifdef G_OS_WIN32 +- { +- /* Add search directories from the Registry */ +- +- HKEY roots[] = { HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE }; +- gchar *root_names[] = { "HKEY_CURRENT_USER", "HKEY_LOCAL_MACHINE" }; +- HKEY key; +- int i; +- gulong max_value_name_len, max_value_len; +- +- for (i = 0; i < G_N_ELEMENTS (roots); i++) +- { +- key = NULL; +- if (RegOpenKeyEx (roots[i], "Software\\" PACKAGE "\\PKG_CONFIG_PATH", 0, +- KEY_QUERY_VALUE, &key) == ERROR_SUCCESS && +- RegQueryInfoKey (key, NULL, NULL, NULL, NULL, NULL, NULL, NULL, +- &max_value_name_len, &max_value_len, +- NULL, NULL) == ERROR_SUCCESS) +- { +- int index = 0; +- gchar *value_name = g_malloc (max_value_name_len + 1); +- gchar *value = g_malloc (max_value_len + 1); +- +- while (TRUE) +- { +- gulong type; +- gulong value_name_len = max_value_name_len + 1; +- gulong value_len = max_value_len + 1; +- +- if (RegEnumValue (key, index++, value_name, &value_name_len, +- NULL, &type, +- value, &value_len) != ERROR_SUCCESS) +- break; +- +- if (type != REG_SZ) +- continue; +- +- value_name[value_name_len] = '\0'; +- value[value_len] = '\0'; +- debug_spew ("Adding directory '%s' from %s\\Software\\" +- PACKAGE "\\PKG_CONFIG_PATH\\%s\n", +- value, root_names[i], value_name); +- add_search_dir (value); +- } +- } +- if (key != NULL) +- RegCloseKey (key); +- } +- } +-#endif +- + pcsysrootdir = getenv ("PKG_CONFIG_SYSROOT_DIR"); + if (pcsysrootdir) + { +diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg pkg-config-0.23-orig/parse.c pkg-config-0.23/parse.c +--- pkg-config-0.23-orig/parse.c 2009-09-14 21:00:28 +0200 ++++ pkg-config-0.23/parse.c 2009-09-14 21:00:59 +0200 +@@ -1011,18 +1011,25 @@ + gchar *prefix = pkg->pcfiledir; + const int prefix_len = strlen (prefix); + const char *const lib_pkgconfig = "\\lib\\pkgconfig"; ++ const char *const share_pkgconfig = "\\share\\pkgconfig"; + const int lib_pkgconfig_len = strlen (lib_pkgconfig); ++ const int share_pkgconfig_len = strlen (share_pkgconfig); + +- if (strlen (prefix) > lib_pkgconfig_len && +- pathnamecmp (prefix + prefix_len - lib_pkgconfig_len, +- lib_pkgconfig) == 0) ++ if ((strlen (prefix) > lib_pkgconfig_len && ++ pathnamecmp (prefix + prefix_len - lib_pkgconfig_len, lib_pkgconfig) == 0) || ++ (strlen (prefix) > share_pkgconfig_len && ++ pathnamecmp (prefix + prefix_len - share_pkgconfig_len, share_pkgconfig) == 0)) + { +- /* It ends in lib\pkgconfig. Good. */ ++ /* It ends in lib\pkgconfig or share\pkgconfig. Good. */ + + gchar *p; + + prefix = g_strdup (prefix); +- prefix[prefix_len - lib_pkgconfig_len] = '\0'; ++ if (strlen (prefix) > lib_pkgconfig_len && ++ pathnamecmp (prefix + prefix_len - lib_pkgconfig_len, lib_pkgconfig) == 0) ++ prefix[prefix_len - lib_pkgconfig_len] = '\0'; ++ else ++ prefix[prefix_len - share_pkgconfig_len] = '\0'; + + /* Turn backslashes into slashes or + * poptParseArgvString() will eat them when ${prefix} +diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg pkg-config-0.23-orig/pkg-config.1 pkg-config-0.23/pkg-config.1 +--- pkg-config-0.23-orig/pkg-config.1 2009-09-14 21:00:28 +0200 ++++ pkg-config-0.23/pkg-config.1 2009-09-14 21:00:59 +0200 +@@ -274,20 +274,10 @@ + + .SH WINDOWS SPECIALITIES + If a .pc file is found in a directory that matches the usual +-conventions (i.e., ends with \\lib\\pkgconfig), the prefix for that +-package is assumed to be the grandparent of the directory where the +-file was found, and the \fIprefix\fP variable is overridden for that +-file accordingly. +- +-In addition to the \fIPKG_CONFIG_PATH\fP environment variable, the +-Registry keys +-.DW +-\fIHKEY_CURRENT_USER\\Software\\pkgconfig\\PKG_CONFIG_PATH\fP and +-.EW +-\fIHKEY_LOCAL_MACHINE\\Software\\pkgconfig\\PKG_CONFIG_PATH\fP can be +-used to specify directories to search for .pc files. Each (string) +-value in these keys is treated as a directory where to look for .pc +-files. ++conventions (i.e., ends with \\lib\\pkgconfig or \\share\\pkgconfig), ++the prefix for that package is assumed to be the grandparent of the ++directory where the file was found, and the \fIprefix\fP variable is ++overridden for that file accordingly. + + .SH AUTOCONF MACROS + Property changes on: trunk/octave-forge/admin/Windows/mingw32/pkg-config/pkg-config-0.23-5.patch ___________________________________________________________________ Added: svn:eol-style + LF This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lin...@us...> - 2010-06-21 13:14:51
|
Revision: 7451 http://octave.svn.sourceforge.net/octave/?rev=7451&view=rev Author: lindnerb Date: 2010-06-21 13:14:43 +0000 (Mon, 21 Jun 2010) Log Message: ----------- mingw32 (gcc-4.5.0): fix wrong include subdirectory variable name Modified Paths: -------------- trunk/octave-forge/admin/Windows/mingw32/arpack/build-96-5.sh trunk/octave-forge/admin/Windows/mingw32/blas/build-5.sh trunk/octave-forge/admin/Windows/mingw32/cblas/build-5.sh trunk/octave-forge/admin/Windows/mingw32/expat/build-2.0.1-5.sh trunk/octave-forge/admin/Windows/mingw32/fftw3/build-3.2.2-5.sh trunk/octave-forge/admin/Windows/mingw32/hdf5/build-1.8.4-patch1-5.sh trunk/octave-forge/admin/Windows/mingw32/lapack/build-3.2.1-5.sh trunk/octave-forge/admin/Windows/mingw32/less/build-436-5.sh trunk/octave-forge/admin/Windows/mingw32/libjpeg/build-8b-5.sh trunk/octave-forge/admin/Windows/mingw32/libncurses/build-5.7-5.sh trunk/octave-forge/admin/Windows/mingw32/libpng/build-1.2.43-5.sh trunk/octave-forge/admin/Windows/mingw32/libtiff/build-3.9.2-5.sh trunk/octave-forge/admin/Windows/mingw32/pcre/build-8.00-5.sh trunk/octave-forge/admin/Windows/mingw32/qrupdate/build-1.1.1-5.sh trunk/octave-forge/admin/Windows/mingw32/regex/build-2.5.1-5.sh trunk/octave-forge/admin/Windows/mingw32/texinfo/build-4.13a-5.sh trunk/octave-forge/admin/Windows/mingw32/zlib/build-1.2.5-5.sh Modified: trunk/octave-forge/admin/Windows/mingw32/arpack/build-96-5.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/arpack/build-96-5.sh 2010-06-21 13:07:08 UTC (rev 7450) +++ trunk/octave-forge/admin/Windows/mingw32/arpack/build-96-5.sh 2010-06-21 13:14:43 UTC (rev 7451) @@ -37,7 +37,7 @@ HEADERS_BUILD_INSTALL= # install subdirectory below $PREFIX/$INC_DIR (if any) -INCLUDE_SUBDIR= +INC_SUBDIR= # License file(s) to install LICENSE_INSTALL="README" Modified: trunk/octave-forge/admin/Windows/mingw32/blas/build-5.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/blas/build-5.sh 2010-06-21 13:07:08 UTC (rev 7450) +++ trunk/octave-forge/admin/Windows/mingw32/blas/build-5.sh 2010-06-21 13:14:43 UTC (rev 7451) @@ -36,7 +36,7 @@ HEADERS_BUILD_INSTALL= # install subdirectory below $PREFIX/$INC_DIR (if any) -INCLUDE_SUBDIR= +INC_SUBDIR= # License file(s) to install LICENSE_INSTALL= Modified: trunk/octave-forge/admin/Windows/mingw32/cblas/build-5.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/cblas/build-5.sh 2010-06-21 13:07:08 UTC (rev 7450) +++ trunk/octave-forge/admin/Windows/mingw32/cblas/build-5.sh 2010-06-21 13:14:43 UTC (rev 7451) @@ -36,7 +36,7 @@ HEADERS_BUILD_INSTALL= # install subdirectory below $PREFIX/$INC_DIR (if any) -INCLUDE_SUBDIR= +INC_SUBDIR= # License file(s) to install LICENSE_INSTALL="README" Modified: trunk/octave-forge/admin/Windows/mingw32/expat/build-2.0.1-5.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/expat/build-2.0.1-5.sh 2010-06-21 13:07:08 UTC (rev 7450) +++ trunk/octave-forge/admin/Windows/mingw32/expat/build-2.0.1-5.sh 2010-06-21 13:14:43 UTC (rev 7451) @@ -36,7 +36,7 @@ HEADERS_BUILD_INSTALL= # install subdirectory below $PREFIX/$INC_DIR (if any) -INCLUDE_SUBDIR= +INC_SUBDIR= # License file(s) to install LICENSE_INSTALL="COPYING" Modified: trunk/octave-forge/admin/Windows/mingw32/fftw3/build-3.2.2-5.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/fftw3/build-3.2.2-5.sh 2010-06-21 13:07:08 UTC (rev 7450) +++ trunk/octave-forge/admin/Windows/mingw32/fftw3/build-3.2.2-5.sh 2010-06-21 13:14:43 UTC (rev 7451) @@ -36,7 +36,7 @@ HEADERS_BUILD_INSTALL= # install subdirectory below $PREFIX/$INC_DIR (if any) -INCLUDE_SUBDIR= +INC_SUBDIR= # License file(s) to install LICENSE_INSTALL="COPYING COPYRIGHT" Modified: trunk/octave-forge/admin/Windows/mingw32/hdf5/build-1.8.4-patch1-5.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/hdf5/build-1.8.4-patch1-5.sh 2010-06-21 13:07:08 UTC (rev 7450) +++ trunk/octave-forge/admin/Windows/mingw32/hdf5/build-1.8.4-patch1-5.sh 2010-06-21 13:14:43 UTC (rev 7451) @@ -70,7 +70,7 @@ HEADERS_BUILD_INSTALL="src/H5pubconf.h" # install subdirectory below $PREFIX/$INC_DIR (if any) -INCLUDE_SUBDIR= +INC_SUBDIR= # License file(s) to install LICENSE_INSTALL="COPYING" Modified: trunk/octave-forge/admin/Windows/mingw32/lapack/build-3.2.1-5.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/lapack/build-3.2.1-5.sh 2010-06-21 13:07:08 UTC (rev 7450) +++ trunk/octave-forge/admin/Windows/mingw32/lapack/build-3.2.1-5.sh 2010-06-21 13:14:43 UTC (rev 7451) @@ -36,7 +36,7 @@ HEADERS_BUILD_INSTALL= # install subdirectory below $PREFIX/$INC_DIR (if any) -INCLUDE_SUBDIR= +INC_SUBDIR= # License file(s) to install LICENSE_INSTALL="LICENSE" Modified: trunk/octave-forge/admin/Windows/mingw32/less/build-436-5.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/less/build-436-5.sh 2010-06-21 13:07:08 UTC (rev 7450) +++ trunk/octave-forge/admin/Windows/mingw32/less/build-436-5.sh 2010-06-21 13:14:43 UTC (rev 7451) @@ -36,7 +36,7 @@ HEADERS_BUILD_INSTALL= # install subdirectory below $PREFIX/$INC_DIR (if any) -INCLUDE_SUBDIR= +INC_SUBDIR= # License file(s) to install LICENSE_INSTALL="COPYING LICENSE" Modified: trunk/octave-forge/admin/Windows/mingw32/libjpeg/build-8b-5.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/libjpeg/build-8b-5.sh 2010-06-21 13:07:08 UTC (rev 7450) +++ trunk/octave-forge/admin/Windows/mingw32/libjpeg/build-8b-5.sh 2010-06-21 13:14:43 UTC (rev 7451) @@ -36,7 +36,7 @@ HEADERS_BUILD_INSTALL="jconfig.h" # install subdirectory below $PREFIX/$INC_DIR (if any) -INCLUDE_SUBDIR= +INC_SUBDIR= # License file(s) to install LICENSE_INSTALL="README" Modified: trunk/octave-forge/admin/Windows/mingw32/libncurses/build-5.7-5.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/libncurses/build-5.7-5.sh 2010-06-21 13:07:08 UTC (rev 7450) +++ trunk/octave-forge/admin/Windows/mingw32/libncurses/build-5.7-5.sh 2010-06-21 13:14:43 UTC (rev 7451) @@ -49,7 +49,7 @@ include/ncurses_dll.h" # install subdirectory below $PREFIX/$INC_DIR (if any) -INCLUDE_SUBDIR= +INC_SUBDIR= # License file(s) to install LICENSE_INSTALL="README" Modified: trunk/octave-forge/admin/Windows/mingw32/libpng/build-1.2.43-5.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/libpng/build-1.2.43-5.sh 2010-06-21 13:07:08 UTC (rev 7450) +++ trunk/octave-forge/admin/Windows/mingw32/libpng/build-1.2.43-5.sh 2010-06-21 13:14:43 UTC (rev 7451) @@ -36,7 +36,7 @@ HEADERS_BUILD_INSTALL="" # install subdirectory below $PREFIX/$INC_DIR (if any) -INCLUDE_SUBDIR= +INC_SUBDIR= # License file(s) to install LICENSE_INSTALL="LICENSE" Modified: trunk/octave-forge/admin/Windows/mingw32/libtiff/build-3.9.2-5.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/libtiff/build-3.9.2-5.sh 2010-06-21 13:07:08 UTC (rev 7450) +++ trunk/octave-forge/admin/Windows/mingw32/libtiff/build-3.9.2-5.sh 2010-06-21 13:14:43 UTC (rev 7451) @@ -40,7 +40,7 @@ libtiff/tiffconf.h" # install subdirectory below $PREFIX/$INC_DIR (if any) -INCLUDE_SUBDIR= +INC_SUBDIR= # License file(s) to install LICENSE_INSTALL="COPYRIGHT" Modified: trunk/octave-forge/admin/Windows/mingw32/pcre/build-8.00-5.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/pcre/build-8.00-5.sh 2010-06-21 13:07:08 UTC (rev 7450) +++ trunk/octave-forge/admin/Windows/mingw32/pcre/build-8.00-5.sh 2010-06-21 13:14:43 UTC (rev 7451) @@ -36,7 +36,7 @@ HEADERS_BUILD_INSTALL="pcre.h" # install subdirectory below $PREFIX/$INC_DIR (if any) -INCLUDE_SUBDIR= +INC_SUBDIR= # License file(s) to install LICENSE_INSTALL="COPYING" Modified: trunk/octave-forge/admin/Windows/mingw32/qrupdate/build-1.1.1-5.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/qrupdate/build-1.1.1-5.sh 2010-06-21 13:07:08 UTC (rev 7450) +++ trunk/octave-forge/admin/Windows/mingw32/qrupdate/build-1.1.1-5.sh 2010-06-21 13:14:43 UTC (rev 7451) @@ -36,7 +36,7 @@ HEADERS_BUILD_INSTALL= # install subdirectory below $PREFIX/$INC_DIR (if any) -INCLUDE_SUBDIR= +INC_SUBDIR= # License file(s) to install LICENSE_INSTALL="COPYING " Modified: trunk/octave-forge/admin/Windows/mingw32/regex/build-2.5.1-5.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/regex/build-2.5.1-5.sh 2010-06-21 13:07:08 UTC (rev 7450) +++ trunk/octave-forge/admin/Windows/mingw32/regex/build-2.5.1-5.sh 2010-06-21 13:14:43 UTC (rev 7451) @@ -36,7 +36,7 @@ HEADERS_BUILD_INSTALL= # install subdirectory below $PREFIX/$INC_DIR (if any) -INCLUDE_SUBDIR= +INC_SUBDIR= # License file(s) to install LICENSE_INSTALL="README COPYING.LIB" Modified: trunk/octave-forge/admin/Windows/mingw32/texinfo/build-4.13a-5.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/texinfo/build-4.13a-5.sh 2010-06-21 13:07:08 UTC (rev 7450) +++ trunk/octave-forge/admin/Windows/mingw32/texinfo/build-4.13a-5.sh 2010-06-21 13:14:43 UTC (rev 7451) @@ -36,7 +36,7 @@ HEADERS_BUILD_INSTALL= # install subdirectory below $PREFIX/$INC_DIR (if any) -INCLUDE_SUBDIR= +INC_SUBDIR= # License file(s) to install LICENSE_INSTALL="COPYING" Modified: trunk/octave-forge/admin/Windows/mingw32/zlib/build-1.2.5-5.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/zlib/build-1.2.5-5.sh 2010-06-21 13:07:08 UTC (rev 7450) +++ trunk/octave-forge/admin/Windows/mingw32/zlib/build-1.2.5-5.sh 2010-06-21 13:14:43 UTC (rev 7451) @@ -36,7 +36,7 @@ HEADERS_BUILD_INSTALL= # install subdirectory below $PREFIX/$INC_DIR (if any) -INCLUDE_SUBDIR= +INC_SUBDIR= # License file(s) to install LICENSE_INSTALL="README" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lin...@us...> - 2010-06-21 13:45:03
|
Revision: 7454 http://octave.svn.sourceforge.net/octave/?rev=7454&view=rev Author: lindnerb Date: 2010-06-21 13:44:56 +0000 (Mon, 21 Jun 2010) Log Message: ----------- mingw32 (gcc-4.5.0): fix uninstall code Modified Paths: -------------- trunk/octave-forge/admin/Windows/mingw32/gcc45_common.sh trunk/octave-forge/admin/Windows/mingw32/graphicsmagick/build-1.3.12-5.sh trunk/octave-forge/admin/Windows/mingw32/libfreetype/build-2.3.12-5.sh trunk/octave-forge/admin/Windows/mingw32/libjpeg/build-8b-5.sh trunk/octave-forge/admin/Windows/mingw32/libncurses/build-5.7-5.sh Modified: trunk/octave-forge/admin/Windows/mingw32/gcc45_common.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/gcc45_common.sh 2010-06-21 13:30:15 UTC (rev 7453) +++ trunk/octave-forge/admin/Windows/mingw32/gcc45_common.sh 2010-06-21 13:44:56 UTC (rev 7454) @@ -361,7 +361,7 @@ { # Uninstall headers for a in $HEADERS_INSTALL $HEADERS_BUILD_INSTALL; do - ${RM} ${RM_FLAGS} $PREFIX/$INC_DIR/`basename $a` + ${RM} ${RM_FLAGS} $PREFIX/${INC_DIR}${INC_SUBDIR:+/$INC_SUBDIR}/`basename $a` done # Uninstall pkg-config .pc files Modified: trunk/octave-forge/admin/Windows/mingw32/graphicsmagick/build-1.3.12-5.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/graphicsmagick/build-1.3.12-5.sh 2010-06-21 13:30:15 UTC (rev 7453) +++ trunk/octave-forge/admin/Windows/mingw32/graphicsmagick/build-1.3.12-5.sh 2010-06-21 13:44:56 UTC (rev 7454) @@ -237,53 +237,55 @@ uninstall_pre; # Install library, import library and static library - ${RM} ${RM_FLAGS} ${SHAREDLIB_PATH}/GraphicsMagick.dll - ${RM} ${RM_FLAGS} ${LIBRARY_PATH}/libGraphicsMagick.dll.a - ${RM} ${RM_FLAGS} ${STATICLIB_PATH}/libGraphicsMagick.a + ${RM} ${RM_FLAGS} $PREFIX/$BIN_DIR/GraphicsMagick.dll + ${RM} ${RM_FLAGS} $PREFIX/$LIB_DIR/libGraphicsMagick.dll.a + ${RM} ${RM_FLAGS} $PREFIX/$STATICLIB_DIR/libGraphicsMagick.a - ${RM} ${RM_FLAGS} ${SHAREDLIB_PATH}/GraphicsMagick++.dll - ${RM} ${RM_FLAGS} ${LIBRARY_PATH}/libGraphicsMagick++.dll.a - ${RM} ${RM_FLAGS} ${STATICLIB_PATH}/libGraphicsMagick++.a + ${RM} ${RM_FLAGS} $PREFIX/$BIN_DIR/GraphicsMagick++.dll + ${RM} ${RM_FLAGS} $PREFIX/$LIB_DIR/libGraphicsMagick++.dll.a + ${RM} ${RM_FLAGS} $PREFIX/$STATICLIB_DIR/libGraphicsMagick++.a - ${RM} ${RM_FLAGS} ${SHAREDLIB_PATH}/GraphicsMagickWand.dll - ${RM} ${RM_FLAGS} ${LIBRARY_PATH}/libGraphicsMagickWand.dll.a - ${RM} ${RM_FLAGS} ${STATICLIB_PATH}/libGraphicsMagickWand.a + ${RM} ${RM_FLAGS} $PREFIX/$BIN_DIR/GraphicsMagickWand.dll + ${RM} ${RM_FLAGS} $PREFIX/$LIB_DIR/libGraphicsMagickWand.dll.a + ${RM} ${RM_FLAGS} $PREFIX/$STATICLIB_DIR/libGraphicsMagickWand.a - ${RM} ${RM_FLAGS} ${BINARY_PATH}/GraphicsMagick-config - ${RM} ${RM_FLAGS} ${BINARY_PATH}/GraphicsMagick++-config + ${RM} ${RM_FLAGS} $PREFIX/$BIN_DIR/GraphicsMagick-config + ${RM} ${RM_FLAGS} $PREFIX/$BIN_DIR/GraphicsMagick++-config # Uninstall executable tools for a in ${TOOLS}; do - ${RM} ${RM_FLAGS} ${BINARY_PATH}/$a + ${RM} ${RM_FLAGS} $PREFIX/$BIN_DIR/$a done # Uninstall headers for a in $MAGICK_HEADERS magick_config.h; do - ${RM} ${RM_FLAGS} ${INCLUDE_PATH}/magick/$a + ${RM} ${RM_FLAGS} $PREFIX/$INC_DIR/magick/$a done - rmdir --ignore-fail-on-non-empty ${INCLUDE_PATH}/magick + rmdir --ignore-fail-on-non-empty $PREFIX/$INC_DIR/magick for a in $MAGICKPP_HEADERS; do - ${RM} ${RM_FLAGS} ${INCLUDE_PATH}/magick++/$a + ${RM} ${RM_FLAGS} $PREFIX/$INC_DIR/magick++/$a done - rmdir --ignore-fail-on-non-empty ${INCLUDE_PATH}/magick++ - ${RM} ${RM_FLAGS} ${INCLUDE_PATH}/Magick++.h + rmdir --ignore-fail-on-non-empty $PREFIX/$INC_DIR/magick++ + ${RM} ${RM_FLAGS} $PREFIX/$INC_DIR/Magick++.h for a in $MGK_CONFIG_SRC $MGK_CONFIG_BUILD; do - ${RM} ${RM_FLAGS} ${SHARE_PATH}/${PKGVER}/config/$a + ${RM} ${RM_FLAGS} $PREFIX/$SHARE_DIR/${PKGVER}/config/$a done - rmdir --ignore-fail-on-non-empty ${SHARE_PATH}/${PKGVER}/config + rmdir --ignore-fail-on-non-empty $PREFIX/$SHARE_DIR/${PKGVER}/config + rmdir --ignore-fail-on-non-empty $PREFIX/$SHARE_DIR/${PKGVER} # Uninstall pkg-config .pc files for a in $PKG_CONFIG_INSTALL; do - ${RM} ${RM_FLAGS} ${PKGCONFIGDATA_PATH}/`basename $a` + ${RM} ${RM_FLAGS} $PREFIX/$PKGCONFIG_DIR/`basename $a` done # Uninstall license file - ${RM} ${RM_FLAGS} ${LICENSE_PATH}/${PKG}/Copyright.txt - ${RM} ${RM_FLAGS} ${LICENSE_PATH}/${PKG}/Magick++/COPYING - rmdir --ignore-fail-on-non-empty ${LICENSE_PATH}/${PKG}/Magick++ + ${RM} ${RM_FLAGS} $PREFIX/$LIC_DIR/${PKG}/Copyright.txt + ${RM} ${RM_FLAGS} $PREFIX/$LIC_DIR/${PKG}/Magick++/COPYING + rmdir --ignore-fail-on-non-empty $PREFIX/$LIC_DIR/${PKG}/Magick++ + uninstall_common; uninstall_post; } Modified: trunk/octave-forge/admin/Windows/mingw32/libfreetype/build-2.3.12-5.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/libfreetype/build-2.3.12-5.sh 2010-06-21 13:30:15 UTC (rev 7453) +++ trunk/octave-forge/admin/Windows/mingw32/libfreetype/build-2.3.12-5.sh 2010-06-21 13:44:56 UTC (rev 7454) @@ -115,7 +115,7 @@ # Install library, import library and static library ${CP} ${CP_FLAGS} ${BUILDDIR}/.libs/freetype-6.dll $PREFIX/$BIN_DIR ${CP} ${CP_FLAGS} ${BUILDDIR}/.libs/libfreetype.dll.a $PREFIX/$LIB_DIR - ${CP} ${CP_FLAGS} ${BUILDDIR}/.libs/libfreetype.dll.a $PREFIX/$STATICLIB_DIR + ${CP} ${CP_FLAGS} ${BUILDDIR}/.libs/libfreetype.a $PREFIX/$STATICLIB_DIR ${CP} ${CP_FLAGS} ${BUILDDIR}/freetype-config $PREFIX/$BIN_DIR Modified: trunk/octave-forge/admin/Windows/mingw32/libjpeg/build-8b-5.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/libjpeg/build-8b-5.sh 2010-06-21 13:30:15 UTC (rev 7453) +++ trunk/octave-forge/admin/Windows/mingw32/libjpeg/build-8b-5.sh 2010-06-21 13:44:56 UTC (rev 7454) @@ -89,9 +89,9 @@ uninstall_pre; # Install library, import library and static library - ${RM} ${RM_FLAGS} ${SHAREDLIB_PATH}/jpeg-8.dll - ${RM} ${RM_FLAGS} ${LIBRARY_PATH}/libjpeg.dll.a - ${RM} ${RM_FLAGS} ${STATICLIB_PATH}/libjpeg.a + ${RM} ${RM_FLAGS} $PREFIX/$BIN_DIR/jpeg-8.dll + ${RM} ${RM_FLAGS} $PREFIX/$LIB_DIR/libjpeg.dll.a + ${RM} ${RM_FLAGS} $PREFIX/$STATICLIB_DIR/libjpeg.a uninstall_common; uninstall_post; Modified: trunk/octave-forge/admin/Windows/mingw32/libncurses/build-5.7-5.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/libncurses/build-5.7-5.sh 2010-06-21 13:30:15 UTC (rev 7453) +++ trunk/octave-forge/admin/Windows/mingw32/libncurses/build-5.7-5.sh 2010-06-21 13:44:56 UTC (rev 7454) @@ -180,6 +180,7 @@ ${RM} ${RM_FLAGS} $PREFIX/$STATICLIB_DIR/lib$a.a done + ${RM} ${RM_FLAGS} $PREFIX/$BIN_DIR/ncurses5-config ${RM} -rvf $PREFIX/$SHARE_DIR/terminfo ${RM} -rvf $PREFIX/$SHARE_DIR/tabset This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |