pkgsrc-Users archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: OpenOffice.org 3.0.0beta (BEA300_m2)



On Fri, 29 Aug 2008, Kouichirou Hiratsuka wrote:

Hello,

At Fri, 29 Aug 2008 03:37:10 +0900,
I wrote:
I've updated the package to OOO300_m3.  Please try it.

And I've added `java' option (it's disabled by default).
I succeeded to build with NetBSD/i386-current + wip/jdk15.
I'll try to add the option to misc/openoffice2.

Please replace --enable/disable-java with --with/without-java in
options.mk.

BTW, CVE-2008-3282 has already been fixed in OOO300_m3.

        In case its of interest, building on NetBSD 4 STABLE failed with
        the error below. I also fixed a couple of test == portability
        warnings (attached).

        Thanks

/var/obj/pkg/misc/openoffice3/work/OOO300_m3/solver/300/unxbsdi3.pro/bin/makedepend
 @/tmp/mk28304k > ../unxbsdi3.pro/misc/s_test-range.dpcc
------------------------------
Making: ../unxbsdi3.pro/slb/tests.lib
echo unxbsdi3.pro/slo/cow_wrapper_clients.o unxbsdi3.pro/slo/test-cow_wrapper.o 
unxbsdi3.pro/slo/test-heap_ptr.o unxbsdi3.pro/slo/test-range.o | xargs -n1 > 
../unxbsdi3.pro/slb/tests.lib
tr -d "\015" < export.map | awk -f 
/var/obj/pkg/misc/openoffice3/work/OOO300_m3/solenv/bin/addsym.awk > 
../unxbsdi3.pro/misc/export_tests.map
------------------------------
Making: ../unxbsdi3.pro/lib/libtests.so
c++ -z combreloc -z defs -Wl,-rpath,'$ORIGIN' 
-L/var/obj/pkg/misc/openoffice3/work/OOO300_m3/solver/300/unxbsdi3.pro/lib 
-shared -Wl,-O1 -Wl,--version-script ../unxbsdi3.pro/misc/export_tests.map 
-L../unxbsdi3.pro/lib -L/usr/pkg/lib/firefox 
../unxbsdi3.pro/slo/cow_wrapper_clients.o 
../unxbsdi3.pro/slo/test-cow_wrapper.o ../unxbsdi3.pro/slo/test-heap_ptr.o 
../unxbsdi3.pro/slo/test-range.o ../unxbsdi3.pro/slo/tests_version.o -o 
../unxbsdi3.pro/lib/libtests.so -luno_sal -lcppunitbi -lpthread -lm -lc -lgcc_s 
-lstdc++ -Wl,-Bdynamic -lstlport_gcc -lgcc_s -lstdc++
rm -f ../unxbsdi3.pro/lib/check_libtests.so
mv ../unxbsdi3.pro/lib/libtests.so ../unxbsdi3.pro/lib/check_libtests.so
/var/obj/pkg/misc/openoffice3/work/OOO300_m3/solenv/bin/checkdll.sh 
-L../unxbsdi3.pro/lib 
-L/var/obj/pkg/misc/openoffice3/work/OOO300_m3/solver/300/unxbsdi3.pro/lib  
../unxbsdi3.pro/lib/check_libtests.so
Checking DLL ../unxbsdi3.pro/lib/check_libtests.so ...: WARNING: Undefined symbol 
"GetVersionInfo"
-rwxrwxr-x  1 root  wheel  201039 Aug 29 11:30 ../unxbsdi3.pro/lib/libtests.so
-------------
making .dpslo
----------------------------------------------------------
- start unit test on library ../unxbsdi3.pro/lib/libtests.so
----------------------------------------------------------
testshl2 ../unxbsdi3.pro/lib/libtests.so
dmake:  Error code 139, while making 'unittest'

ERROR: Error 65280 occurred while making 
/var/obj/pkg/misc/openoffice3/work/OOO300_m3/o3tl/qa
rmdir /tmp/15579
dmake:  Error code 1, while making 'build_instsetoo_native'
*** Error code 255

Stop.
make: stopped in /home/netbsd/pkgsrc/misc/openoffice3
WARNING: *** Please consider adding fortran to USE_LANGUAGES in the package 
Makefile.
*** Error code 1

Stop.
make: stopped in /pkgsrc/misc/openoffice3

--
                David/absolute       -- www.NetBSD.org: No hype required --
$NetBSD$

--- config_office/configure.orig        2008-08-08 12:58:06.000000000 +0100
+++ config_office/configure
@@ -4192,11 +4192,11 @@ echo "${ECHO_T}$PTHREAD_LIBS" >&6; }
         test_randr=no
                _os=OSF1
                ;;
-       netbsd)
+       *netbsd*)
                test_gtk=yes
                build_cairo=yes
                test_kde=yes
-               test_cups=no
+               test_cups=yes
         test_randr=yes
                test_freetype=yes
                PTHREAD_CFLAGS="-pthread"
@@ -11438,7 +11438,7 @@ echo "$as_me: error: $_javadoc_path not 
 fi
 
 if test "$SOLAR_JAVA" != ""; then
-        if test "$JDK" == "gcj" -a -z "$JAVA_HOME"; then
+        if test "$JDK" = "gcj" -a -z "$JAVA_HOME"; then
       if test "x$with_jdk_home" = "x" -a "$_gij_longver" -ge "50000"; then
         cat > findhome.java <<_ACEOF
 import java.io.File;
@@ -11539,7 +11539,7 @@ echo "$as_me: WARNING: in case JAVA_HOME
          echo "JAVA_HOME was not explicitly informed with --with-jdk-home. the 
configure script" >> warn
          echo "attempted to find JAVA_HOME automatically, but apparently it 
failed" >> warn
          echo "in case JAVA_HOME is incorrectly set, some projects with not be 
built correctly" >> warn
-#         if test "$JDK" == "gcj"; then
+#         if test "$JDK" = "gcj"; then
 #             echo "e.g. install java-1.4.2-gcj-compat-devel and use 
--with-jdk-home=/usr/lib/jvm/java-1.4.2-gcj" >> warn
 #         fi
       fi
@@ -14217,7 +14217,7 @@ fi
 if test -n "$with_system_libxslt" -o -n "$with_system_libs" && \
    test "$with_system_libxslt" != "no"; then
     if test -z "$with_system_libxml" -a -z "$with_system_libs" || \
-      test "$with_system_libxml" == "no"; then
+      test "$with_system_libxml" = "no"; then
       # somehow AC_MSG_WARN won't work...
        echo "to prevent incompatibilities between internal libxml2 and 
libxslt, the office will be build with system-libxml"
        echo "to prevent incompatibilities between internal libxml2 and 
libxslt, the office will be build with system-libxml" >> warn
@@ -14227,7 +14227,7 @@ fi
 if test -n "$with_system_libxml" -o -n "$with_system_libs" && \
    test "$with_system_libxml" != "no"; then
     if test -z "$with_system_libxslt" -a -z "$with_system_libs" || \
-      test "$with_system_libxslt" == "no"; then
+      test "$with_system_libxslt" = "no"; then
       # somehow AC_MSG_WARN won't work...
        echo "to prevent incompatibilities between internal libxslt and 
libxml2, the office will be build with system-libxslt"
        echo "to prevent incompatibilities between internal libxslt and 
libxml2, the office will be build with system-libxslt" >> warn
@@ -14749,13 +14749,14 @@ echo "${ECHO_T}$am_cv_python_pyexecdir" 
 
 
    python_include=`$PYTHON -c "import distutils.sysconfig; print 
distutils.sysconfig.get_config_var('INCLUDEPY');"`
+   python_ldflags=`$PYTHON -c "import distutils.sysconfig; print 
distutils.sysconfig.get_config_var('LDFLAGS');"`
    python_version=`$PYTHON -c "import distutils.sysconfig; print 
distutils.sysconfig.get_config_var('VERSION');"`
    PYTHON_CFLAGS="-I$python_include"
 
    if test "$_os" = "Darwin"; then
       PYTHON_LIBS="-framework Python"
    else
-      PYTHON_LIBS="-lpython$python_version"
+      PYTHON_LIBS="-lpython$python_version $python_ldflags"
    fi
 
       save_CPPFLAGS="$CPPFLAGS"
@@ -15012,7 +15013,7 @@ fi
 { echo "$as_me:$LINENO: result: $ac_cv_header_db_h" >&5
 echo "${ECHO_T}$ac_cv_header_db_h" >&6; }
 if test $ac_cv_header_db_h = yes; then
-   DB_INCLUDES=/usr/include
+   DB_INCLUDES=${BLNK_PREFIX_db4}/include/db4
 else
 
              CFLAGS=-I/usr/include/db4
@@ -15142,13 +15143,13 @@ echo "${ECHO_T}no. you need at least db 
     #AC_CHECK_LIB(db, db_create, [],
     #  [AC_MSG_ERROR([db library not installed or functional])], [])
 
-{ echo "$as_me:$LINENO: checking for main in -ldb" >&5
-echo $ECHO_N "checking for main in -ldb... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking for main in -ldb4" >&5
+echo $ECHO_N "checking for main in -ldb4... $ECHO_C" >&6; }
 if test "${ac_cv_lib_db_main+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldb  $LIBS"
+LIBS="-ldb4  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -15202,7 +15203,7 @@ if test $ac_cv_lib_db_main = yes; then
 #define HAVE_LIBDB 1
 _ACEOF
 
-  LIBS="-ldb $LIBS"
+  LIBS="-ldb4 $LIBS"
 
 else
   { { echo "$as_me:$LINENO: error: db not installed or functional" >&5
@@ -17387,7 +17388,7 @@ Please recompile $tmp with --enable-ldap
 
     #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
+    if test "$MOZ_FLAVOUR" = "libxul"; then
         MOZ_FLAVOUR="mozilla"
     fi
 
@@ -25039,7 +25040,7 @@ echo "${ECHO_T}yes" >&6; }
   ENABLE_MEDIAWIKI=YES
   { echo "$as_me:$LINENO: checking which Apache commons-* libs to use" >&5
 echo $ECHO_N "checking which Apache commons-* libs to use... $ECHO_C" >&6; }
-  if test "$with_system_apache_commons" == "yes"; then
+  if test "$with_system_apache_commons" = "yes"; then
        SYSTEM_APACHE_COMMONS=YES
        { echo "$as_me:$LINENO: result: external" >&5
 echo "${ECHO_T}external" >&6; }
@@ -25182,7 +25183,7 @@ fi
 
 
 
-if test "$ENABLE_MEDIAWIKI" == "YES"; then
+if test "$ENABLE_MEDIAWIKI" = "YES"; then
   { echo "$as_me:$LINENO: checking which Servlet API Jar to use" >&5
 echo $ECHO_N "checking which Servlet API Jar to use... $ECHO_C" >&6; }
   if test -n "$with_system_servlet_api"; then
@@ -25237,7 +25238,7 @@ echo "${ECHO_T}yes" >&6; }
   ENABLE_REPORTDESIGN=YES
   { echo "$as_me:$LINENO: checking which jfreereport libs to use" >&5
 echo $ECHO_N "checking which jfreereport libs to use... $ECHO_C" >&6; }
-  if test "$with_system_jfreereport" == "yes"; then
+  if test "$with_system_jfreereport" = "yes"; then
        SYSTEM_JFREEREPORT=YES
        { echo "$as_me:$LINENO: result: external" >&5
 echo "${ECHO_T}external" >&6; }
@@ -25766,7 +25767,7 @@ your KDE installation by exporting KDEDI
     fi
 
         KDE_CFLAGS="-I$qt_incdir -I$kde_incdir -DQT_CLEAN_NAMESPACE 
-DQT_THREAD_SUPPORT"
-    KDE_LIBS="-L$kde_libdir -L$qt_libdir -lkdeui -lkdecore -lqt-mt"
+    KDE_LIBS="-L$kde_libdir -Wl,-R$kde_libdir -L$qt_libdir -Wl,-R$qt_libdir 
-lkdeui -lkdecore -lqt-mt"
 fi
 
 
@@ -26316,7 +26317,7 @@ if test "$_os" = "Darwin"; then
    XINERAMA_LINK=dynamic
    { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
-elif test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then
+elif test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then
    if test -e "$XLIB/libXinerama.so" -a -e "$XLIB/libXinerama.a"; then
       # we have both versions, let the user decide but use the dynamic one
       # per default
@@ -26801,9 +26802,13 @@ echo $ECHO_N "checking Ant lib directory
                 if test -f $ANT_HOME/lib/ant/ant.jar; then
                     ANT_LIB="$ANT_HOME/lib/ant"
                 else
+                   if test -f $ANT_HOME/lib/java/ant/ant.jar; then
+                       ANT_LIB="$ANT_HOME/lib/java/ant"
+                   else
                     { { echo "$as_me:$LINENO: error: Ant libraries not found!" 
>&5
 echo "$as_me: error: Ant libraries not found!" >&2;}
    { (exit 1); exit 1; }; }
+                   fi
                 fi
              fi
           fi
@@ -27011,12 +27016,12 @@ fi
 { echo "$as_me:$LINENO: checking build verbosity" >&5
 echo $ECHO_N "checking build verbosity... $ECHO_C" >&6; }
 if test -n "$enable_verbose"; then
-   if test "$enable_verbose" == "yes"; then
+   if test "$enable_verbose" = "yes"; then
       VERBOSE="TRUE"
       { echo "$as_me:$LINENO: result: high" >&5
 echo "${ECHO_T}high" >&6; }
    fi
-   if test "$enable_verbose" == "no"; then
+   if test "$enable_verbose" = "no"; then
       VERBOSE="FALSE"
       { echo "$as_me:$LINENO: result: low" >&5
 echo "${ECHO_T}low" >&6; }
@@ -27563,6 +27568,8 @@ do
   case $ac_option in
   # Handling of the options.
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+       : Avoid regenerating within pkgsrc
+       exit 0
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
     echo "$ac_cs_version"; exit ;;


Home | Main Index | Thread Index | Old Index