mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

epm: use executables from WORKDIR and clean up configure

Browse Source 
Change-Id: I69e75dbbaa16b6dc407a69ba8137c09888db50ce
This commit is contained in:
Michael Stahl
2013-10-24 13:01:43 +02:00
parent b308526fbc
commit 19d7c0348d
4 changed files with 3 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@@ -7362,6 +7362,7 @@ if test "$enable_epm" = "yes"; then
if test "$EPM" = "no" -o "$EPM" = "internal"; then if test "$EPM" = "no" -o "$EPM" = "internal"; then
echo "EPM will be built." echo "EPM will be built."
BUILD_TYPE="$BUILD_TYPE EPM" BUILD_TYPE="$BUILD_TYPE EPM"
EPM=${WORKDIR}/UnpackedTarball/epm/epm
else else
# Gentoo has some epm which is something different... # Gentoo has some epm which is something different...
AC_MSG_CHECKING([whether the found epm is the right epm]) AC_MSG_CHECKING([whether the found epm is the right epm])
@@ -7377,8 +7378,7 @@ if test "$enable_epm" = "yes"; then
AC_MSG_RESULT([OK, >= 3.7]) AC_MSG_RESULT([OK, >= 3.7])
else else
AC_MSG_RESULT([too old. epm >= 3.7 is required.]) AC_MSG_RESULT([too old. epm >= 3.7 is required.])
echo "EPM will be built." AC_MSG_ERROR([Install ESP Package Manager (http://www.msweet.org/projects.php?Z2) and/or specify the path to the right epm])
BUILD_TYPE="$BUILD_TYPE EPM"
fi fi
fi fi
fi fi
@@ -7428,7 +7428,7 @@ if test "$enable_epm" = "yes"; then
fi fi
if echo "$PKGFORMAT" | $EGREP rpm 2>&1 >/dev/null || \ if echo "$PKGFORMAT" | $EGREP rpm 2>&1 >/dev/null || \
echo "$PKGFORMAT" | $EGREP pkg 2>&1 >/dev/null; then echo "$PKGFORMAT" | $EGREP pkg 2>&1 >/dev/null; then
if test "$EPM" != "no" -a "$EPM" != "internal"; then if test "$with_epm" = "no" -a "$_os" != "Darwin"; then
if test "`echo $EPM_VERSION | cut -d'.' -f1`" -lt "4"; then if test "`echo $EPM_VERSION | cut -d'.' -f1`" -lt "4"; then
AC_MSG_CHECKING([whether epm is patched for LibreOffice's needs]) AC_MSG_CHECKING([whether epm is patched for LibreOffice's needs])
if grep "Patched for LibreOffice" $EPM >/dev/null 2>/dev/null; then if grep "Patched for LibreOffice" $EPM >/dev/null 2>/dev/null; then

20
external/epm/ExternalPackage_epm.mk vendored
View File

@@ -1,20 +0,0 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# 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/.
#
$(eval $(call gb_ExternalPackage_ExternalPackage,epm,epm))
$(eval $(call gb_ExternalPackage_use_external_project,epm,epm))
$(eval $(call gb_ExternalPackage_add_files,epm,bin,\
epm \
epminstall \
mkepmlist \
))
# vim: set noet sw=4 ts=4:

1
external/epm/Module_epm.mk vendored
View File

@@ -12,7 +12,6 @@ $(eval $(call gb_Module_Module,epm))
ifneq ($(CROSS_COMPILING),YES) ifneq ($(CROSS_COMPILING),YES)
$(eval $(call gb_Module_add_targets,epm,\ $(eval $(call gb_Module_add_targets,epm,\
ExternalPackage_epm \
ExternalProject_epm \ ExternalProject_epm \
UnpackedTarball_epm \ UnpackedTarball_epm \
)) ))

7
solenv/bin/modules/installer/epmfile.pm
View File

@@ -722,13 +722,6 @@ sub find_epm_on_system
{ {
$epmname = $ENV{'EPM'}; $epmname = $ENV{'EPM'};
} }
elsif ( ($ENV{'EPM'} eq "no") || ($ENV{'EPM'} eq "internal") )
{
$epmname = "epm";
my $epmref = installer::scriptitems::get_sourcepath_from_filename_and_includepath( \$epmname, $includepatharrayref, 0);
if ($$epmref eq "") { installer::exiter::exit_program("ERROR: Could not find program $epmname (EPM set to \"internal\" or \"no\")!", "find_epm_on_system"); }
$epmname = $$epmref;
}
else else
{ {
installer::exiter::exit_program("Environment variable EPM set (\"$ENV{'EPM'}\"), but file does not exist or is not executable!", "find_epm_on_system"); installer::exiter::exit_program("Environment variable EPM set (\"$ENV{'EPM'}\"), but file does not exist or is not executable!", "find_epm_on_system");