[Libreoffice-commits] core.git: instsetoo_native/CustomTarget_setup.mk instsetoo_native/Package_setup.mk

[Michael Stahl]

 instsetoo_native/CustomTarget_setup.mk |    9 ---------
 instsetoo_native/Package_setup.mk      |    1 -
 2 files changed, 10 deletions(-)

New commits:
commit 5c4ca57923a5409b96b1ac999f6b89c53e52829e
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Nov 27 12:16:47 2015 +0100

    Revert "gengal: create an ini / rc file - to bootstrap services properly."
    
    This reverts commit 795c61e052671d4de6a3b9cf77f9c0ad117e064d.
    
    <sberg_> but what is 795c61e052671d4de6a3b9cf77f9c0ad117e064d
    supposed to help anyway?  on all platforms, gengal should already get
    URE_BOOTSTRAP set, either via redirectrc, or via
    extendApplicationEnvironment()
    <mst_> sberg_: so ... you mean that gengal.rc is actually unnecessary,
    and that the problem was caused by a missing dep on
    Package_instsetoo_native_setup ?
    <sberg_> I'm pretty sure a missing gengal ini-file was a red herring
    
    Change-Id: I50ebc360e0e5c75c16f8407cbac6a54753fca272
    Reviewed-on: https://gerrit.libreoffice.org/20226
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk
index 3edf1b8..e4cdd53 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -12,7 +12,6 @@ $(eval $(call gb_CustomTarget_CustomTarget,instsetoo_native/setup))
 $(eval $(call gb_CustomTarget_register_targets,instsetoo_native/setup,\
 	$(call gb_Helper_get_rcfile,bootstrap) \
 	$(call gb_Helper_get_rcfile,fundamental) \
-	$(call gb_Helper_get_rcfile,gengal) \
 	$(call gb_Helper_get_rcfile,louno) \
 	$(if $(filter DESKTOP,$(BUILD_TYPE)),$(if $(filter-out MACOSX,$(OS)), \
 	    $(call gb_Helper_get_rcfile,redirect))) \
@@ -24,7 +23,6 @@ $(eval $(call gb_CustomTarget_register_targets,instsetoo_native/setup,\
 
 $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,bootstrap) \
 $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,fundamental) \
-$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,gengal) \
 $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,louno) \
 $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,redirect) \
 $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,setup) \
@@ -122,13 +120,6 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
 		&& echo 'URE_BOOTSTRAP=$${ORIGIN}/$(call gb_Helper_get_rcfile,fundamental)' \
 	) > $@
 
-$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,gengal) :
-	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
-	( \
-		echo '[Bootstrap]' \
-		&& echo 'URE_BOOTSTRAP=$${ORIGIN}/$(call gb_Helper_get_rcfile,fundamental)' \
-	) > $@
-
 $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,uno) :
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
 	( \
diff --git a/instsetoo_native/Package_setup.mk b/instsetoo_native/Package_setup.mk
index 2c67544..5b1e427 100644
--- a/instsetoo_native/Package_setup.mk
+++ b/instsetoo_native/Package_setup.mk
@@ -12,7 +12,6 @@ $(eval $(call gb_Package_Package,instsetoo_native_setup,$(call gb_CustomTarget_g
 $(eval $(call gb_Package_add_files,instsetoo_native_setup,$(LIBO_ETC_FOLDER),\
 	$(call gb_Helper_get_rcfile,bootstrap) \
 	$(call gb_Helper_get_rcfile,fundamental) \
-	$(call gb_Helper_get_rcfile,gengal) \
 	$(if $(filter DESKTOP,$(BUILD_TYPE)),$(if $(filter-out MACOSX,$(OS)), \
 	    $(call gb_Helper_get_rcfile,redirect))) \
 	$(call gb_Helper_get_rcfile,setup) \