rpms/openoffice.org/devel workspace.cmcfixes43.patch, 1.1.2.3, 1.1.2.4
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Mon Mar 10 13:36:07 UTC 2008
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30023
Modified Files:
Tag: openoffice_org-2_4_0-9_1_999_fc9
workspace.cmcfixes43.patch
Log Message:
add system lpsolve
workspace.cmcfixes43.patch:
Index: workspace.cmcfixes43.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/Attic/workspace.cmcfixes43.patch,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- workspace.cmcfixes43.patch 7 Mar 2008 19:50:44 -0000 1.1.2.3
+++ workspace.cmcfixes43.patch 10 Mar 2008 13:35:57 -0000 1.1.2.4
@@ -105,7 +105,7 @@
Index: udk/testtools/source/bridgetest/component.LINUXIgcc3.map
diff -u udk/testtools/source/bridgetest/component.LINUXIgcc3.map:1.3 udk/testtools/source/bridgetest/component.LINUXIgcc3.map:removed
--- udk/testtools/source/bridgetest/component.LINUXIgcc3.map:1.3 Fri Sep 9 05:21:49 2005
-+++ udk/testtools/source/bridgetest/component.LINUXIgcc3.map Fri Mar 7 09:02:56 2008
++++ udk/testtools/source/bridgetest/component.LINUXIgcc3.map Mon Mar 10 06:32:43 2008
@@ -1,46 +0,0 @@
-#*************************************************************************
-#
@@ -155,7 +155,7 @@
-};
Index: udk/testtools/source/bridgetest/component.gcc3.map
diff -u /dev/null udk/testtools/source/bridgetest/component.gcc3.map:1.1.2.1
---- /dev/null Fri Mar 7 09:02:56 2008
+--- /dev/null Mon Mar 10 06:32:43 2008
+++ udk/testtools/source/bridgetest/component.gcc3.map Mon Mar 3 02:54:31 2008
@@ -0,0 +1,46 @@
+#*************************************************************************
@@ -247,7 +247,7 @@
.ENDIF
Index: udk/cppuhelper/qa/propertysetmixin/test.gcc3.map
diff -u /dev/null udk/cppuhelper/qa/propertysetmixin/test.gcc3.map:1.1.2.1
---- /dev/null Fri Mar 7 09:03:01 2008
+--- /dev/null Mon Mar 10 06:32:46 2008
+++ udk/cppuhelper/qa/propertysetmixin/test.gcc3.map Mon Mar 3 01:51:55 2008
@@ -0,0 +1,44 @@
+#*************************************************************************
@@ -294,9 +294,19 @@
+ local:
+ *;
+};
+Index: sc/scext/prj/build.lst
+diff -u sc/scext/prj/build.lst:1.4 sc/scext/prj/build.lst:1.4.2.1
+--- sc/scext/prj/build.lst:1.4 Mon Feb 11 00:55:26 2008
++++ sc/scext/prj/build.lst Mon Mar 10 05:19:15 2008
+@@ -1,4 +1,4 @@
+-scx scext : offuh comphelper lpsolve tools transex3 rsc NULL
++scx scext : offuh comphelper LPSOLVE:lpsolve tools transex3 rsc NULL
+ scx scext usr1 - all scx_mkout NULL
+ scx scext\prj get - all scx_prj NULL
+ scx scext\source\solver nmake - all scx_solver NULL
Index: porting/sal/qa/rtl/textenc/gcc3_export.map
diff -u /dev/null porting/sal/qa/rtl/textenc/gcc3_export.map:1.1.2.1
---- /dev/null Fri Mar 7 09:03:08 2008
+--- /dev/null Mon Mar 10 06:32:58 2008
+++ porting/sal/qa/rtl/textenc/gcc3_export.map Mon Mar 3 02:49:08 2008
@@ -0,0 +1,44 @@
+#*************************************************************************
@@ -346,7 +356,7 @@
Index: porting/sal/qa/rtl/textenc/linuxigcc3_export.map
diff -u porting/sal/qa/rtl/textenc/linuxigcc3_export.map:1.3 porting/sal/qa/rtl/textenc/linuxigcc3_export.map:removed
--- porting/sal/qa/rtl/textenc/linuxigcc3_export.map:1.3 Thu Sep 8 08:52:16 2005
-+++ porting/sal/qa/rtl/textenc/linuxigcc3_export.map Fri Mar 7 09:03:08 2008
++++ porting/sal/qa/rtl/textenc/linuxigcc3_export.map Mon Mar 10 06:32:58 2008
@@ -1,44 +0,0 @@
-#*************************************************************************
-#
@@ -435,6 +445,38 @@
#endif
/* Define if you have the <cmath> header file. */
+Index: installation/scp2/source/calc/file_calc.scp
+diff -u installation/scp2/source/calc/file_calc.scp:1.38 installation/scp2/source/calc/file_calc.scp:1.38.42.1
+--- installation/scp2/source/calc/file_calc.scp:1.38 Tue Feb 5 07:51:55 2008
++++ installation/scp2/source/calc/file_calc.scp Mon Mar 10 05:19:09 2008
+@@ -37,10 +37,12 @@
+
+ STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Solver, solver)
+
++#ifndef SYSTEM_LPSOLVE
+ File gid_File_Lib_Lpsolve
+ Name = SPECIAL_NAME(lpsolve55);
+ PACKED_LIB_FILE_BODY_PATCH;
+ End
++#endif
+
+ STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Analysis, analysis)
+
+Index: installation/scp2/source/calc/makefile.mk
+diff -u installation/scp2/source/calc/makefile.mk:1.6 installation/scp2/source/calc/makefile.mk:1.6.1008.1
+--- installation/scp2/source/calc/makefile.mk:1.6 Thu Sep 8 18:21:34 2005
++++ installation/scp2/source/calc/makefile.mk Mon Mar 10 05:19:09 2008
+@@ -49,6 +49,10 @@
+ SCPDEFS+=-DWITHOUT_BINFILTER
+ .ENDIF
+
++.IF "$(SYSTEM_LPSOLVE)" == "YES"
++SCPDEFS+=-DSYSTEM_LPSOLVE
++.ENDIF
++
+ SCP_PRODUCT_TYPE=osl
+ PARFILES= \
+ module_calc.par \
Index: util/xmlhelp/source/com/sun/star/help/makefile.mk
diff -u util/xmlhelp/source/com/sun/star/help/makefile.mk:1.32 util/xmlhelp/source/com/sun/star/help/makefile.mk:1.32.2.1
--- util/xmlhelp/source/com/sun/star/help/makefile.mk:1.32 Mon Feb 25 23:46:38 2008
@@ -450,9 +492,258 @@
OBJFILES=\
$(OBJ)$/HelpLinker.obj \
$(OBJ)$/HelpCompiler.obj
+Index: tools/config_office/configure.in
+diff -u tools/config_office/configure.in:1.249 tools/config_office/configure.in:1.249.12.3
+--- tools/config_office/configure.in:1.249 Tue Feb 19 04:37:37 2008
++++ tools/config_office/configure.in Mon Mar 10 05:21:09 2008
+@@ -278,9 +278,15 @@
+ ],,)
+ AC_ARG_WITH(system-libs,
+ [ --with-system-libs Use libs already on system -- enables all
+- --with-system-* flags except mozilla, python and
++ --with-system-* flags except mozilla and
+ odbc/sane/xrender-header(s)
+ ],,)
++AC_ARG_WITH(system-headers,
++[ --with-system-headers Use headers already on system -- enables all
++ --with-system-* flags for external packages
++ whose headers are the only entities used i.e.
++ boost/vigra/odbc/sane/xrender-header(s)
++],,)
+ AC_ARG_WITH(system-jars,
+ [ --without-system-jars When building with --with-system-libs, also the
+ needed jars are expected on the system. Use this to
+@@ -461,12 +467,16 @@
+ AC_ARG_WITH(system-altlinuxhyph,
+ [ --with-system-altlinuxhyph Use ALTLinuxhyph already on system
+ ],,)
++AC_ARG_WITH(system-lpsolve,
++[ --with-system-lpsolve Use lpsolve already on system
++],,)
+ AC_ARG_WITH(system-mozilla,
+ [ --with-system-mozilla Use mozilla already on system. Note that some
+ components cannot be built against a contemporary
+ mozilla. The flavour used can be specified by
+ --with-system-mozilla=<flavour>. Supported are:
+- xulrunner (default), firefox, seamonkey, mozilla
++ libxul (default), xulrunner, firefox, seamonkey,
++ mozilla
+ ], WITH_SYSTEM_MOZILLA=$withval, WITH_SYSTEM_MOZILLA=no)
+ AC_ARG_WITH(stlport,
+ [ --with-stlport The location that STLport is installed in. The STL
+@@ -3151,10 +3161,12 @@
+ dnl ===================================================================
+ dnl Check for prelinked libgcc_s.so.1
+ dnl ===================================================================
+-if test -n "$checkforprelink" -a -f /etc/rpm/macros.prelink; then
+- with_system_stdlibs=yes
+- AC_MSG_WARN([prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override])
+- echo "prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >> warn
++if test -z "$with_system_stdlibs" -a -z "$with_system_libs"; then
++ if test -n "$checkforprelink" -a -f /etc/rpm/macros.prelink; then
++ with_system_stdlibs=yes
++ AC_MSG_WARN([prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override])
++ echo "prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >> warn
++ fi
+ fi
+
+ dnl ===================================================================
+@@ -3361,7 +3373,8 @@
+ with_system_python=yes
+ fi
+ AC_MSG_CHECKING([which python to use])
+-if test -n "$with_system_python" && test "$with_system_python" != "no"; then
++if test -n "$with_system_python" -o -n "$with_system_libs" && \
++ test "$with_system_python" != "no"; then
+ SYSTEM_PYTHON=YES
+ AC_MSG_RESULT([external])
+ AM_PATH_PYTHON([2.2])
+@@ -3669,7 +3682,8 @@
+ dnl Check for system boost
+ dnl ===================================================================
+ AC_MSG_CHECKING([which boost to use])
+-if test -n "$with_system_boost" && test "$with_system_boost" != "no"; then
++if test -n "$with_system_boost" -o -n "$with_system_headers" && \
++ test "$with_system_boost" != "no"; then
+ AC_MSG_RESULT([external])
+ SYSTEM_BOOST=YES
+ AC_LANG_PUSH([C++])
+@@ -3689,7 +3703,8 @@
+ dnl Check for system vigra
+ dnl ===================================================================
+ AC_MSG_CHECKING([which vigra to use])
+-if test -n "$with_system_vigra" && test "$with_system_vigra" != "no"; then
++if test -n "$with_system_vigra" -o -n "$with_system_headers" && \
++ test "$with_system_vigra" != "no"; then
+ AC_MSG_RESULT([external])
+ SYSTEM_VIGRA=YES
+ AC_LANG_PUSH([C++])
+@@ -3707,7 +3722,8 @@
+ dnl Check for system odbc
+ dnl ===================================================================
+ AC_MSG_CHECKING([which odbc headers to use])
+-if test -n "$with_system_odbc_headers" && test "$with_system_odbc_headers" != "no"; then
++if test -n "$with_system_odbc_headers" -o -n "$with_system_headers" && \
++ test "$with_system_odbc_headers" != "no"; then
+ AC_MSG_RESULT([external])
+ SYSTEM_ODBC_HEADERS=YES
+
+@@ -3794,7 +3810,9 @@
+ AC_MSG_RESULT([external])
+ SYSTEM_MOZILLA=YES
+ AC_MSG_CHECKING([which Mozilla flavour to use])
+- if test -n "$with_system_mozilla" && test "$with_system_mozilla" = "xulrunner"; then
++ if test -n "$with_system_mozilla" && test "$with_system_mozilla" = "libxul"; then
++ MOZ_FLAVOUR=libxul
++ elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "xulrunner"; then
+ MOZ_FLAVOUR=xulrunner
+ elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "seamonkey"; then
+ MOZ_FLAVOUR=seamonkey
+@@ -3803,12 +3821,18 @@
+ elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "mozilla"; then
+ MOZ_FLAVOUR=mozilla
+ else
+- MOZ_FLAVOUR=xulrunner
++ MOZ_FLAVOUR=libxul
+ fi
+ tmp=`echo $MOZ_FLAVOUR | $PERL -e 'print ucfirst(<STDIN>);'`
+ AC_MSG_RESULT($tmp)
+
+- PKG_CHECK_MODULES( MOZILLAXPCOM, $MOZ_FLAVOUR-xpcom )
++ PKG_CHECK_MODULES( MOZ_NSS, nss, STANDALONENSS="TRUE", STANDALONENSS="" )
++ if test -z "$STANDALONENSS"; then
++ PKG_CHECK_MODULES( MOZ_NSS, $MOZ_FLAVOUR-nss )
++ else
++ NSS_LIB="-L`$PKG_CONFIG --variable=libdir nss`"
++ AC_SUBST(NSS_LIB)
++ fi
+
+ if $PKG_CONFIG --exists nspr ; then
+ PKG_CHECK_MODULES( MOZ_NSPR, nspr )
+@@ -3818,12 +3842,14 @@
+ PKG_CHECK_MODULES( MOZ_NSPR, $MOZ_FLAVOUR-nspr )
+ fi
+
+- PKG_CHECK_MODULES( MOZ_NSS, nss, STANDALONENSS="TRUE", STANDALONENSS="" )
+- if test -z "$STANDALONENSS"; then
+- PKG_CHECK_MODULES( MOZ_NSS, $MOZ_FLAVOUR-nss )
++ if $PKG_CONFIG --exists libxul ; then
++ PKG_CHECK_MODULES( MOZILLAXPCOM, libxul )
++ MOZ_INC=`$PKG_CONFIG --variable=includedir libxul`
++ MOZ_LIB=`$PKG_CONFIG --variable=libdir libxul`
+ else
+- NSS_LIB="-L`$PKG_CONFIG --variable=libdir nss`"
+- AC_SUBST(NSS_LIB)
++ PKG_CHECK_MODULES( MOZILLAXPCOM, $MOZ_FLAVOUR-xpcom )
++ MOZ_INC=`$PKG_CONFIG --variable=includedir $MOZ_FLAVOUR-xpcom`
++ MOZ_LIB=`$PKG_CONFIG --variable=libdir $MOZ_FLAVOUR-xpcom`
+ fi
+
+ save_CPPFLAGS="$CPPFLAGS"
+@@ -3839,8 +3865,6 @@
+ CPPFLAGS="$save_CPPFLAGS"
+ LIBS="$save_LIBS"
+
+- MOZ_INC=`$PKG_CONFIG --variable=includedir $MOZ_FLAVOUR-xpcom`
+- MOZ_LIB=`$PKG_CONFIG --variable=libdir $MOZ_FLAVOUR-xpcom`
+ MOZ_LIB_XPCOM=$MOZILLAXPCOM_LIBS
+ if test "$WITH_LDAP" != "NO" && test "$WITH_OPENLDAP" != "YES"; then
+ AC_MSG_CHECKING([whether $tmp was compiled with --enable-ldap])
+@@ -3853,6 +3877,13 @@
+ Please recompile $tmp with --enable-ldap or use --with-openldap.])
+ fi
+ fi
++
++ #e.g. http://fedoraproject.org/wiki/Releases/FeatureXULRunnerAPIChanges
++ #the plugin pkg-config etc. reverts to "mozilla-plugin" with libxul
++ if test "$MOZ_FLAVOUR" == "libxul"; then
++ MOZ_FLAVOUR="mozilla"
++ fi
++
+ elif test "$enable_mozilla" = "no"; then
+ AC_MSG_RESULT([none])
+ WITH_MOZILLA=NO
+@@ -3989,7 +4020,8 @@
+ dnl Check for system sane
+ dnl ===================================================================
+ AC_MSG_CHECKING([which sane header to use])
+-if test -n "$with_system_sane_header" && test "$with_system_sane_header" != "no"; then
++if test -n "$with_system_sane_header" -o -n "$with_system_headers" && \
++ test "$with_system_sane_header" != "no"; then
+ AC_MSG_RESULT([external])
+ SYSTEM_SANE_HEADER=YES
+ AC_CHECK_HEADER(sane/sane.h, [],
+@@ -4186,7 +4218,8 @@
+ XRENDER_LINK=NO
+ fi
+ AC_MSG_CHECKING([which Xrender headers to use])
+-if test -n "$with_system_xrender_headers" && test "$with_system_xrender_headers" != "no"; then
++if test -n "$with_system_xrender_headers" -o -n "$with_system_headers" && \
++ test "$with_system_xrender_headers" != "no"; then
+ AC_MSG_RESULT([external])
+ SYSTEM_XRENDER_HEADERS=YES
+ AC_CHECK_HEADER(X11/extensions/Xrender.h, [],
+@@ -4421,7 +4454,8 @@
+ dnl Check for system hunspell
+ dnl ===================================================================
+ AC_MSG_CHECKING([which libhunspell to use])
+-if test -n "$with_system_hunspell" && test "$with_system_hunspell" != "no"; then
++if test -n "$with_system_hunspell" -o -n "$with_system_libs" && \
++ test "$with_system_hunspell" != "no"; then
+ AC_MSG_RESULT([external])
+ SYSTEM_HUNSPELL=YES
+ AC_LANG_PUSH([C++])
+@@ -4449,7 +4483,8 @@
+ dnl Checking for altlinuxhyph
+ dnl ===================================================================
+ AC_MSG_CHECKING([which altlinuxhyph to use])
+-if test -n "$with_system_altlinuxhyph" && test "$with_system_altlinuxyph" != "no"; then
++if test -n "$with_system_altlinuxhyph" -o -n "$with_system_libs" && \
++ test "$with_system_altlinuxhyph" != "no"; then
+ AC_MSG_RESULT([external])
+ SYSTEM_HYPH=YES
+ AC_CHECK_HEADER(hyphen.h, [],
+@@ -4491,6 +4526,25 @@
+ fi
+ AC_SUBST(SYSTEM_MYTHES)
+
++dnl ===================================================================
++dnl Checking for lpsolve
++dnl ===================================================================
++AC_MSG_CHECKING([which lpsolve to use])
++if test -n "$with_system_lpsolve" -o -n "$with_system_libs" && \
++ test "$with_system_lpsolve" != "no"; then
++ AC_MSG_RESULT([external])
++ SYSTEM_LPSOLVE=YES
++ AC_CHECK_HEADER(lpsolve/lp_lib.h, [],
++ [ AC_MSG_ERROR(lpsolve headers not found.)], [])
++ AC_CHECK_LIB(lpsolve55, make_lp, ,
++ [ AC_MSG_ERROR(lpsolve library not found or too old.)], [])
++else
++ AC_MSG_RESULT([internal])
++ SYSTEM_LPSOLVE=NO
++ BUILD_TYPE="$BUILD_TYPE LPSOLVE"
++fi
++AC_SUBST(SYSTEM_LPSOLVE)
++
+ dnl ***************************************
+ dnl testing libc version for Linux...
+ dnl ***************************************
+Index: tools/config_office/set_soenv.in
+diff -u tools/config_office/set_soenv.in:1.174 tools/config_office/set_soenv.in:1.174.6.1
+--- tools/config_office/set_soenv.in:1.174 Wed Feb 27 02:03:23 2008
++++ tools/config_office/set_soenv.in Mon Mar 10 05:21:10 2008
+@@ -2025,6 +2025,7 @@
+ ToFile( "SYSTEM_HUNSPELL", "@SYSTEM_HUNSPELL@", "e" );
+ ToFile( "HUNSPELL_CFLAGS", "@HUNSPELL_CFLAGS@", "e" );
+ ToFile( "HUNSPELL_LIBS", "@HUNSPELL_LIBS@", "e" );
++ToFile( "SYSTEM_LPSOLVE", "@SYSTEM_LPSOLVE@", "e" );
+ ToFile( "SYSTEM_HYPH", "@SYSTEM_HYPH@", "e" );
+ ToFile( "HYPHEN_LIB", "@HYPHEN_LIB@", "e" );
+ ToFile( "SYSTEM_MYTHES", "@SYSTEM_MYTHES@", "e" );
Index: udk/jvmaccess/util/gcc3.map
diff -u /dev/null udk/jvmaccess/util/gcc3.map:1.1.2.1
---- /dev/null Fri Mar 7 09:03:35 2008
+--- /dev/null Mon Mar 10 06:33:43 2008
+++ udk/jvmaccess/util/gcc3.map Mon Mar 3 01:38:57 2008
@@ -0,0 +1,96 @@
+#*************************************************************************
@@ -554,7 +845,7 @@
Index: udk/jvmaccess/util/gcc3_linux_intel.map
diff -u udk/jvmaccess/util/gcc3_linux_intel.map:1.14 udk/jvmaccess/util/gcc3_linux_intel.map:removed
--- udk/jvmaccess/util/gcc3_linux_intel.map:1.14 Tue Jul 3 05:42:50 2007
-+++ udk/jvmaccess/util/gcc3_linux_intel.map Fri Mar 7 09:03:35 2008
++++ udk/jvmaccess/util/gcc3_linux_intel.map Mon Mar 10 06:33:43 2008
@@ -1,96 +0,0 @@
-#*************************************************************************
-#
@@ -705,6 +996,41 @@
#ifdef GCC
namespace std
+Index: tools/solenv/config/sdev300.ini
+diff -u tools/solenv/config/sdev300.ini:1.2 tools/solenv/config/sdev300.ini:1.2.10.1
+--- tools/solenv/config/sdev300.ini:1.2 Mon Feb 25 08:39:12 2008
++++ tools/solenv/config/sdev300.ini Mon Mar 10 05:19:44 2008
+@@ -86,7 +86,7 @@
+ {
+ BIG_SVX TRUE
+ BMP_WRITES_FLAG TRUE
+- BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES FREETYPE HSQLDB JPEG LIBXML2 LIBXMLSEC MOZ NAS NEON TWAIN PYTHON ZLIB SNDFILE PORTAUDIO SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT XALAN SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT REPORTDESIGN SDEXT
++ BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES FREETYPE HSQLDB JPEG LIBXML2 LIBXMLSEC MOZ NAS NEON TWAIN PYTHON ZLIB SNDFILE PORTAUDIO SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT LPSOLVE XALAN SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT REPORTDESIGN SDEXT
+ RES_ENUS TRUE
+ RES_GER TRUE
+ NO_REC_RES TRUE
+Index: tools/solenv/inc/libs.mk
+diff -u tools/solenv/inc/libs.mk:1.126 tools/solenv/inc/libs.mk:1.126.10.1
+--- tools/solenv/inc/libs.mk:1.126 Mon Feb 25 08:42:00 2008
++++ tools/solenv/inc/libs.mk Wed Mar 5 09:24:45 2008
+@@ -327,7 +327,7 @@
+ SABLOT3RDLIB=-lsablot
+ APP3RDLIB=-lapp
+ SAMPLE3RDLIB=-lsample
+-HNJLIB=-lhnj
++HNJLIB*=-lhnj
+ MYSPELLLIB=-lmyspell
+ COSVLIB=-lcosv
+ UDMLIB=-ludm
+@@ -483,7 +483,7 @@
+ SABLOT3RDLIB= $(LIBPRE) sablot.lib
+ APP3RDLIB= $(LIBPRE) app.lib
+ SAMPLE3RDLIB= $(LIBPRE) sample.lib
+-HNJLIB= libhnj.lib
++HNJLIB*=libhnj.lib
+ MYSPELLLIB= $(LIBPRE) myspell.lib
+ COSVLIB= $(LIBPRE) cosv.lib
+ UDMLIB= $(LIBPRE) udm.lib
Index: udk/stoc/test/registry_tdprovider/makefile.mk
diff -u udk/stoc/test/registry_tdprovider/makefile.mk:1.4 udk/stoc/test/registry_tdprovider/makefile.mk:1.4.88.1
--- udk/stoc/test/registry_tdprovider/makefile.mk:1.4 Thu Sep 8 01:30:08 2005
@@ -723,7 +1049,7 @@
Index: udk/stoc/test/registry_tdprovider/testregistrytdprovider.LINUXIgcc3.map
diff -u udk/stoc/test/registry_tdprovider/testregistrytdprovider.LINUXIgcc3.map:1.3 udk/stoc/test/registry_tdprovider/testregistrytdprovider.LINUXIgcc3.map:removed
--- udk/stoc/test/registry_tdprovider/testregistrytdprovider.LINUXIgcc3.map:1.3 Thu Sep 8 01:30:31 2005
-+++ udk/stoc/test/registry_tdprovider/testregistrytdprovider.LINUXIgcc3.map Fri Mar 7 09:03:51 2008
++++ udk/stoc/test/registry_tdprovider/testregistrytdprovider.LINUXIgcc3.map Mon Mar 10 06:34:10 2008
@@ -1,46 +0,0 @@
-#*************************************************************************
-#
@@ -773,7 +1099,7 @@
-};
Index: udk/stoc/test/registry_tdprovider/testregistrytdprovider.gcc3.map
diff -u /dev/null udk/stoc/test/registry_tdprovider/testregistrytdprovider.gcc3.map:1.1.2.1
---- /dev/null Fri Mar 7 09:03:51 2008
+--- /dev/null Mon Mar 10 06:34:10 2008
+++ udk/stoc/test/registry_tdprovider/testregistrytdprovider.gcc3.map Mon Mar 3 02:52:36 2008
@@ -0,0 +1,46 @@
+#*************************************************************************
@@ -840,7 +1166,7 @@
Index: udk/stoc/test/tdmanager/testtdmanager.LINUXIgcc3.map
diff -u udk/stoc/test/tdmanager/testtdmanager.LINUXIgcc3.map:1.3 udk/stoc/test/tdmanager/testtdmanager.LINUXIgcc3.map:removed
--- udk/stoc/test/tdmanager/testtdmanager.LINUXIgcc3.map:1.3 Thu Sep 8 01:32:51 2005
-+++ udk/stoc/test/tdmanager/testtdmanager.LINUXIgcc3.map Fri Mar 7 09:03:51 2008
++++ udk/stoc/test/tdmanager/testtdmanager.LINUXIgcc3.map Mon Mar 10 06:34:10 2008
@@ -1,46 +0,0 @@
-#*************************************************************************
-#
@@ -890,7 +1216,7 @@
-};
Index: udk/stoc/test/tdmanager/testtdmanager.gcc3.map
diff -u /dev/null udk/stoc/test/tdmanager/testtdmanager.gcc3.map:1.1.2.1
---- /dev/null Fri Mar 7 09:03:51 2008
+--- /dev/null Mon Mar 10 06:34:10 2008
+++ udk/stoc/test/tdmanager/testtdmanager.gcc3.map Mon Mar 3 02:51:41 2008
@@ -0,0 +1,46 @@
+#*************************************************************************
More information about the fedora-extras-commits
mailing list