File ooo-build-3.0.0.9-external.diff of Package OpenOffice_org-bootstrap

Overview Repositories Revisions Requests Users Attributes Meta

File ooo-build-3.0.0.9-external.diff of Package OpenOffice_org-bootstrap

--- bin/piece/build-generic
+++ bin/piece/build-generic
@@ -28,7 +28,11 @@
 	 `pwd` || exit 1;
 
 # available source dirs
-dirs=`/bin/ls | grep -v -e 'applied_patches' -e '^solver' -e 'ooo-build' | tr '\n' ':'`
+omit_dirs="-e applied_patches -e ^solver -e ooo-build"
+if test "$piece" != "libs_extern" ; then
+    omit_dirs="$omit_dirs -e ^external\$"
+fi
+dirs=`/bin/ls | grep -v $omit_dirs | tr '\n' ':'`
 # clean build?
 if test ! -d solver; then
     echo "A very clean straight-through build - deferring dep generation"
--- bin/piece/install-generic
+++ bin/piece/install-generic
@@ -52,6 +52,15 @@
 $OO_TOOLSDIR/piece/copyexcept -x $filelist $SRCDIR/* $DEST
 rm -f $filelist
 
+# FIXME: we need to provide external files also in other pieces (e.g. prebuild mono.dlls)
+#        external is automatically taken into build dependencies even when removed from
+#        the dirs list in build-generic
+#        => the build.lst and deliver.log must be deleted in other pieces to avoid conflict of devel packages
+if test "$piece" != "libs_extern" ; then
+    rm -f $DEST/inc/external/build.lst
+    rm -f $DEST/inc/external/deliver.log
+fi
+
 # hotfix post upstream install
 # allows to modify the install process from the piece package sources
 hotfix_post_upstream_install="ooo-build/bin/post-upstream-install"

Places

File ooo-build-3.0.0.9-external.diff of Package OpenOffice_org-bootstrap

Places