Mercurial > gub
view patches/openoffice-config_office-mingw.patch @ 6512:ccc20ae889ca default tip guix
mingw::guile-2.0.7 builds.
author | Jan Nieuwenhuizen <janneke@gnu.org> |
---|---|
date | Thu, 24 Mar 2016 08:03:39 +0100 |
parents | e4d443502bbb |
children |
line wrap: on
line source
--- config_office/configure.in.orig 2008-10-19 22:03:22.000000000 +0200 +++ config_office/configure.in 2008-10-19 22:17:08.000000000 +0200 @@ -1059,7 +1079,7 @@ fi AC_SUBST(ENABLE_CRASHDUMP) -if test "$_os" = "WINNT"; then +if test "$_os" = "WINNT" -o "$t_os" = "MinGW"; then BUILD_TYPE="$BUILD_TYPE TWAIN" fi @@ -4265,7 +4262,7 @@ elif test "$_os" = "OS2" ; then echo "Do Nothing for _os = OS2. Don't check for X11." dnl OS/2 uses native graphics. Don't check for X11. : -elif test "$_os" != "WINNT" ; then +elif test "$_os" != "WINNT" -a "$t_os" != "MinGW" ; then AC_PATH_X AC_PATH_XTRA CPPFLAGS="$CPPFLAGS $X_CFLAGS" @@ -4526,7 +4564,7 @@ fi AC_SUBST(XLIB) AC_SUBST(XAU_LIBS) -if test "$_os" != "WINNT" -a "$_os" != "OS2" -a "$_os" != "Darwin"; then +if test "$_os" != "WINNT" -a "$t_os" != "MinGW" -a "$_os" != "OS2" -a "$_os" != "Darwin"; then dnl =================================================================== dnl Check for using Xaw dnl =================================================================== @@ -5371,7 +5409,7 @@ dnl ==================================== ENABLE_GCONF="" AC_MSG_CHECKING([whether to enable GConf support]) -if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$_os" != "OS2" -a "$enable_gconf" = "yes"; then +if test "$_os" != "WINNT" -a "$t_os" != "MinGW" -a "$_os" != "Darwin" -a "$_os" != "OS2" -a "$enable_gconf" = "yes"; then ENABLE_GCONF="TRUE" AC_MSG_RESULT([yes]) PKG_CHECK_MODULES( GCONF, gconf-2.0 ) @@ -5387,7 +5425,7 @@ dnl ==================================== ENABLE_GNOMEVFS="" GNOMEVFS_HAS_LOCKING="" AC_MSG_CHECKING([whether to enable GNOME VFS support]) -if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_gnome_vfs" = "yes"; then +if test "$_os" != "WINNT" -a "$t_os" != "MinGW" -a "$_os" != "Darwin" -a "$enable_gnome_vfs" = "yes"; then ENABLE_GNOMEVFS="TRUE" AC_MSG_RESULT([yes]) PKG_CHECK_MODULES( GNOMEVFS, gnome-vfs-2.0 >= 2.6.0 ) --- config_office/set_soenv.in.orig 2008-10-20 19:52:27.000000000 +0200 +++ config_office/set_soenv.in 2008-10-20 20:22:58.000000000 +0200 @@ -593,6 +593,22 @@ elsif ( $platform =~ m/linux/ ) $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."lib".$ds.$ARCH.$ds."xawt"; } + if ( "@TARGET_OS@" == "MinGW" ) + { + print "Setting build=Linux -> target,host=MinGW specific values... "; + $COM = "GCC"; + $CVER = "C341"; + $OUTPATH = "wntgcci"; + $CPUNAME = "INTEL"; + $CPU = "I"; + $GUI = "WNT"; + $GUIBASE = "WIN"; + $GVER = "NT351"; + $OS = "WNT"; + $DYNAMIC_CRT = "TRUE"; + $SET_EXCEPTIONS = "TRUE"; + $use_shl_versions = "TRUE"; + } $INPATH = $OUTPATH.$PROEXT; }