delete old ebuilds

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@1722 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one
2009-12-22 08:50:41 +00:00
parent 6263f86450
commit 6c9ca352f9
106 changed files with 0 additions and 10440 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -1,41 +0,0 @@
AUX base64.diff 770 RMD160 acea95d2f4ac09ef6252eb9a0e22405858574d51 SHA1 4097bc9406ba568ef2dfe7d8a8bfd43ed153d44d SHA256 fd298c97fd28e765138a18d570a99613df3fa25076fa5d6243e86f9cbb750a03
AUX buildfix-gcc44.diff 611 RMD160 31e7c33977941458b1472d92c645ed2b2ef64a82 SHA1 ed17195077f5212bfc6f546004f5e6f429b03c14 SHA256 dd66bbe257c9a88c757037d65f48ea4976d7cee8a38e96b6282611c1b70cecff
AUX gentoo-3.1.0.diff 173 RMD160 dacec2c40bd4bd8e2c07fb849afb6f3fe3643371 SHA1 1430513326652f7b09eb04ee8f420532ac60b5c2 SHA256 de9316222af0f197a11041ba1105bfd070ba31cbcc1a2a212641d911b728ed5a
AUX ooo-env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e SHA1 b655566079c408e72f1046262fe269ba8bf66040 SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1
AUX solenv.workaround-for-the-kde-mess.diff 17556 RMD160 9a7f9d4336f62fb2a0108523dfa7e58ca3c0a5b8 SHA1 55f79297410cf19dd80673cff6eafb715806ded5 SHA256 da5a549f4672ea6304b630c3950bb935a6b2a7df5f291950250a4a023aef1a5e
DIST Sun_ODF_Template_Pack_de.oxt 4953135 RMD160 2d7ef049b2ac625ce9d952d097ed09baab0cc510 SHA1 9ae5905490a662c25cd3014023eec271c0b0d46e SHA256 7b63da46eb4f168a3406b38643ad2c29559f63882112037eea958819b380a32a
DIST Sun_ODF_Template_Pack_en-US.oxt 4997184 RMD160 f7040f83aeb60355d80c42434e60d236a8875753 SHA1 58c98de9c629aae878a58c2775b8546aa78fb04c SHA256 ba443e3dc988d64e239865a0a7e11b62125212a1049b7a5d866955b235d7f195
DIST Sun_ODF_Template_Pack_es.oxt 4972619 RMD160 3b8bf592b34256969421472b6ca492479d10d145 SHA1 2b33b91d536c39dba2ec5504f68d72c001712782 SHA256 0a00c795f4af10919d981e7409895198c9f09d2ab05f9e578a1e8428071f5bc3
DIST Sun_ODF_Template_Pack_fr.oxt 4970438 RMD160 44de71cb028dde89836bfd1167b084dea54922e5 SHA1 3908eee06c17154c2cff6c9f175a7a8dad258e47 SHA256 4c8b739255122c989f00b3b706d99b93fa1c4cf428d61fd550994093aaca8fb5
DIST Sun_ODF_Template_Pack_it.oxt 4960369 RMD160 9d8881f645f409599b7a5e14cb4b6842e5883383 SHA1 85c7670e182d5ed5aeb2d9bfe20d161c4ac824c8 SHA256 6e87462d76954698ffcbcf4145fd13ab9c41520026160363fd6e97f7cad3ae05
DIST biblio.tar.bz2 6000 RMD160 d6d74ed50fd12ab1b7363e1611aa5bae5a8b19d6 SHA1 5a12014afa75ecb51b9688497450115d64f1c167 SHA256 c0410a80028c8c0a6c28f4727e89b632875a128c9fccc17102f18773f0ea620b
DIST extras-3.tar.bz2 130640 RMD160 c6b6efb20cbec79b48bd21046f93959367fe1bd4 SHA1 fb7d85a9827cd1280766db2641fb1896bd5d1c7b SHA256 6cf85181c21dadda4fa4d8fbc227012d63a2558642195a46b0ae2ab144facce8
DIST libwpg-0.1.3.tar.gz 410799 RMD160 6e9e0545215af2ee05780887ad57ca1ae7ef78f5 SHA1 6d350eb0ad57b97499ef8335506f172b0c21375a SHA256 19a52f4eede1da890ac6a5dfa5f0d9a63a73a6dfc3f17cb3423563c53cc665e3
DIST libwps-0.1.2.tar.gz 413360 RMD160 a3f60fed70ab0c4f34091c10f4eb4a421cb87d44 SHA1 3da402f74a6296425e88d0ab1cf197a5927288d6 SHA256 e8f03fc83f7ddd3976adb61f693eaeebefee852655875816e5f945e0efabb2b1
DIST lp_solve_5.5.0.12_source.tar.gz 787446 RMD160 8cd5299543e07d2bf1819297fe0a18400b18d12b SHA1 ffa7e52c18ffacef7ed3dfe535f4221e853068df SHA256 bc26d07fe39ae50264e15ee54dbbcf4cb1fe6ecd2fef10142be5bdd38947f193
DIST ooo-build-3.1.0.99.1.tar.gz 13701288 RMD160 6664f954de3235e70a02081b4e84aa648dacda27 SHA1 408a6f7f7efcb61e724ed7371a18fb024982b6b1 SHA256 192b8fd21a38470b65a5c43d0c086adce6cf5a848b72fc4410aa600a4dbd84a9
DIST ooo310-m16-artwork.tar.bz2 9655163 RMD160 c1cd2e56cfe2f8c611cc675b6466aa3599e46b2e SHA1 c6c62666bed40fbe52c02f8275a2562c3ed10842 SHA256 6a6da42036efbd00fa1a3a8553de90743f6fea0963f0d6651573c9f560136792
DIST ooo310-m16-base.tar.bz2 3272789 RMD160 8ef15062b5f4ffe93b8e9c02809b3dc2b0881854 SHA1 d4f2f2786d8e73609cdf57040fc90ed0dbccf197 SHA256 de79df6146207235a74f46c982512f7af286c28f263fcf46818f7e5a2eef58b5
DIST ooo310-m16-bootstrap.tar.bz2 7241135 RMD160 05b287e0d027b976b504a7fedea52fce269877fc SHA1 f059bd5f1d10ba0696c14749a27d8b41eddf6562 SHA256 eea3f6bb683dde294cdef8a37ed710ad79d2e2f2ead144ccb260ad63303d0092
DIST ooo310-m16-calc.tar.bz2 9632866 RMD160 a5e9b6f74309bb9b41c1191a38ed3299f6ef294d SHA1 c107b47573918d385eee76a2b37d2c0c675e7c70 SHA256 2bcf1b2381d816e26d81cf0360af0ee6bc1907e5d64da0231f1da32de44d9914
DIST ooo310-m16-components.tar.bz2 5955001 RMD160 2ff5a05bcc2f7281afdec3ee79dfd575c496a5a4 SHA1 97d1f4bb5289edd07c43c23393d49af88feb27c7 SHA256 2f36dc81fe3eb68b6db814e7bd42bb93f39434dd7f74fafb89058f9b0f40d9f1
DIST ooo310-m16-extensions.tar.bz2 14876417 RMD160 b9764c86bd30e36c97efef9a63fb7ec33df312d2 SHA1 803e857a91bed51ae47fe6e5bb601541c055075c SHA256 1906ed954517bc30a84dbd5edad1041668f951ebd6cfc7d34852e8e66bc21221
DIST ooo310-m16-extras.tar.bz2 46136838 RMD160 9c0e87b9a269959526ae7707bb5be8dd52d815e4 SHA1 e2f7d465c4561dc25a5dead8554ae2809f89f2cb SHA256 2df209b1f246d6ecfde4975c5aa9c0b595beede2343c1a381b274c2dca36f4ab
DIST ooo310-m16-filters.tar.bz2 10779831 RMD160 22fff24d6bf5d1ac249232a5750604fa12b62e52 SHA1 43cedb6b724dda85393632bd1c4aa3fec676c05b SHA256 b734960e670af8fe1e40dca6092dd0323f685e129d86a599a12e0a2f80ce5e25
DIST ooo310-m16-help.tar.bz2 44895264 RMD160 c39e9d2af17087794a4453d7c11893ebb9338291 SHA1 00b51cb89d58c89f4bb4156761b1d4837b15437e SHA256 a1d31ab9e31d221a64ef268312309bb3f21c2bf5d18ccb04e79b6e920839a43d
DIST ooo310-m16-impress.tar.bz2 3542337 RMD160 655cf8ead2b9699e35ce1200a95d7898ceba4402 SHA1 d2b272cfa1e2a612c9569163b2dffeb70dd6b91a SHA256 399ccb463ff01bc8506d9d23b103ae0190e730a776be54b185e2d93304c07c6f
DIST ooo310-m16-libs-core.tar.bz2 27430374 RMD160 c87d1ab8f3e1419e2bbb69deb09366cda53df814 SHA1 439f1db820a3f7392323a594050a3892fdc33182 SHA256 9d085ed0b9194194d722d8ae3a135108a4a2132b4927d5009851bd39ffa082d4
DIST ooo310-m16-libs-extern-sys.tar.bz2 105288381 RMD160 f9b9f681f08099638041b624fa7e9042f4a6bff8 SHA1 f6c024da86fa4e55b1a2614d4ed46b42319dbb0b SHA256 273d43debf6a55a23e1fc818252e1f127a4d0a429565ae9b954fdf6f236e3950
DIST ooo310-m16-libs-extern.tar.bz2 39910426 RMD160 60f770994c54e011ad39f75ef675fab4d8eb4ed2 SHA1 d7855ca579ac04c73873aeaacbb9f3f75e85398e SHA256 83fe74caca45bf432a3be7b5975090e4860c51cd282275248896efd0e933c697
DIST ooo310-m16-libs-gui.tar.bz2 11408027 RMD160 39a1ed949dd27fc7d8e94cae0d50ae28e3cbaf83 SHA1 73abe591206f2249fc84c1f6870f8d5ea3358180 SHA256 19a2f92c109002bb5c689cbebe232118ebd8acd95472bfde7670872324310133
DIST ooo310-m16-postprocess.tar.bz2 19487 RMD160 3d9cc3ee3e2c4b146d83781daba26fdea2ed9fb5 SHA1 f8b3f353e5dc8a5c78d0cda8deb9f9c2c9d955b0 SHA256 a6a44cd51ada4ef281c6cc635cf3ad5717250a2510ef9841d3ced8510baface0
DIST ooo310-m16-sdk.tar.bz2 1559000 RMD160 473623d891a793bccfe046394753e151e599d4e8 SHA1 b06eb162ab2d2497c9ca621cc01172d792aa7b8d SHA256 e3354f5754f97a26881e5fbf9bce1c7d9cefd188c341642abc332fd8d0a3f2a6
DIST ooo310-m16-testing.tar.bz2 51197446 RMD160 212d709ff32a368c5abad3ce1ebbbc9e829e5832 SHA1 357ace90d70b143f6ad729040f3f43b48c39095b SHA256 40e36d666984eaa5f754bc3bd61dd9310d5089118eab00f5f43d7bdca399fbcc
DIST ooo310-m16-ure.tar.bz2 5122298 RMD160 87aa5471be9718e6fdbd7c9aa40b63dd11731ad1 SHA1 c5d2eb280687c6de6e129b3ad26bd1381bc6ba29 SHA256 ab48c8c7b019e90d7c2d29ace4af75c2eba3a0f9c13e9ea6970ca6b5796ee1f5
DIST ooo310-m16-writer.tar.bz2 8964424 RMD160 2b1ecdb1bb5ba6f3bff9434a8316c39cff899cf8 SHA1 1a7f024e50d63c395f8145ecf14f1ff3fea791b6 SHA256 f7a1486d8ad4874266686b6e4cf6ea24f4a51b85edfb48d2a23ead9822f6557b
DIST ooo_oxygen_images-2009-06-17.tar.gz 14296938 RMD160 355b7d43aff12578fc0af6ca6030301577477857 SHA1 c3dd261bfe366ac514a019b0fa829369b833c0c7 SHA256 3fcc0eb394ddfc43111ac27f35a7d966d4f775b0b46d6853c9b2b2612a940f4a
DIST scsolver.2008-10-30.tar.bz2 230572 RMD160 2176fd8207cce2e2db56c888849e766eedfb1a63 SHA1 7ad9c3396c3b1b9ac63274eb53818ba2d0a9f70c SHA256 865ac491bfbc7d4cc66b51fff78f3962a0a91efba1a8b5cc0bf5cf36be60e193
DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
EBUILD openoffice-3.1.0.ebuild 13070 RMD160 6e0f48c3a202176d25ad6d31db24f71d22972d8d SHA1 a10caa8700df97248902a0a83e9f0b3acc7f8401 SHA256 79aa4527c3fcc9b583fc10df9c43603d853ee319aef47c6e731900de2891dfa2
MISC ChangeLog 97621 RMD160 857479acb01160ab301c458558bd6c32d3cca898 SHA1 5914d9729953c2b755ed5566583e81805b7bae17 SHA256 5a6f7b7ad5580e87cba3b8d490d7f6e8a50fabcb7da4459beb5a5027a002b461
MISC metadata.xml 704 RMD160 c65911c6a5496c96e51d40848179c3321fb5fafd SHA1 25c8229286d330cdf48dbca4847594359a35820f SHA256 c60a22487a895dd589228b2bd964c2481067bbdabd4d91c49bb38927482abd78

View File

@@ -1,16 +0,0 @@
--- filter/source/xsltfilter/makefile.mk 2009-03-27 10:14:39.000000000 +0300
+++ filter/source/xsltfilter/makefile.mk 2009-03-27 18:14:56.000000000 +0300
@@ -72,11 +72,11 @@
CUSTOMMANIFESTFILE = Manifest
JARCOMPRESS = TRUE
-JARCLASSDIRS = XSLTransformer*.class XSLTFilterOLEExtracter*.class
+JARCLASSDIRS = XSLTransformer*.class XSLTFilterOLEExtracter*.class Base64*.class
JARTARGET = $(TARGET).jar
# --- Files --------------------------------------------------------
-JAVACLASSFILES=$(CLASSDIR)$/XSLTransformer.class $(CLASSDIR)$/XSLTFilterOLEExtracter.class
+JAVACLASSFILES=$(CLASSDIR)$/XSLTransformer.class $(CLASSDIR)$/XSLTFilterOLEExtracter.class $(CLASSDIR)$/Base64.class
.ENDIF
# --- Targets ------------------------------------------------------

View File

@@ -1,20 +0,0 @@
--- sw/source/core/doc/docbm.cxx 2009-05-17 16:41:34.765483089 -0500
+++ sw/source/core/doc/docbm.cxx 2009-05-17 16:41:39.141355157 -0500
@@ -33,6 +33,7 @@
#include "precompiled_sw.hxx"
+#include <cstdio>
#include <tools/pstm.hxx>
#include <svx/linkmgr.hxx>
#include <fmtanchr.hxx>
--- sw/source/filter/ww8/WW8TableInfo.cxx 2009-05-17 17:06:33.556313757 -0500
+++ sw/source/filter/ww8/WW8TableInfo.cxx 2009-05-17 17:06:46.964547351 -0500
@@ -32,6 +32,7 @@
#include "precompiled_sw.hxx"
#include <iostream>
+#include <cstdio>
#include "WW8TableInfo.hxx"
#include "swtable.hxx"
#include "pam.hxx"

View File

@@ -1,11 +0,0 @@
--- bin/package-ooo
+++ bin/package-ooo
@@ -33,6 +33,7 @@
{
cat <<EOT >$1
#!/bin/sh
+unset PYTHONPATH
$OOINSTBASE/program/soffice $2 "\$@"
EOT
chmod 755 $1

View File

@@ -1,25 +0,0 @@
--- bin/build-ooo.orig 2007-04-18 18:32:06.000000000 +0200
+++ bin/build-ooo 2007-04-18 18:32:45.000000000 +0200
@@ -21,9 +21,8 @@
echo "configuring ...";
autoconf || exit 1;
-echo "Env for configure:"
-set
-echo "Env for configure ends"
+echo "Log Env for configure to `pwd`/env.log"
+set > env.log
eval ./configure "$CONFIGURE_OPTIONS" "$PROPAGATED_ARGS" || exit 1;
@@ -88,8 +88,8 @@
# similar that gives child nmake's pain.
unset MAKEFLAGS
-echo "Env:"
-set
+echo "Log Env to `pwd`/env.log"
+set > env.log
# What extra localizations are avilable as $SRCDIR/GSI_*.sdf and are not
# already merged?

View File

@@ -1,262 +0,0 @@
unchanged:
--- solenv/inc/_tg_shl.mk
+++ solenv/inc/_tg_shl.mk
@@ -441,10 +441,10 @@ $(SHL1TARGETN) : \
.ENDIF
.ELSE # "$(OS)"=="MACOSX"
@-$(RM) $(MISC)$/$(TARGET).$(@:b)_1.cmd
- @echo $(SHL1LINKER) $(SHL1LINKFLAGS) $(SHL1SONAME) $(LINKFLAGSSHL) $(SHL1VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL1OBJS:s/.obj/.o/) \
+ @echo $(SHL1LINKER) $(SHL1LINKFLAGS) $(SHL1SONAME) $(LINKFLAGSSHL) $(SHL1VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL1OBJS:s/.obj/.o/) \
$(SHL1VERSIONOBJ) -o $@ \
`cat /dev/null $(SHL1LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
- $(SHL1STDLIBS) $(SHL1ARCHIVES) $(SHL1STDSHL) $(STDSHL1) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_1.cmd
+ $(SHL1STDLIBS) $(SHL1ARCHIVES) $(SHL1STDSHL) $(STDSHL1) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_1.cmd
@cat $(MISC)$/$(TARGET).$(@:b)_1.cmd
@+source $(MISC)$/$(TARGET).$(@:b)_1.cmd
.IF "$(UPDATER)"=="YES"
@@ -981,10 +981,10 @@ $(SHL2TARGETN) : \
.ENDIF
.ELSE # "$(OS)"=="MACOSX"
@-$(RM) $(MISC)$/$(TARGET).$(@:b)_2.cmd
- @echo $(SHL2LINKER) $(SHL2LINKFLAGS) $(SHL2SONAME) $(LINKFLAGSSHL) $(SHL2VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL2OBJS:s/.obj/.o/) \
+ @echo $(SHL2LINKER) $(SHL2LINKFLAGS) $(SHL2SONAME) $(LINKFLAGSSHL) $(SHL2VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL2OBJS:s/.obj/.o/) \
$(SHL2VERSIONOBJ) -o $@ \
`cat /dev/null $(SHL2LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
- $(SHL2STDLIBS) $(SHL2ARCHIVES) $(SHL2STDSHL) $(STDSHL2) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_2.cmd
+ $(SHL2STDLIBS) $(SHL2ARCHIVES) $(SHL2STDSHL) $(STDSHL2) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_2.cmd
@cat $(MISC)$/$(TARGET).$(@:b)_2.cmd
@+source $(MISC)$/$(TARGET).$(@:b)_2.cmd
.IF "$(UPDATER)"=="YES"
@@ -1521,10 +1521,10 @@ $(SHL3TARGETN) : \
.ENDIF
.ELSE # "$(OS)"=="MACOSX"
@-$(RM) $(MISC)$/$(TARGET).$(@:b)_3.cmd
- @echo $(SHL3LINKER) $(SHL3LINKFLAGS) $(SHL3SONAME) $(LINKFLAGSSHL) $(SHL3VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL3OBJS:s/.obj/.o/) \
+ @echo $(SHL3LINKER) $(SHL3LINKFLAGS) $(SHL3SONAME) $(LINKFLAGSSHL) $(SHL3VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL3OBJS:s/.obj/.o/) \
$(SHL3VERSIONOBJ) -o $@ \
`cat /dev/null $(SHL3LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
- $(SHL3STDLIBS) $(SHL3ARCHIVES) $(SHL3STDSHL) $(STDSHL3) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_3.cmd
+ $(SHL3STDLIBS) $(SHL3ARCHIVES) $(SHL3STDSHL) $(STDSHL3) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_3.cmd
@cat $(MISC)$/$(TARGET).$(@:b)_3.cmd
@+source $(MISC)$/$(TARGET).$(@:b)_3.cmd
.IF "$(UPDATER)"=="YES"
@@ -2061,10 +2061,10 @@ $(SHL4TARGETN) : \
.ENDIF
.ELSE # "$(OS)"=="MACOSX"
@-$(RM) $(MISC)$/$(TARGET).$(@:b)_4.cmd
- @echo $(SHL4LINKER) $(SHL4LINKFLAGS) $(SHL4SONAME) $(LINKFLAGSSHL) $(SHL4VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL4OBJS:s/.obj/.o/) \
+ @echo $(SHL4LINKER) $(SHL4LINKFLAGS) $(SHL4SONAME) $(LINKFLAGSSHL) $(SHL4VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL4OBJS:s/.obj/.o/) \
$(SHL4VERSIONOBJ) -o $@ \
`cat /dev/null $(SHL4LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
- $(SHL4STDLIBS) $(SHL4ARCHIVES) $(SHL4STDSHL) $(STDSHL4) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_4.cmd
+ $(SHL4STDLIBS) $(SHL4ARCHIVES) $(SHL4STDSHL) $(STDSHL4) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_4.cmd
@cat $(MISC)$/$(TARGET).$(@:b)_4.cmd
@+source $(MISC)$/$(TARGET).$(@:b)_4.cmd
.IF "$(UPDATER)"=="YES"
@@ -2601,10 +2601,10 @@ $(SHL5TARGETN) : \
.ENDIF
.ELSE # "$(OS)"=="MACOSX"
@-$(RM) $(MISC)$/$(TARGET).$(@:b)_5.cmd
- @echo $(SHL5LINKER) $(SHL5LINKFLAGS) $(SHL5SONAME) $(LINKFLAGSSHL) $(SHL5VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL5OBJS:s/.obj/.o/) \
+ @echo $(SHL5LINKER) $(SHL5LINKFLAGS) $(SHL5SONAME) $(LINKFLAGSSHL) $(SHL5VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL5OBJS:s/.obj/.o/) \
$(SHL5VERSIONOBJ) -o $@ \
`cat /dev/null $(SHL5LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
- $(SHL5STDLIBS) $(SHL5ARCHIVES) $(SHL5STDSHL) $(STDSHL5) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_5.cmd
+ $(SHL5STDLIBS) $(SHL5ARCHIVES) $(SHL5STDSHL) $(STDSHL5) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_5.cmd
@cat $(MISC)$/$(TARGET).$(@:b)_5.cmd
@+source $(MISC)$/$(TARGET).$(@:b)_5.cmd
.IF "$(UPDATER)"=="YES"
@@ -3141,10 +3141,10 @@ $(SHL6TARGETN) : \
.ENDIF
.ELSE # "$(OS)"=="MACOSX"
@-$(RM) $(MISC)$/$(TARGET).$(@:b)_6.cmd
- @echo $(SHL6LINKER) $(SHL6LINKFLAGS) $(SHL6SONAME) $(LINKFLAGSSHL) $(SHL6VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL6OBJS:s/.obj/.o/) \
+ @echo $(SHL6LINKER) $(SHL6LINKFLAGS) $(SHL6SONAME) $(LINKFLAGSSHL) $(SHL6VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL6OBJS:s/.obj/.o/) \
$(SHL6VERSIONOBJ) -o $@ \
`cat /dev/null $(SHL6LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
- $(SHL6STDLIBS) $(SHL6ARCHIVES) $(SHL6STDSHL) $(STDSHL6) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_6.cmd
+ $(SHL6STDLIBS) $(SHL6ARCHIVES) $(SHL6STDSHL) $(STDSHL6) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_6.cmd
@cat $(MISC)$/$(TARGET).$(@:b)_6.cmd
@+source $(MISC)$/$(TARGET).$(@:b)_6.cmd
.IF "$(UPDATER)"=="YES"
@@ -3681,10 +3681,10 @@ $(SHL7TARGETN) : \
.ENDIF
.ELSE # "$(OS)"=="MACOSX"
@-$(RM) $(MISC)$/$(TARGET).$(@:b)_7.cmd
- @echo $(SHL7LINKER) $(SHL7LINKFLAGS) $(SHL7SONAME) $(LINKFLAGSSHL) $(SHL7VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL7OBJS:s/.obj/.o/) \
+ @echo $(SHL7LINKER) $(SHL7LINKFLAGS) $(SHL7SONAME) $(LINKFLAGSSHL) $(SHL7VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL7OBJS:s/.obj/.o/) \
$(SHL7VERSIONOBJ) -o $@ \
`cat /dev/null $(SHL7LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
- $(SHL7STDLIBS) $(SHL7ARCHIVES) $(SHL7STDSHL) $(STDSHL7) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_7.cmd
+ $(SHL7STDLIBS) $(SHL7ARCHIVES) $(SHL7STDSHL) $(STDSHL7) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_7.cmd
@cat $(MISC)$/$(TARGET).$(@:b)_7.cmd
@+source $(MISC)$/$(TARGET).$(@:b)_7.cmd
.IF "$(UPDATER)"=="YES"
@@ -4221,10 +4221,10 @@ $(SHL8TARGETN) : \
.ENDIF
.ELSE # "$(OS)"=="MACOSX"
@-$(RM) $(MISC)$/$(TARGET).$(@:b)_8.cmd
- @echo $(SHL8LINKER) $(SHL8LINKFLAGS) $(SHL8SONAME) $(LINKFLAGSSHL) $(SHL8VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL8OBJS:s/.obj/.o/) \
+ @echo $(SHL8LINKER) $(SHL8LINKFLAGS) $(SHL8SONAME) $(LINKFLAGSSHL) $(SHL8VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL8OBJS:s/.obj/.o/) \
$(SHL8VERSIONOBJ) -o $@ \
`cat /dev/null $(SHL8LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
- $(SHL8STDLIBS) $(SHL8ARCHIVES) $(SHL8STDSHL) $(STDSHL8) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_8.cmd
+ $(SHL8STDLIBS) $(SHL8ARCHIVES) $(SHL8STDSHL) $(STDSHL8) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_8.cmd
@cat $(MISC)$/$(TARGET).$(@:b)_8.cmd
@+source $(MISC)$/$(TARGET).$(@:b)_8.cmd
.IF "$(UPDATER)"=="YES"
@@ -4761,10 +4761,10 @@ $(SHL9TARGETN) : \
.ENDIF
.ELSE # "$(OS)"=="MACOSX"
@-$(RM) $(MISC)$/$(TARGET).$(@:b)_9.cmd
- @echo $(SHL9LINKER) $(SHL9LINKFLAGS) $(SHL9SONAME) $(LINKFLAGSSHL) $(SHL9VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL9OBJS:s/.obj/.o/) \
+ @echo $(SHL9LINKER) $(SHL9LINKFLAGS) $(SHL9SONAME) $(LINKFLAGSSHL) $(SHL9VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL9OBJS:s/.obj/.o/) \
$(SHL9VERSIONOBJ) -o $@ \
`cat /dev/null $(SHL9LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
- $(SHL9STDLIBS) $(SHL9ARCHIVES) $(SHL9STDSHL) $(STDSHL9) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_9.cmd
+ $(SHL9STDLIBS) $(SHL9ARCHIVES) $(SHL9STDSHL) $(STDSHL9) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_9.cmd
@cat $(MISC)$/$(TARGET).$(@:b)_9.cmd
@+source $(MISC)$/$(TARGET).$(@:b)_9.cmd
.IF "$(UPDATER)"=="YES"
@@ -5301,10 +5301,10 @@ $(SHL10TARGETN) : \
.ENDIF
.ELSE # "$(OS)"=="MACOSX"
@-$(RM) $(MISC)$/$(TARGET).$(@:b)_10.cmd
- @echo $(SHL10LINKER) $(SHL10LINKFLAGS) $(SHL10SONAME) $(LINKFLAGSSHL) $(SHL10VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL10OBJS:s/.obj/.o/) \
+ @echo $(SHL10LINKER) $(SHL10LINKFLAGS) $(SHL10SONAME) $(LINKFLAGSSHL) $(SHL10VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL10OBJS:s/.obj/.o/) \
$(SHL10VERSIONOBJ) -o $@ \
`cat /dev/null $(SHL10LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
- $(SHL10STDLIBS) $(SHL10ARCHIVES) $(SHL10STDSHL) $(STDSHL10) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_10.cmd
+ $(SHL10STDLIBS) $(SHL10ARCHIVES) $(SHL10STDSHL) $(STDSHL10) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_10.cmd
@cat $(MISC)$/$(TARGET).$(@:b)_10.cmd
@+source $(MISC)$/$(TARGET).$(@:b)_10.cmd
.IF "$(UPDATER)"=="YES"
diff -u solenv/inc/_tg_app.mk solenv/inc/_tg_app.mk
--- solenv/inc/_tg_app.mk (working copy)
+++ solenv/inc/_tg_app.mk
@@ -116,10 +116,10 @@
.ELSE # "$(OS)"=="MACOSX"
@echo unx
@-$(RM) $(MISC)$/$(TARGET).$(@:b)_1.cmd
- @echo $(APP1LINKER) $(APP1LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
+ @echo $(APP1LINKER) $(APP1LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \
$(APP1OBJS:s/.obj/.o/) '\' > $(MISC)$/$(TARGET).$(@:b)_1.cmd
@cat $(mktmp /dev/null $(APP1LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_1.cmd
- @echo $(APP1LINKTYPEFLAG) $(APP1LIBSALCPPRT) $(APP1STDLIBS) $(APP1STDLIB) $(STDLIB1) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_1.cmd
+ @echo $(APP1LINKTYPEFLAG) $(APP1LIBSALCPPRT) $(APP1STDLIBS) $(APP1STDLIB) $(STDLIB1) $(SOLARLIB) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_1.cmd
cat $(MISC)$/$(TARGET).$(@:b)_1.cmd
@+source $(MISC)$/$(TARGET).$(@:b)_1.cmd
@ls -l $@
@@ -400,10 +400,10 @@
.ELSE # "$(OS)"=="MACOSX"
@echo unx
@-$(RM) $(MISC)$/$(TARGET).$(@:b)_2.cmd
- @echo $(APP2LINKER) $(APP2LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
+ @echo $(APP2LINKER) $(APP2LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \
$(APP2OBJS:s/.obj/.o/) '\' > $(MISC)$/$(TARGET).$(@:b)_2.cmd
@cat $(mktmp /dev/null $(APP2LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_2.cmd
- @echo $(APP2LINKTYPEFLAG) $(APP2LIBSALCPPRT) $(APP2STDLIBS) $(APP2STDLIB) $(STDLIB2) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_2.cmd
+ @echo $(APP2LINKTYPEFLAG) $(APP2LIBSALCPPRT) $(APP2STDLIBS) $(APP2STDLIB) $(STDLIB2) $(SOLARLIB) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_2.cmd
cat $(MISC)$/$(TARGET).$(@:b)_2.cmd
@+source $(MISC)$/$(TARGET).$(@:b)_2.cmd
@ls -l $@
@@ -684,10 +684,10 @@
.ELSE # "$(OS)"=="MACOSX"
@echo unx
@-$(RM) $(MISC)$/$(TARGET).$(@:b)_3.cmd
- @echo $(APP3LINKER) $(APP3LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
+ @echo $(APP3LINKER) $(APP3LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \
$(APP3OBJS:s/.obj/.o/) '\' > $(MISC)$/$(TARGET).$(@:b)_3.cmd
@cat $(mktmp /dev/null $(APP3LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_3.cmd
- @echo $(APP3LINKTYPEFLAG) $(APP3LIBSALCPPRT) $(APP3STDLIBS) $(APP3STDLIB) $(STDLIB3) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_3.cmd
+ @echo $(APP3LINKTYPEFLAG) $(APP3LIBSALCPPRT) $(APP3STDLIBS) $(APP3STDLIB) $(STDLIB3) $(SOLARLIB) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_3.cmd
cat $(MISC)$/$(TARGET).$(@:b)_3.cmd
@+source $(MISC)$/$(TARGET).$(@:b)_3.cmd
@ls -l $@
@@ -968,10 +968,10 @@
.ELSE # "$(OS)"=="MACOSX"
@echo unx
@-$(RM) $(MISC)$/$(TARGET).$(@:b)_4.cmd
- @echo $(APP4LINKER) $(APP4LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
+ @echo $(APP4LINKER) $(APP4LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \
$(APP4OBJS:s/.obj/.o/) '\' > $(MISC)$/$(TARGET).$(@:b)_4.cmd
@cat $(mktmp /dev/null $(APP4LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_4.cmd
- @echo $(APP4LINKTYPEFLAG) $(APP4LIBSALCPPRT) $(APP4STDLIBS) $(APP4STDLIB) $(STDLIB4) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_4.cmd
+ @echo $(APP4LINKTYPEFLAG) $(APP4LIBSALCPPRT) $(APP4STDLIBS) $(APP4STDLIB) $(STDLIB4) $(SOLARLIB) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_4.cmd
cat $(MISC)$/$(TARGET).$(@:b)_4.cmd
@+source $(MISC)$/$(TARGET).$(@:b)_4.cmd
@ls -l $@
@@ -1252,10 +1252,10 @@
.ELSE # "$(OS)"=="MACOSX"
@echo unx
@-$(RM) $(MISC)$/$(TARGET).$(@:b)_5.cmd
- @echo $(APP5LINKER) $(APP5LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
+ @echo $(APP5LINKER) $(APP5LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \
$(APP5OBJS:s/.obj/.o/) '\' > $(MISC)$/$(TARGET).$(@:b)_5.cmd
@cat $(mktmp /dev/null $(APP5LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_5.cmd
- @echo $(APP5LINKTYPEFLAG) $(APP5LIBSALCPPRT) $(APP5STDLIBS) $(APP5STDLIB) $(STDLIB5) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_5.cmd
+ @echo $(APP5LINKTYPEFLAG) $(APP5LIBSALCPPRT) $(APP5STDLIBS) $(APP5STDLIB) $(STDLIB5) $(SOLARLIB) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_5.cmd
cat $(MISC)$/$(TARGET).$(@:b)_5.cmd
@+source $(MISC)$/$(TARGET).$(@:b)_5.cmd
@ls -l $@
@@ -1536,10 +1536,10 @@
.ELSE # "$(OS)"=="MACOSX"
@echo unx
@-$(RM) $(MISC)$/$(TARGET).$(@:b)_6.cmd
- @echo $(APP6LINKER) $(APP6LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
+ @echo $(APP6LINKER) $(APP6LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \
$(APP6OBJS:s/.obj/.o/) '\' > $(MISC)$/$(TARGET).$(@:b)_6.cmd
@cat $(mktmp /dev/null $(APP6LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_6.cmd
- @echo $(APP6LINKTYPEFLAG) $(APP6LIBSALCPPRT) $(APP6STDLIBS) $(APP6STDLIB) $(STDLIB6) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_6.cmd
+ @echo $(APP6LINKTYPEFLAG) $(APP6LIBSALCPPRT) $(APP6STDLIBS) $(APP6STDLIB) $(STDLIB6) $(SOLARLIB) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_6.cmd
cat $(MISC)$/$(TARGET).$(@:b)_6.cmd
@+source $(MISC)$/$(TARGET).$(@:b)_6.cmd
@ls -l $@
@@ -1820,10 +1820,10 @@
.ELSE # "$(OS)"=="MACOSX"
@echo unx
@-$(RM) $(MISC)$/$(TARGET).$(@:b)_7.cmd
- @echo $(APP7LINKER) $(APP7LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
+ @echo $(APP7LINKER) $(APP7LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \
$(APP7OBJS:s/.obj/.o/) '\' > $(MISC)$/$(TARGET).$(@:b)_7.cmd
@cat $(mktmp /dev/null $(APP7LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_7.cmd
- @echo $(APP7LINKTYPEFLAG) $(APP7LIBSALCPPRT) $(APP7STDLIBS) $(APP7STDLIB) $(STDLIB7) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_7.cmd
+ @echo $(APP7LINKTYPEFLAG) $(APP7LIBSALCPPRT) $(APP7STDLIBS) $(APP7STDLIB) $(STDLIB7) $(SOLARLIB) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_7.cmd
cat $(MISC)$/$(TARGET).$(@:b)_7.cmd
@+source $(MISC)$/$(TARGET).$(@:b)_7.cmd
@ls -l $@
@@ -2104,10 +2104,10 @@
.ELSE # "$(OS)"=="MACOSX"
@echo unx
@-$(RM) $(MISC)$/$(TARGET).$(@:b)_8.cmd
- @echo $(APP8LINKER) $(APP8LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
+ @echo $(APP8LINKER) $(APP8LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \
$(APP8OBJS:s/.obj/.o/) '\' > $(MISC)$/$(TARGET).$(@:b)_8.cmd
@cat $(mktmp /dev/null $(APP8LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_8.cmd
- @echo $(APP8LINKTYPEFLAG) $(APP8LIBSALCPPRT) $(APP8STDLIBS) $(APP8STDLIB) $(STDLIB8) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_8.cmd
+ @echo $(APP8LINKTYPEFLAG) $(APP8LIBSALCPPRT) $(APP8STDLIBS) $(APP8STDLIB) $(STDLIB8) $(SOLARLIB) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_8.cmd
cat $(MISC)$/$(TARGET).$(@:b)_8.cmd
@+source $(MISC)$/$(TARGET).$(@:b)_8.cmd
@ls -l $@
@@ -2388,10 +2388,10 @@
.ELSE # "$(OS)"=="MACOSX"
@echo unx
@-$(RM) $(MISC)$/$(TARGET).$(@:b)_9.cmd
- @echo $(APP9LINKER) $(APP9LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
+ @echo $(APP9LINKER) $(APP9LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \
$(APP9OBJS:s/.obj/.o/) '\' > $(MISC)$/$(TARGET).$(@:b)_9.cmd
@cat $(mktmp /dev/null $(APP9LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_9.cmd
- @echo $(APP9LINKTYPEFLAG) $(APP9LIBSALCPPRT) $(APP9STDLIBS) $(APP9STDLIB) $(STDLIB9) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_9.cmd
+ @echo $(APP9LINKTYPEFLAG) $(APP9LIBSALCPPRT) $(APP9STDLIBS) $(APP9STDLIB) $(STDLIB9) $(SOLARLIB) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_9.cmd
cat $(MISC)$/$(TARGET).$(@:b)_9.cmd
@+source $(MISC)$/$(TARGET).$(@:b)_9.cmd
@ls -l $@
@@ -2672,7 +2672,7 @@
.ELSE # "$(OS)"=="MACOSX"
@echo unx
@-$(RM) $(MISC)$/$(TARGET).$(@:b)_10.cmd
- @echo $(APP10LINKER) $(APP10LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
+ @echo $(APP10LINKER) $(APP10LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \
$(APP10OBJS:s/.obj/.o/) '\' > $(MISC)$/$(TARGET).$(@:b)_10.cmd
@cat $(mktmp /dev/null $(APP10LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_10.cmd
@echo $(APP10LINKTYPEFLAG) $(APP10LIBSALCPPRT) $(APP10STDLIBS) $(APP10STDLIB) $(STDLIB10) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_10.cmd

View File

@@ -1,16 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>openoffice</herd>
<longdescription>Openoffice is the opensource version of staroffice.
This ebuild allows you to compile it yourself. Unfortunately this
compilation can take up to a day depending on the speed of your
computer. It will however make a snappier openoffice than the binary
version</longdescription>
<use>
<flag name='binfilter'>Enable support for legacy StarOffice 5.x and earlier
file formats</flag>
<flag name='odk'>Build the Office Development Kit</flag>
<flag name='templates'>Enable installation of Sun templates</flag>
</use>
</pkgmetadata>

View File

@@ -1,404 +0,0 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.1.0.ebuild,v 1.6 2009/05/31 15:35:26 suka Exp $
WANT_AUTOMAKE="1.9"
EAPI="2"
inherit bash-completion check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2 kde4-functions mono multilib toolchain-funcs
IUSE="binfilter cups dbus debug eds gnome gstreamer gtk kde ldap mono nsplugin odk opengl pam templates"
MY_PV=3.1.0.99.1
PATCHLEVEL=OOO310
SRC=OOo_${PV}_src
MST=ooo310-m16
DEVPATH=http://download.go-oo.org/${PATCHLEVEL}/${MST}
S=${WORKDIR}/ooo
S_OLD=${WORKDIR}/ooo-build-${MY_PV}
CONFFILE=${S}/distro-configs/Gentoo.conf.in
BASIS=basis3.1
DESCRIPTION="OpenOffice.org, a full office productivity suite."
SRC_URI="${DEVPATH}-artwork.tar.bz2
${DEVPATH}-base.tar.bz2
${DEVPATH}-bootstrap.tar.bz2
${DEVPATH}-calc.tar.bz2
${DEVPATH}-components.tar.bz2
${DEVPATH}-extensions.tar.bz2
${DEVPATH}-extras.tar.bz2
${DEVPATH}-filters.tar.bz2
${DEVPATH}-help.tar.bz2
${DEVPATH}-impress.tar.bz2
${DEVPATH}-libs-core.tar.bz2
${DEVPATH}-libs-extern.tar.bz2
${DEVPATH}-libs-extern-sys.tar.bz2
${DEVPATH}-libs-gui.tar.bz2
${DEVPATH}-postprocess.tar.bz2
${DEVPATH}-sdk.tar.bz2
${DEVPATH}-testing.tar.bz2
${DEVPATH}-ure.tar.bz2
${DEVPATH}-writer.tar.bz2
templates? ( http://extensions.services.openoffice.org/files/273/0/Sun_ODF_Template_Pack_en-US.oxt
http://extensions.services.openoffice.org/files/295/1/Sun_ODF_Template_Pack_de.oxt
http://extensions.services.openoffice.org/files/299/0/Sun_ODF_Template_Pack_it.oxt
http://extensions.services.openoffice.org/files/297/0/Sun_ODF_Template_Pack_fr.oxt
http://extensions.services.openoffice.org/files/301/1/Sun_ODF_Template_Pack_es.oxt )
http://download.go-oo.org/${PATCHLEVEL}/ooo-build-${MY_PV}.tar.gz
odk? ( java? ( http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll ) )
http://download.go-oo.org/SRC680/extras-3.tar.bz2
http://download.go-oo.org/SRC680/biblio.tar.bz2
http://download.go-oo.org/SRC680/lp_solve_5.5.0.12_source.tar.gz
http://download.go-oo.org/DEV300/scsolver.2008-10-30.tar.bz2
http://download.go-oo.org/SRC680/libwps-0.1.2.tar.gz
http://download.go-oo.org/SRC680/libwpg-0.1.3.tar.gz
http://download.go-oo.org/DEV300/ooo_oxygen_images-2009-06-17.tar.gz"
LANGS1="af ar as_IN be_BY bg bn br brx bs ca cs cy da de dgo dz el en en_GB en_ZA eo es et eu fa fi fr ga gl gu he hi_IN hr hu id it ja ka kk km kn_IN ko kok ks ku lt mai mk ml_IN mn mni mr_IN nb ne nl nn nr ns oc or_IN pa_IN pl pt pt_BR ru rw sa_IN sat sd sh sk sl sr ss st sv sw_TZ ta ta_IN te_IN tg th ti_ER tn tr ts uk ur_IN uz ve vi xh zh_CN zh_TW zu"
LANGS="${LANGS1} en en_US"
for X in ${LANGS} ; do
IUSE="${IUSE} linguas_${X}"
done
HOMEPAGE="http://go-oo.org"
LICENSE="LGPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~sparc ~x86"
COMMON_DEPEND="!app-office/openoffice-bin
x11-libs/libXaw
x11-libs/libXinerama
x11-libs/libXrandr
>=dev-lang/perl-5.0
dbus? ( >=dev-libs/dbus-glib-0.71 )
gnome? ( >=x11-libs/gtk+-2.10
>=gnome-base/gnome-vfs-2.6
>=gnome-base/gconf-2.0
>=x11-libs/cairo-1.0.2 )
gtk? ( >=x11-libs/gtk+-2.10
>=x11-libs/cairo-1.0.2 )
eds? ( >=gnome-extra/evolution-data-server-1.2 )
gstreamer? ( >=media-libs/gstreamer-0.10
>=media-libs/gst-plugins-base-0.10 )
kde? ( >=kde-base/kdelibs-4.0.1 )
java? ( >=dev-java/bsh-2.0_beta4
>=dev-db/hsqldb-1.8.0.9 )
mono? ( || ( >dev-lang/mono-2.4-r1 <dev-lang/mono-2.4 ) )
nsplugin? ( || ( net-libs/xulrunner:1.8 net-libs/xulrunner:1.9 =www-client/seamonkey-1* )
>=dev-libs/nspr-4.6.6
>=dev-libs/nss-3.11-r1 )
opengl? ( virtual/opengl
virtual/glu )
>=net-misc/neon-0.24.7
>=dev-libs/openssl-0.9.8g
>=media-libs/freetype-2.1.10-r2
>=media-libs/fontconfig-2.3.0
cups? ( net-print/cups )
media-libs/jpeg
media-libs/libpng
app-arch/zip
app-arch/unzip
>=app-text/hunspell-1.1.4-r1
dev-libs/expat
>=dev-libs/icu-4.0
>=sys-libs/db-4.3
>=app-text/libwpd-0.8.8
>=media-libs/vigra-1.4
>=virtual/poppler-0.8.0"
RDEPEND="java? ( >=virtual/jre-1.5 )
${COMMON_DEPEND}"
DEPEND="${COMMON_DEPEND}
x11-libs/libXrender
x11-libs/libXtst
x11-proto/printproto
x11-proto/xextproto
x11-proto/xproto
x11-proto/xineramaproto
>=sys-apps/findutils-4.1.20-r1
dev-perl/Archive-Zip
virtual/perl-Compress-Zlib
>=virtual/perl-Compress-Raw-Zlib-2.002
virtual/perl-IO-Compress-Base
dev-util/pkgconfig
dev-util/intltool
>=dev-libs/boost-1.33.1
sys-devel/flex
sys-devel/bison
dev-libs/libxslt
>=dev-libs/libxml2-2.0
>=dev-util/gperf-3
>=net-misc/curl-7.12
sys-libs/zlib
sys-apps/coreutils
pam? ( sys-libs/pam
sys-apps/shadow[pam] )
>=dev-lang/python-2.3.4[threads]
java? ( || ( =virtual/jdk-1.6* =virtual/jdk-1.5* )
>=dev-java/ant-core-1.7 )
ldap? ( net-nds/openldap )"
PROVIDE="virtual/ooo"
pkg_setup() {
ewarn
ewarn " It is important to note that OpenOffice.org is a very fragile "
ewarn " build when it comes to CFLAGS. A number of flags have already "
ewarn " been filtered out. If you experience difficulty merging this "
ewarn " package and use agressive CFLAGS, lower the CFLAGS and try to "
ewarn " merge again. Also note that building OOo takes a lot of time and "
ewarn " hardware ressources: 4-6 GB free diskspace and 256 MB RAM are "
ewarn " the minimum requirements. If you have less, use openoffice-bin "
ewarn " instead. "
ewarn
ewarn " Also if you experience a build break, please make sure to retry "
ewarn " with MAKEOPTS="-j1" before filing a bug. "
ewarn
# Check if we have enough RAM and free diskspace to build this beast
CHECKREQS_MEMORY="512"
use debug && CHECKREQS_DISK_BUILD="8192" || CHECKREQS_DISK_BUILD="6144"
check_reqs
strip-linguas ${LANGS}
if [[ -z "${LINGUAS}" ]]; then
export LINGUAS_OOO="en-US"
ewarn
ewarn " To get a localized build, set the according LINGUAS variable(s). "
ewarn
else
export LINGUAS_OOO=$(echo ${LINGUAS} | sed -e 's/\ben\b/en_US/g;s/_/-/g')
fi
if use !java; then
ewarn " You are building with java-support disabled, this results in some "
ewarn " of the OpenOffice.org functionality being disabled. "
ewarn " If something you need does not work for you, rebuild with "
ewarn " java in your USE-flags. "
ewarn
fi
if use !gtk && use !gnome; then
ewarn " If you want the OpenOffice.org systray quickstarter to work "
ewarn " activate either the 'gtk' or 'gnome' use flags. "
ewarn
fi
if is-flagq -ffast-math ; then
eerror " You are using -ffast-math, which is known to cause problems. "
eerror " Please remove it from your CFLAGS, using this globally causes "
eerror " all sorts of problems. "
eerror " After that you will also have to - at least - rebuild python otherwise "
eerror " the openoffice build will break. "
die
fi
if use nsplugin; then
if pkg-config --exists libxul; then
BRWS="libxul"
elif pkg-config --exists xulrunner-xpcom; then
BRWS="xulrunner"
elif pkg-config --exists seamonkey-xpcom; then
BRWS="seamonkey"
else
die "USE flag [nsplugin] set but no installed xulrunner or seamonkey found!"
fi
fi
java-pkg-opt-2_pkg_setup
# sys-libs/db version used
local db_ver=$(db_findver '>=sys-libs/db-4.3')
}
src_unpack() {
unpack ooo-build-${MY_PV}.tar.gz
}
src_prepare() {
# Hackish workaround for overlong path problem, see bug #130837
mv "${S_OLD}" "${S}" || die
#Some fixes for our patchset
cd "${S}"
epatch "${FILESDIR}/gentoo-${PV}.diff"
epatch "${FILESDIR}/ooo-env_log.diff"
# epatch "${FILESDIR}/ooo-qt4-dir-1.patch"
cp -f "${FILESDIR}/base64.diff" "${S}/patches/hotfixes" || die
# cp -f "${FILESDIR}/buildfix-gcc44.diff" "${S}/patches/hotfixes" || die
# cp -f "${FILESDIR}/solenv.workaround-for-the-kde-mess.diff" "${S}/patches/hotfixes" || die
#Use flag checks
if use java ; then
echo "--with-ant-home=${ANT_HOME}" >> ${CONFFILE}
echo "--with-jdk-home=$(java-config --jdk-home 2>/dev/null)" >> ${CONFFILE}
echo "--with-java-target-version=$(java-pkg_get-target)" >> ${CONFFILE}
echo "--with-jvm-path=/usr/$(get_libdir)/" >> ${CONFFILE}
echo "--with-system-beanshell" >> ${CONFFILE}
echo "--with-system-hsqldb" >> ${CONFFILE}
echo "--with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)" >> ${CONFFILE}
echo "--with-hsqldb-jar=$(java-pkg_getjar hsqldb hsqldb.jar)" >> ${CONFFILE}
fi
if use nsplugin ; then
echo "--enable-mozilla" >> ${CONFFILE}
echo "--with-system-mozilla=${BRWS}" >> ${CONFFILE}
else
echo "--disable-mozilla" >> ${CONFFILE}
echo "--without-system-mozilla" >> ${CONFFILE}
fi
echo $(use_enable binfilter) >> ${CONFFILE}
echo $(use_enable cups) >> ${CONFFILE}
echo $(use_enable dbus) >> ${CONFFILE}
echo $(use_enable eds evolution2) >> ${CONFFILE}
echo $(use_enable gnome gconf) >> ${CONFFILE}
echo $(use_enable gnome gnome-vfs) >> ${CONFFILE}
echo $(use_enable gnome lockdown) >> ${CONFFILE}
echo $(use_enable gstreamer) >> ${CONFFILE}
echo $(use_enable gtk systray) >> ${CONFFILE}
echo $(use_enable ldap) >> ${CONFFILE}
echo $(use_enable opengl) >> ${CONFFILE}
echo $(use_with ldap openldap) >> ${CONFFILE}
echo $(use_enable debug crashdump) >> ${CONFFILE}
echo $(use_enable debug strip-solver) >> ${CONFFILE}
# Extension stuff
echo "--with-extension-integration" >> ${CONFFILE}
echo "--enable-minimizer" >> ${CONFFILE}
echo "--enable-pdfimport" >> ${CONFFILE}
echo "--enable-presenter-console" >> ${CONFFILE}
echo "--without-writer2latex" >> ${CONFFILE}
# Use splash screen without Sun logo
echo "--with-intro-bitmaps=\\\"${S}/build/${MST}/ooo_custom_images/nologo/introabout/intro.bmp\\\"" >> ${CONFFILE}
}
src_configure() {
# Use multiprocessing by default now, it gets tested by upstream
export JOBS=$(echo "${MAKEOPTS}" | sed -e "s/.*-j\([0-9]\+\).*/\1/")
# Compile problems with these ...
filter-flags "-funroll-loops"
filter-flags "-fprefetch-loop-arrays"
filter-flags "-fno-default-inline"
filter-flags "-fstack-protector"
filter-flags "-fstack-protector-all"
filter-flags "-ftracer"
filter-flags "-fforce-addr"
filter-flags "-O[s2-9]"
if [[ $(gcc-major-version) -lt 4 ]]; then
replace-flags "-fomit-frame-pointer" "-momit-leaf-frame-pointer"
fi
# Build with NVidia cards breaks otherwise
use opengl && append-flags "-DGL_GLEXT_PROTOTYPES"
# Now for our optimization flags ...
export ARCH_FLAGS="${CXXFLAGS}"
use debug || export LINKFLAGSOPTIMIZE="${LDFLAGS}"
# Make sure gnome-users get gtk-support
local GTKFLAG="--disable-gtk --disable-cairo --without-system-cairo"
{ use gtk || use gnome; } && GTKFLAG="--enable-gtk --enable-cairo --with-system-cairo"
cd "${S}"
./configure --with-distro="Gentoo" \
--with-arch="${ARCH}" \
--with-srcdir="${DISTDIR}" \
--with-lang="${LINGUAS_OOO}" \
--with-num-cpus="${JOBS}" \
--without-binsuffix \
--with-installed-ooo-dirname="openoffice" \
--with-tag="${MST}" \
${GTKFLAG} \
$(use_enable mono) \
$(use_enable kde kde4) \
$(use_enable !debug strip) \
$(use_enable odk) \
$(use_enable pam) \
$(use_with java) \
$(use_with templates sun-templates) \
--disable-kde \
--disable-access \
--disable-post-install-scripts \
--enable-extensions \
--with-system-libwpd \
--mandir=/usr/share/man \
--libdir=/usr/$(get_libdir) \
|| die "Configuration failed!"
}
src_compile() {
# use kde && set-kdedir 3
make || die "Build failed"
}
src_install() {
export PYTHONPATH=""
einfo "Preparing Installation"
make DESTDIR="${D}" install || die "Installation failed!"
# Fix the permissions for security reasons
# chown -RP root:0 "${D}"
# record java libraries
if use java; then
java-pkg_regjar "${D}"/usr/$(get_libdir)/openoffice/${BASIS}/program/classes/*.jar
java-pkg_regjar "${D}"/usr/$(get_libdir)/openoffice/ure/share/java/*.jar
fi
# Upstream places the bash-completion module in /etc. Gentoo places them in
# /usr/share/bash-completion. bug 226061
dobashcompletion "${D}"/etc/bash_completion.d/ooffice.sh ooffice
rm -rf "${D}"/etc/bash_completion.d/ || die "rm failed"
}
pkg_postinst() {
fdo-mime_desktop_database_update
fdo-mime_mime_database_update
BASH_COMPLETION_NAME=ooffice && bash-completion_pkg_postinst
[[ -x /sbin/chpax ]] && [[ -e /usr/$(get_libdir)/openoffice/program/soffice.bin ]] && chpax -zm /usr/$(get_libdir)/openoffice/program/soffice.bin
# Add available & useful jars to openoffice classpath
use java && /usr/$(get_libdir)/openoffice/${BASIS}/program/java-set-classpath $(java-config --classpath=jdbc-mysql 2>/dev/null) >/dev/null
elog
elog " Spell checking is provided through our own myspell-ebuilds, "
elog " if you want to use it, please install the correct myspell package "
elog " according to your language needs. "
elog
elog " Some aditional functionality can be installed via Extension Manager: "
elog " *) PDF Import "
elog " *) Presentation Console "
elog " *) Presentation Minimizer "
elog
elog " Please use the packages provided in "
elog " /usr/$(get_libdir)/openoffice/share/extension/install/ "
elog " instead of those from the SUN extension site. "
elog
}