diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-06-10 10:37:19 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-06-10 11:05:07 +0100 |
commit | bb42b693c81814a966723b5067a2d20754fe82e0 (patch) | |
tree | b17e6b379be56b1a298230cf7aab7be77cdacc7b /instsetoo_native | |
parent | external/liborcus: Fix Linux RPATH (diff) | |
download | core-bb42b693c81814a966723b5067a2d20754fe82e0.tar.gz core-bb42b693c81814a966723b5067a2d20754fe82e0.zip |
don't add gnomevfs requires to epm created rpms if GNOMEVFS is disabled
Change-Id: I689783e176921ea03475d3e113426563bf20b9d7
Diffstat (limited to 'instsetoo_native')
-rw-r--r-- | instsetoo_native/CustomTarget_install.mk | 6 | ||||
-rw-r--r-- | instsetoo_native/inc_openoffice/unix/find-requires-glib.sh | 26 | ||||
-rw-r--r-- | instsetoo_native/inc_openoffice/unix/find-requires-gnomevfs.sh (renamed from instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh) | 2 |
3 files changed, 30 insertions, 4 deletions
diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk index f894ae547732..101160ca7371 100644 --- a/instsetoo_native/CustomTarget_install.mk +++ b/instsetoo_native/CustomTarget_install.mk @@ -21,7 +21,8 @@ $(eval $(call gb_CustomTarget_CustomTarget,instsetoo_native/install)) $(eval $(call gb_CustomTarget_register_targets,instsetoo_native/install,\ install.phony \ $(if $(filter-out WNT,$(OS)),\ - bin/find-requires-gnome.sh \ + $(if $(ENABLE_GNOMEVFS),bin/find-requires-gnomevfs.sh) \ + bin/find-requires-glib.sh \ bin/find-requires-x11.sh) \ $(foreach ulf,$(instsetoo_ULFLIST),win_ulffiles/$(ulf).ulf) \ )) @@ -31,7 +32,8 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/install.phony: \ $(foreach ulf,$(instsetoo_ULFLIST),$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/win_ulffiles/$(ulf).ulf) \ $(if $(filter-out WNT,$(OS)),\ $(addprefix $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/,\ - bin/find-requires-gnome.sh \ + $(if $(ENABLE_GNOMEVFS),bin/find-requires-gnomevfs.sh) \ + bin/find-requires-glib.sh \ bin/find-requires-x11.sh) \ ) \ $(call gb_Postprocess_get_target,AllModulesButInstsetNative) diff --git a/instsetoo_native/inc_openoffice/unix/find-requires-glib.sh b/instsetoo_native/inc_openoffice/unix/find-requires-glib.sh new file mode 100644 index 000000000000..4be8766870fa --- /dev/null +++ b/instsetoo_native/inc_openoffice/unix/find-requires-glib.sh @@ -0,0 +1,26 @@ +#!/bin/sh +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +# This file incorporates work covered by the following license notice: +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed +# with this work for additional information regarding copyright +# ownership. The ASF licenses this file to you under the Apache +# License, Version 2.0 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.apache.org/licenses/LICENSE-2.0 . +# + +cat > /dev/null +[[ "${PLATFORMID}" == "linux_x86_64" ]] && mark64="()(64bit)" +if [[ "${OS}" == "AIX" ]]; then + echo "libgconf-2.a(libgconf-2.so.4${mark64})" +else + echo "libgconf-2.so.4${mark64}" +fi diff --git a/instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh b/instsetoo_native/inc_openoffice/unix/find-requires-gnomevfs.sh index 8b91d77d945f..12d03c91f500 100644 --- a/instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh +++ b/instsetoo_native/inc_openoffice/unix/find-requires-gnomevfs.sh @@ -21,8 +21,6 @@ cat > /dev/null [[ "${PLATFORMID}" == "linux_x86_64" ]] && mark64="()(64bit)" if [[ "${OS}" == "AIX" ]]; then echo "libgnomevfs-2.a(libgnomevfs-2.so.0${mark64})" - echo "libgconf-2.a(libgconf-2.so.4${mark64})" else echo "libgnomevfs-2.so.0${mark64}" - echo "libgconf-2.so.4${mark64}" fi |