From 35f18488a599157438c5af52e92c104dc5fe57b0d9ff2ce8b77e1a826a6555b2 Mon Sep 17 00:00:00 2001 From: Philipp Thomas Date: Tue, 16 Apr 2013 09:29:04 +0000 Subject: [PATCH] - Adapt autogen-build_ldpath.patch to the changed sources. OBS-URL: https://build.opensuse.org/package/show/Base:System/autogen?expand=0&rev=25 --- autogen-build_ldpath.patch | 22 ++++++++++++++++++++-- autogen.changes | 1 + 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/autogen-build_ldpath.patch b/autogen-build_ldpath.patch index 2fea1d3..03d4e94 100644 --- a/autogen-build_ldpath.patch +++ b/autogen-build_ldpath.patch @@ -1,11 +1,12 @@ --- autoopts/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + doc/mk-agen-texi.sh | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) Index: autoopts/Makefile.am =================================================================== --- autoopts/Makefile.am.orig 2012-08-11 18:41:23.000000000 +0200 -+++ autoopts/Makefile.am 2013-04-16 11:22:38.233788275 +0200 ++++ autoopts/Makefile.am 2013-04-16 11:26:51.454797966 +0200 @@ -133,7 +133,7 @@ INST_SH = autoopts-con man_MANS = $(INST_MANS) @@ -15,3 +16,20 @@ Index: autoopts/Makefile.am lib_LTLIBRARIES = $(INST_LIBS) nobase_include_HEADERS = $(INST_HDRS) bin_SCRIPTS = $(INST_SH) +Index: doc/mk-agen-texi.sh +=================================================================== +--- doc/mk-agen-texi.sh.orig 2012-05-13 22:52:48.000000000 +0200 ++++ doc/mk-agen-texi.sh 2013-04-16 11:27:17.865173188 +0200 +@@ -91,9 +91,9 @@ setup_exports() + + PATH=${top_builddir}/columns:${PATH} + timer=`expr ${AG_TIMEOUT} '*' 5` +- d=`find ${top_builddir}/autoopts -type f -name libopts.a -print` +- test -f "$d" || die "Cannot locate libopts.a" +- LIBS="$d ${LIBS}" ++ d=`find ${top_builddir}/autoopts -type f -name libopts.a -o -name libopts.so | head -n 1` ++ LIBS="-L`dirname \"$d\"` -lopts ${LIBS}" ++ LD_LIBRARY_PATH="`dirname \"$d\"`:$LD_LIBRARY_PATH" + + eval `${EGREP} '^AG_[A-Z_]*' ${top_srcdir}/VERSION` + diff --git a/autogen.changes b/autogen.changes index e2e27b0..081bd3b 100644 --- a/autogen.changes +++ b/autogen.changes @@ -5,6 +5,7 @@ Tue Apr 16 11:24:00 CEST 2013 - pth@suse.de * Coverity cleanups * evade Guile issue on BSD platform. * avoid emitting non-error messages to stderr +- Adapt autogen-build_ldpath.patch to the changed sources. ------------------------------------------------------------------- Sat Mar 2 12:05:34 UTC 2013 - seife+obs@b1-systems.com