[pkgsrc/trunk]: pkgsrc/misc/openoffice2 Add support for NetBSD/amd64.

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/misc/openoffice2 Add support for NetBSD/amd64.
From: hira <hira%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 05:22:38 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/7d38053f9848
branches:  trunk
changeset: 534142:7d38053f9848
user:      hira <hira%pkgsrc.org@localhost>
date:      Fri Oct 12 15:41:43 2007 +0000

description:
Add support for NetBSD/amd64.

diffstat:

 misc/openoffice2/Makefile               |    6 +-
 misc/openoffice2/Makefile.NetBSD.x86_64 |   11 +
 misc/openoffice2/distinfo               |   10 +-
 misc/openoffice2/patches/patch-ak       |   33 ++++-
 misc/openoffice2/patches/patch-ci       |   10 +-
 misc/openoffice2/patches/patch-cs       |  183 ++++++++++++++++++++++++++++++++
 misc/openoffice2/patches/patch-ct       |   21 +++
 misc/openoffice2/patches/patch-cu       |   13 ++
 misc/openoffice2/patches/patch-cv       |   12 ++
 9 files changed, 283 insertions(+), 16 deletions(-)

diffs (truncated from 422 to 300 lines):

diff -r 03a05d242933 -r 7d38053f9848 misc/openoffice2/Makefile
--- a/misc/openoffice2/Makefile Fri Oct 12 15:05:54 2007 +0000
+++ b/misc/openoffice2/Makefile Fri Oct 12 15:41:43 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2007/10/06 20:02:21 hira Exp $
+# $NetBSD: Makefile,v 1.26 2007/10/12 15:41:43 hira Exp $
 #
 
 OO_VER=                        2.3.0
@@ -45,6 +45,7 @@
 CONFLICTS+=            openoffice-linux-[0-9]*
 
 ONLY_FOR_PLATFORM=     NetBSD-1.6Z[G-Z]*-i386 NetBSD-[2-9]*-i386
+ONLY_FOR_PLATFORM+=    NetBSD-1.6Z[G-Z]*-x86_64 NetBSD-[2-9]*-x86_64
 
 GNU_CONFIGURE=         yes
 CONFIGURE_ENV+=                X_LIBS=${X11_LDFLAGS:M*:Q}
@@ -92,7 +93,8 @@
 post-extract:
        cd ${WRKSRC}/bridges/source/cpp_uno &&                  \
        mv gcc3_netbsd_intel gcc3_netbsd_intel.orig &&          \
-       cp -Rp gcc3_freebsd_intel gcc3_netbsd_intel
+       cp -Rp gcc3_freebsd_intel gcc3_netbsd_intel &&          \
+       cp -Rp gcc3_freebsd_x86-64 gcc3_netbsd_x86-64
 
 do-build:
        ${_ULIMIT_CMD} ${SETENV} ${MAKE_ENV} bash -c "cd ${WRKSRC} && ./bootstrap && source ${OPENOFFICE_SETFILE}Env.Set.sh && dmake build_all"
diff -r 03a05d242933 -r 7d38053f9848 misc/openoffice2/Makefile.NetBSD.x86_64
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/openoffice2/Makefile.NetBSD.x86_64   Fri Oct 12 15:41:43 2007 +0000
@@ -0,0 +1,11 @@
+# $NetBSD: Makefile.NetBSD.x86_64,v 1.1 2007/10/12 15:41:43 hira Exp $
+
+OPENOFFICE_DLLSUFFIX=  bx
+OPENOFFICE_OUTPATH=    unxbsdx3
+OPENOFFICE_SETFILE=    NetBSDX86-64
+
+# Is /usr/lib/libsupc++.a broken (-current and 4.0_BETA2) ?
+#  /usr/bin/ld: /usr/lib/libsupc++.a(pure.o): relocation R_X86_64_32 can not be
+#  used when making a shared object; recompile with -fPIC
+#  /usr/lib/libsupc++.a: could not read symbols: Bad value
+USE_PKGSRC_GCC=                YES
diff -r 03a05d242933 -r 7d38053f9848 misc/openoffice2/distinfo
--- a/misc/openoffice2/distinfo Fri Oct 12 15:05:54 2007 +0000
+++ b/misc/openoffice2/distinfo Fri Oct 12 15:41:43 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.25 2007/10/09 10:04:00 hira Exp $
+$NetBSD: distinfo,v 1.26 2007/10/12 15:41:43 hira Exp $
 
 SHA1 (openoffice-2.3.0/OOo_2.3.0_src_binfilter.tar.bz2) = a45b356092fc61aba68d0b7536bb3f723cd62937
 RMD160 (openoffice-2.3.0/OOo_2.3.0_src_binfilter.tar.bz2) = 441a43c2a2d5418c9d3b55a89790f31598000bde
@@ -20,7 +20,7 @@
 SHA1 (patch-ah) = e0a7dd2bf36e5009b5b8a5ddc593a5a78c01a012
 SHA1 (patch-ai) = 268c8107052d2650a78d8048513f4acb2a1ee0f1
 SHA1 (patch-aj) = f0a38928938ba18d32b1e9007dbb8e36e54381bc
-SHA1 (patch-ak) = 8b05a11b24d5a69e2dcc0b1863606c7d8e272149
+SHA1 (patch-ak) = 23c202e81b47a415a0762aa5f30e8ed4e64017ad
 SHA1 (patch-am) = 8e497298dd5534bd0ef438c22595c1c0f63912a5
 SHA1 (patch-an) = cdf677a8e135fd4b447eef006558c7fea4df0be6
 SHA1 (patch-ao) = a83178adec44571ebcf7a4dd66bda52d004d465c
@@ -53,9 +53,13 @@
 SHA1 (patch-bx) = 157878e1fb4297f118ed0bbf06009506666fbc1c
 SHA1 (patch-by) = 1612b765467e51ca7498497d38a0bb6ac694f9a6
 SHA1 (patch-ch) = 5785607cff893f32b16bb5bcd30dc6c3942633e0
-SHA1 (patch-ci) = 2861e8a4b21977cbc8abeabe4581093e966cdfa7
+SHA1 (patch-ci) = 4743cee1c391e04a53bd83f6ae7e58e737d08d1e
 SHA1 (patch-cj) = 45ff359ec795e5ef5c692e954d88912c74017162
 SHA1 (patch-cn) = 67afccde1d7bfa42ec4082067189da23ada97190
 SHA1 (patch-cp) = 7c6007d18cc4f1b5d1c8e16c9170ec0e8211a040
 SHA1 (patch-cq) = 6691fd7fa330db000ec5a9319bf9030b83aa593d
 SHA1 (patch-cr) = 9cf96627d480714d62109bb3a7d67777a1a2b796
+SHA1 (patch-cs) = 76c55cd6150076022d9b773486232417ed069643
+SHA1 (patch-ct) = f895442c141fb7cc172adca4903bbf784dbe3594
+SHA1 (patch-cu) = b930fd94413c2bdf23ea94b074e3bb5e93784009
+SHA1 (patch-cv) = 2e14a54d369a255ee39fcec7d4f1d2b11a8f4d2e
diff -r 03a05d242933 -r 7d38053f9848 misc/openoffice2/patches/patch-ak
--- a/misc/openoffice2/patches/patch-ak Fri Oct 12 15:05:54 2007 +0000
+++ b/misc/openoffice2/patches/patch-ak Fri Oct 12 15:41:43 2007 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ak,v 1.5 2007/10/06 20:02:22 hira Exp $
+$NetBSD: patch-ak,v 1.6 2007/10/12 15:41:43 hira Exp $
 
---- config_office/set_soenv.in.orig    2007-08-03 22:09:48.000000000 +0900
-+++ config_office/set_soenv.in 2007-10-06 13:09:26.000000000 +0900
+--- config_office/set_soenv.in.orig    2007-08-03 13:09:48.000000000 +0000
++++ config_office/set_soenv.in 2007-10-12 01:59:21.000000000 +0000
 @@ -39,7 +39,7 @@
  #--------------------------------------------------------
  #
@@ -28,7 +28,24 @@
  $D              = " -D";            # define search path
  $empty          = "";               # used as argument
  $no_stl         = "NO_STLPORT4";    # possible argument
-@@ -296,8 +297,14 @@
+@@ -271,6 +272,16 @@
+       $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
+       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
+    }
++   elsif ($platform =~ m/^x86_64/)
++   {  print "Setting NetBSD x86-64 specific values... ";
++      $outfile        = "NetBSDX86-64Env.Set";
++      $CPU            = "X";
++      $CPUNAME        = "X86_64";
++      $OUTPATH        = "unxbsdx";
++      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
++      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
++      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
++   }
+    elsif ($platform =~ m/^sparc/)
+    {  print "Setting NetBSD Sparc specific values... ";
+       $outfile        = "NetBSDSparcEnv.Set"; 
+@@ -296,8 +307,14 @@
       exit 1;
     }
     #Conditional setting depending on gcc3:
@@ -45,7 +62,7 @@
     # General NetBSD settings:
        $BIG_SVX        = "TRUE";
        $COM            = "GCC";
-@@ -1243,7 +1250,8 @@
+@@ -1243,7 +1260,8 @@
                          $L.$JRETOOLKITDIR.
                          $L.$JRETHREADDIR.
                          $L_STLPORT_LIB.
@@ -55,7 +72,7 @@
  }
  elsif ($platform =~ m/linux-gnu|netbasd|osf1|irix|aix|freebsd/)
  {  $SOLARLIB          = $L.$par_dir.$LIB.
-@@ -1400,6 +1408,7 @@
+@@ -1400,6 +1418,7 @@
  
  if ($SYSTEM_PYTHON eq "NO")
  {
@@ -63,7 +80,7 @@
        $PYTHONPATH           = 
'.'.$ps.'$SOLARVER'.$ds.'$INPATH'.$ds.'lib'.$ps.'$SOLARVER'.$ds.'$INPATH'.$ds.'lib'.$ds.'python'.$ps.'$SOLARVER'.$ds.'$INPATH'.$ds.'lib'.$ds.'python'.$ds.'lib-dynload'.$ps.'$SOLARVER'.$ds.'$INPATH'.$ds.'lib'.$ds.'pyuno'.$ps.'$SOLARVER'.$ds.'$INPATH'.$ds.'bin'.$ds.'pyuno';
        $PYTHONHOME           = '$SOLARVER'.$ds.'$INPATH';
  }
-@@ -1539,6 +1548,8 @@
+@@ -1539,6 +1558,8 @@
  ToFile( "JITC_PROCESSOR_TYPE","6",                 "e" );
  }
  ToFile( "DEFAULT_TO_ENGLISH_FOR_PACKING",  "yes", "e" );
@@ -72,7 +89,7 @@
  ToFile( "ENABLE_GTK",        "@ENABLE_GTK@",       "e" );
  ToFile( "GTK_CFLAGS",        "@GTK_CFLAGS@",       "e" );
  ToFile( "GTK_LIBS",          "@GTK_LIBS@",         "e" );
-@@ -1785,6 +1796,7 @@
+@@ -1785,6 +1806,7 @@
  ToFile( "PKGFORMAT",         "@PKGFORMAT@",        "e" );
  ToFile( "SYSTEM_STDLIBS",    "@SYSTEM_STDLIBS@",   "e" );
  ToFile( "SYSTEM_ZLIB",       "@SYSTEM_ZLIB@",      "e" );
diff -r 03a05d242933 -r 7d38053f9848 misc/openoffice2/patches/patch-ci
--- a/misc/openoffice2/patches/patch-ci Fri Oct 12 15:05:54 2007 +0000
+++ b/misc/openoffice2/patches/patch-ci Fri Oct 12 15:41:43 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ci,v 1.1 2007/04/05 23:26:13 hira Exp $
+$NetBSD: patch-ci,v 1.2 2007/10/12 15:41:43 hira Exp $
 
 --- solenv/inc/unx.mk.orig     2006-07-19 18:26:37.000000000 +0900
-+++ solenv/inc/unx.mk  2007-04-06 08:10:39.000000000 +0900
-@@ -151,6 +151,10 @@
++++ solenv/inc/unx.mk  2007-04-05 10:30:18.000000000 +0900
+@@ -151,6 +151,14 @@
  .INCLUDE : unxbsdi2.mk
  .ENDIF
  
@@ -10,6 +10,10 @@
 +.INCLUDE : unxbsdi3.mk
 +.ENDIF
 +
++.IF "$(COM)$(CVER)$(OS)$(CPU)" == "GCCC341NETBSDX"
++.INCLUDE : unxbsdx3.mk
++.ENDIF
++
  .IF "$(COM)$(OS)$(CPU)" == "GCCNETBSDS"
  .INCLUDE : unxbsds.mk
  .ENDIF
diff -r 03a05d242933 -r 7d38053f9848 misc/openoffice2/patches/patch-cs
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/openoffice2/patches/patch-cs Fri Oct 12 15:41:43 2007 +0000
@@ -0,0 +1,183 @@
+$NetBSD: patch-cs,v 1.1 2007/10/12 15:41:43 hira Exp $
+
+--- solenv/inc/unxbsdx3.mk.orig        2007-10-13 00:24:19.000000000 +0900
++++ solenv/inc/unxbsdx3.mk     2007-10-13 00:28:56.000000000 +0900
+@@ -0,0 +1,178 @@
++#
++# mk file for NetBSD/amd64 with gcc 3.4.x and higher.
++#
++
++ASM=
++AFLAGS=
++
++SOLAR_JAVA=
++JAVAFLAGSDEBUG=-g
++
++# filter for supressing verbose messages from linker
++#not needed at the moment
++#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
++
++# _PTHREADS is needed for the stl
++CDEFS+= -DX86 $(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450
++
++# enable visibility define in "sal/types.h"
++.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
++CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
++.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
++
++# this is a platform with JAVA support
++.IF "$(SOLAR_JAVA)"!=""
++JAVADEF=-DSOLAR_JAVA
++.IF "$(debug)"==""
++JAVA_RUNTIME=-ljava
++.ELSE
++JAVA_RUNTIME=-ljava_g
++.ENDIF
++.ENDIF 
++
++# architecture dependent flags for the C and C++ compiler that can be changed by
++# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
++ARCH_FLAGS*=
++
++# name of C++ Compiler
++CXX*=g++
++# name of C Compiler
++CC*=gcc
++# flags for C and C++ Compiler
++CFLAGS+=-fmessage-length=0 -c
++
++# Compiler flags for enabling optimizations
++.IF "$(PRODUCT)"!=""
++CFLAGSOPT=-Os -fno-strict-aliasing             # optimizing for products
++.ELSE  # "$(PRODUCT)"!=""
++CFLAGSOPT=                                     # no optimizing for non products
++.ENDIF # "$(PRODUCT)"!=""
++
++# flags to enable build with symbols; required for crashdump feature
++.IF "$(ENABLE_SYMBOLS)"=="SMALL"
++CFLAGSENABLESYMBOLS=-g1
++.ELSE
++CFLAGSENABLESYMBOLS=-g
++.ENDIF
++
++# flags for the C++ Compiler
++CFLAGSCC= -pipe $(ARCH_FLAGS)
++# Flags for enabling exception handling
++CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
++# Flags for disabling exception handling
++CFLAGS_NO_EXCEPTIONS=-fno-exceptions
++
++CFLAGSCXX= -pipe $(ARCH_FLAGS)
++PICSWITCH:=-fpic
++.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
++CFLAGSCXX += -fvisibility-inlines-hidden
++.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
++
++# Compiler flags for compiling static object in multi threaded environment with graphical user interface
++CFLAGSOBJGUIMT=
++# Compiler flags for compiling static object in multi threaded environment with character user interface
++CFLAGSOBJCUIMT=
++# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
++CFLAGSSLOGUIMT=$(PICSWITCH)
++# Compiler flags for compiling shared object in multi threaded environment with character user interface
++CFLAGSSLOCUIMT=$(PICSWITCH)
++# Compiler flags for profiling
++CFLAGSPROF=
++# Compiler flags for debugging
++CFLAGSDEBUG=-g
++CFLAGSDBGUTIL=
++# Compiler flags for enabling optimizations
++# CFLAGSOPT=-O2
++# reduce to -O1 to avoid optimization problems
++CFLAGSOPT=-O1
++# Compiler flags for disabling optimizations
++CFLAGSNOOPT=-O
++# Compiler flags for describing the output path
++CFLAGSOUTOBJ=-o
++
++CFLAGSWARNCC=
++CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
++# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
++CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
++CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
++CFLAGSWERRCC=-Werror
++
++# switches for dynamic and static linking
++STATIC                = -Wl,-Bstatic
++DYNAMIC               = -Wl,-Bdynamic
++
++# name of linker
++LINK*=$(CXX)
++LINKC*=$(CC)
++
++# default linker flags
++LINKFLAGSDEFS*=-z defs
++LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
++LINKFLAGS=-z combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
++
++# linker flags for linking applications
++LINKFLAGSAPPGUI= -Wl,-export-dynamic
Prev by Date: [pkgsrc/trunk]: pkgsrc Since this pkg installs .omf files, include scrollkeep...
Next by Date: [pkgsrc/trunk]: pkgsrc/doc Updated net/nagios-base to 2.5nb3.
Previous by Thread: [pkgsrc/trunk]: pkgsrc Since this pkg installs .omf files, include scrollkeep...
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc Updated net/nagios-base to 2.5nb3.
Indexes:
Home | Main Index | Thread Index | Old Index