Kaydet (Commit) bb42b693 authored tarafından Caolán McNamara's avatar Caolán McNamara

don't add gnomevfs requires to epm created rpms if GNOMEVFS is disabled

Change-Id: I689783e176921ea03475d3e113426563bf20b9d7
üst 371cc81b
...@@ -21,7 +21,8 @@ $(eval $(call gb_CustomTarget_CustomTarget,instsetoo_native/install)) ...@@ -21,7 +21,8 @@ $(eval $(call gb_CustomTarget_CustomTarget,instsetoo_native/install))
$(eval $(call gb_CustomTarget_register_targets,instsetoo_native/install,\ $(eval $(call gb_CustomTarget_register_targets,instsetoo_native/install,\
install.phony \ install.phony \
$(if $(filter-out WNT,$(OS)),\ $(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) \ bin/find-requires-x11.sh) \
$(foreach ulf,$(instsetoo_ULFLIST),win_ulffiles/$(ulf).ulf) \ $(foreach ulf,$(instsetoo_ULFLIST),win_ulffiles/$(ulf).ulf) \
)) ))
...@@ -31,7 +32,8 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/install.phony: \ ...@@ -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) \ $(foreach ulf,$(instsetoo_ULFLIST),$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/win_ulffiles/$(ulf).ulf) \
$(if $(filter-out WNT,$(OS)),\ $(if $(filter-out WNT,$(OS)),\
$(addprefix $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/,\ $(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) \ bin/find-requires-x11.sh) \
) \ ) \
$(call gb_Postprocess_get_target,AllModulesButInstsetNative) $(call gb_Postprocess_get_target,AllModulesButInstsetNative)
......
#!/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
...@@ -21,8 +21,6 @@ cat > /dev/null ...@@ -21,8 +21,6 @@ cat > /dev/null
[[ "${PLATFORMID}" == "linux_x86_64" ]] && mark64="()(64bit)" [[ "${PLATFORMID}" == "linux_x86_64" ]] && mark64="()(64bit)"
if [[ "${OS}" == "AIX" ]]; then if [[ "${OS}" == "AIX" ]]; then
echo "libgnomevfs-2.a(libgnomevfs-2.so.0${mark64})" echo "libgnomevfs-2.a(libgnomevfs-2.so.0${mark64})"
echo "libgconf-2.a(libgconf-2.so.4${mark64})"
else else
echo "libgnomevfs-2.so.0${mark64}" echo "libgnomevfs-2.so.0${mark64}"
echo "libgconf-2.so.4${mark64}"
fi fi
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment