[Libreoffice-commits] .: libxmlsec/makefile.mk libxmlsec/xmlsec1-oldlibtool.patch
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Nov 29 03:55:07 PST 2012
libxmlsec/makefile.mk | 10 +-
libxmlsec/xmlsec1-oldlibtool.patch | 145 +++++++++++++++++++++++++++++++++++++
2 files changed, 149 insertions(+), 6 deletions(-)
New commits:
commit 5f45e7424bc548ac524f888896d966eac1363480
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Nov 29 11:53:04 2012 +0000
drop need for libtool but keep buildable on RHEL-5
Change-Id: Ib732594a6b27fb0b42d055abb2f7382f021d63c9
diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk
index e28ef7e..c21668a 100644
--- a/libxmlsec/makefile.mk
+++ b/libxmlsec/makefile.mk
@@ -74,7 +74,8 @@ PATCH_FILES=\
xmlsec1-vc10.patch \
xmlsec1-1.2.14_fix_extern_c.patch \
xmlsec1-android.patch \
- xmlsec1-1.2.14-ansi.patch
+ xmlsec1-1.2.14-ansi.patch \
+ xmlsec1-oldlibtool.patch
.IF "$(GUI)$(COM)"=="WNTGCC"
PATCH_FILES+=xmlsec1-mingw32.patch
@@ -117,7 +118,7 @@ CONF_ILIB=-L$(ILIB:s/;/ -L/)
.ENDIF
CONFIGURE_DIR=
-CONFIGURE_ACTION=autoreconf -i; ./configure
+CONFIGURE_ACTION=autoreconf; ./configure
BUILD_AND_HOST=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) MINGW_SYSROOT=$(MINGW_SYSROOT) OBJDUMP="$(OBJDUMP)"
@@ -175,11 +176,8 @@ LDFLAGS:=$(xmlsec_LDFLAGS)
.EXPORT: LDFLAGS
.ENDIF
-.IF "$(OS)" != "MACOSX"
-AUTOCONFINSTALLFLAG=-i
-.ENDIF
CONFIGURE_DIR=
-CONFIGURE_ACTION=autoreconf $(AUTOCONFINSTALLFLAG); ./configure ADDCFLAGS="$(xmlsec_CFLAGS)" CPPFLAGS="$(xmlsec_CPPFLAGS)"
+CONFIGURE_ACTION=autoreconf; ./configure ADDCFLAGS="$(xmlsec_CFLAGS)" CPPFLAGS="$(xmlsec_CPPFLAGS)"
.IF "$(OS)" == "MACOSX"
.IF "$(ACLOCAL)" == ""
diff --git a/libxmlsec/xmlsec1-oldlibtool.patch b/libxmlsec/xmlsec1-oldlibtool.patch
new file mode 100644
index 0000000..fd6f021
--- /dev/null
+++ b/libxmlsec/xmlsec1-oldlibtool.patch
@@ -0,0 +1,145 @@
+--- /dev/null 2012-11-27 15:14:41.892226008 +0100
++++ /build/xmlsec1-1.2.14/compile 2012-11-29 12:27:14.000000000 +0100
+@@ -0,0 +1,142 @@
++#! /bin/sh
++# Wrapper for compilers which do not understand `-c -o'.
++
++scriptversion=2005-05-14.22
++
++# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
++# Written by Tom Tromey <tromey at cygnus.com>.
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
++
++# As a special exception to the GNU General Public License, if you
++# distribute this file as part of a program that contains a
++# configuration script generated by Autoconf, you may include it under
++# the same distribution terms that you use for the rest of that program.
++
++# This file is maintained in Automake, please report
++# bugs to <bug-automake at gnu.org> or send patches to
++# <automake-patches at gnu.org>.
++
++case $1 in
++ '')
++ echo "$0: No command. Try \`$0 --help' for more information." 1>&2
++ exit 1;
++ ;;
++ -h | --h*)
++ cat <<\EOF
++Usage: compile [--help] [--version] PROGRAM [ARGS]
++
++Wrapper for compilers which do not understand `-c -o'.
++Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
++arguments, and rename the output as expected.
++
++If you are trying to build a whole package this is not the
++right script to run: please start by reading the file `INSTALL'.
++
++Report bugs to <bug-automake at gnu.org>.
++EOF
++ exit $?
++ ;;
++ -v | --v*)
++ echo "compile $scriptversion"
++ exit $?
++ ;;
++esac
++
++ofile=
++cfile=
++eat=
++
++for arg
++do
++ if test -n "$eat"; then
++ eat=
++ else
++ case $1 in
++ -o)
++ # configure might choose to run compile as `compile cc -o foo foo.c'.
++ # So we strip `-o arg' only if arg is an object.
++ eat=1
++ case $2 in
++ *.o | *.obj)
++ ofile=$2
++ ;;
++ *)
++ set x "$@" -o "$2"
++ shift
++ ;;
++ esac
++ ;;
++ *.c)
++ cfile=$1
++ set x "$@" "$1"
++ shift
++ ;;
++ *)
++ set x "$@" "$1"
++ shift
++ ;;
++ esac
++ fi
++ shift
++done
++
++if test -z "$ofile" || test -z "$cfile"; then
++ # If no `-o' option was seen then we might have been invoked from a
++ # pattern rule where we don't need one. That is ok -- this is a
++ # normal compilation that the losing compiler can handle. If no
++ # `.c' file was seen then we are probably linking. That is also
++ # ok.
++ exec "$@"
++fi
++
++# Name of file we expect compiler to create.
++cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
++
++# Create the lock directory.
++# Note: use `[/.-]' here to ensure that we don't use the same name
++# that we are using for the .o file. Also, base the name on the expected
++# object file name, since that is what matters with a parallel build.
++lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
++while true; do
++ if mkdir "$lockdir" >/dev/null 2>&1; then
++ break
++ fi
++ sleep 1
++done
++# FIXME: race condition here if user kills between mkdir and trap.
++trap "rmdir '$lockdir'; exit 1" 1 2 15
++
++# Run the compile.
++"$@"
++ret=$?
++
++if test -f "$cofile"; then
++ mv "$cofile" "$ofile"
++elif test -f "${cofile}bj"; then
++ mv "${cofile}bj" "$ofile"
++fi
++
++rmdir "$lockdir"
++exit $ret
++
++# Local Variables:
++# mode: shell-script
++# sh-indentation: 2
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "scriptversion="
++# time-stamp-format: "%:y-%02m-%02d.%02H"
++# time-stamp-end: "$"
++# End:
More information about the Libreoffice-commits
mailing list