4e5ab571df
2. set LC_ALL, LANG as c when building [1]
3. better generate.pl
4. Partial fix for 4.11-RELEASE [2]
5. do not pass CPUFLAGS
6. Partial improvement for WITHOUT_JAVA
PR: 84786
Submitted by: [1] achix mantzix
[2] Hiromi Kimura and Yury Tarasievich
101 lines
4.2 KiB
Text
101 lines
4.2 KiB
Text
Issutracker : #i53288#
|
|
CWS : N/A
|
|
Author: : <maho@openoffice.org> (JCA)
|
|
Description : remove circular dependency
|
|
|
|
in this case,
|
|
core01 is depend on core02-core08, and core0[2-9] and core10
|
|
depends on core01. for FreeBSD this is regarded as circular dependency
|
|
and pkg_add command is forked infinite times and eats up systems' resource.
|
|
namely when core01 tries to install core02, core02 also tries to
|
|
install core01.
|
|
|
|
|
|
Index: instsetoo_native/inc_openoffice/unix/packagelist.txt
|
|
===================================================================
|
|
RCS file: /cvs/installation/instsetoo_native/inc_openoffice/unix/packagelist.txt,v
|
|
retrieving revision 1.15
|
|
diff -u -r1.15 packagelist.txt
|
|
--- instsetoo_native/inc_openoffice/unix/packagelist.txt 18 Aug 2005 12:48:34 -0000 1.15
|
|
+++ instsetoo_native/inc_openoffice/unix/packagelist.txt 22 Aug 2005 07:01:29 -0000
|
|
@@ -38,7 +38,7 @@
|
|
packagename = "openoffice.org-core01"
|
|
linuxreplaces = "openofficeorg-core,openofficeorg-core01"
|
|
provides = "openofficeorg-core01"
|
|
-requires = "openoffice.org-core02,openoffice.org-core03,openoffice.org-core04,openoffice.org-core05,openoffice.org-core06,openoffice.org-core07,openoffice.org-core08"
|
|
+requires = "openoffice.org-core02,openoffice.org-core03,openoffice.org-core04,openoffice.org-core05,openoffice.org-core06,openoffice.org-core07,openoffice.org-core08,openoffice.org-core09,openoffice.org-core10"
|
|
copyright = "1999-2005 by OpenOffice.org"
|
|
vendor = "OpenOffice.org"
|
|
description = "Core module for %PRODUCTNAME %PRODUCTVERSION"
|
|
@@ -284,7 +284,6 @@
|
|
packagename = "openoffice.org-core02"
|
|
linuxreplaces = "openofficeorg-core02"
|
|
provides = "openofficeorg-core02"
|
|
-requires = "openoffice.org-core01"
|
|
copyright = "1999-2005 by OpenOffice.org"
|
|
vendor = "OpenOffice.org"
|
|
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
|
|
@@ -298,7 +297,6 @@
|
|
packagename = "openoffice.org-core03"
|
|
linuxreplaces = "openofficeorg-core03"
|
|
provides = "openofficeorg-core03"
|
|
-requires = "openoffice.org-core01"
|
|
copyright = "1999-2005 by OpenOffice.org"
|
|
vendor = "OpenOffice.org"
|
|
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
|
|
@@ -312,7 +310,6 @@
|
|
packagename = "openoffice.org-core04"
|
|
linuxreplaces = "openofficeorg-core04"
|
|
provides = "openofficeorg-core04"
|
|
-requires = "openoffice.org-core01"
|
|
copyright = "1999-2005 by OpenOffice.org"
|
|
vendor = "OpenOffice.org"
|
|
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
|
|
@@ -326,7 +323,6 @@
|
|
packagename = "openoffice.org-core05"
|
|
linuxreplaces = "openofficeorg-core05"
|
|
provides = "openofficeorg-core05"
|
|
-requires = "openoffice.org-core01"
|
|
copyright = "1999-2005 by OpenOffice.org"
|
|
vendor = "OpenOffice.org"
|
|
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
|
|
@@ -340,7 +336,6 @@
|
|
packagename = "openoffice.org-core06"
|
|
linuxreplaces = "openofficeorg-core06"
|
|
provides = "openofficeorg-core06"
|
|
-requires = "openoffice.org-core01"
|
|
copyright = "1999-2005 by OpenOffice.org"
|
|
vendor = "OpenOffice.org"
|
|
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
|
|
@@ -354,7 +349,6 @@
|
|
packagename = "openoffice.org-core07"
|
|
linuxreplaces = "openofficeorg-core07"
|
|
provides = "openofficeorg-core07"
|
|
-requires = "openoffice.org-core01"
|
|
copyright = "1999-2005 by OpenOffice.org"
|
|
vendor = "OpenOffice.org"
|
|
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
|
|
@@ -368,7 +362,6 @@
|
|
packagename = "openoffice.org-core08"
|
|
linuxreplaces = "openofficeorg-core08"
|
|
provides = "openofficeorg-core08"
|
|
-requires = "openoffice.org-core01"
|
|
copyright = "1999-2005 by OpenOffice.org"
|
|
vendor = "OpenOffice.org"
|
|
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
|
|
@@ -382,7 +375,6 @@
|
|
packagename = "openoffice.org-core09"
|
|
linuxreplaces = "openofficeorg-core09"
|
|
provides = "openofficeorg-core09"
|
|
-requires = "openoffice.org-core01"
|
|
copyright = "1999-2005 by OpenOffice.org"
|
|
vendor = "OpenOffice.org"
|
|
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
|
|
@@ -397,7 +389,6 @@
|
|
packagename = "openoffice.org-core10"
|
|
linuxreplaces = "openofficeorg-core10"
|
|
provides = "openofficeorg-core10"
|
|
-requires = "openoffice.org-core01"
|
|
copyright = "1999-2005 by OpenOffice.org"
|
|
vendor = "OpenOffice.org"
|
|
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
|