* [gentoo-commits] gentoo-x86 commit in sys-devel/icecream/files: 0.9.7-automake.patch 0.9.7-automake-1.11.2.patch
@ 2012-08-23 10:42 Kacper Kowalik (xarthisius)
0 siblings, 0 replies; only message in thread
From: Kacper Kowalik (xarthisius) @ 2012-08-23 10:42 UTC (permalink / raw
To: gentoo-commits
xarthisius 12/08/23 10:42:09
Added: 0.9.7-automake.patch
Removed: 0.9.7-automake-1.11.2.patch
Log:
Backport patch fixing build issues with recent automake, drop my patch that caused bug #399259 by Vu Tran Kien <vutrankien.vn@gmail.com>
(Portage version: 2.2.0_alpha121/cvs/Linux x86_64)
Revision Changes Path
1.1 sys-devel/icecream/files/0.9.7-automake.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/icecream/files/0.9.7-automake.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/icecream/files/0.9.7-automake.patch?rev=1.1&content-type=text/plain
Index: 0.9.7-automake.patch
===================================================================
Backport upstream patch to fix automake-1.12 issues
https://bugs.gentoo.org/show_bug.cgi?id=397715
https://bugs.gentoo.org/show_bug.cgi?id=399259
--- client/Makefile.am
+++ client/Makefile.am
@@ -1,10 +1,11 @@
INCLUDES = -I$(srcdir)/../services
bin_PROGRAMS = icecc
-pkglib_SCRIPTS = icecc-create-env
+pkglibexec_SCRIPTS = icecc-create-env
icecc_SOURCES = main.cpp arg.cpp cpp.cpp local.cpp remote.cpp util.cpp md5.c safeguard.cpp
icecc_LDADD = ../services/libicecc.la $(LIBRSYNC)
noinst_HEADERS = client.h md5.h util.h
+AM_CPPFLAGS = -DPLIBDIR=\"$(pkglibexecdir)\"
EXTRA_DIST = icecc-create-env
--- configure.in
+++ configure.in
@@ -246,10 +246,6 @@
KDE_EXPAND_MAKEVAR(mybindir, bindir)
AC_DEFINE_UNQUOTED(BINDIR, "$mybindir", [Where to look for icecc])
-myopkglibdir='${libdir}/'"$PACKAGE"
-KDE_EXPAND_MAKEVAR(mypkglibdir, myopkglibdir)
-AC_DEFINE_UNQUOTED(PLIBDIR, "$mypkglibdir", [Where to look for icecc-create-env])
-
myorundir='${localstatedir}/run'
KDE_EXPAND_MAKEVAR(myrundir, myorundir)
AC_DEFINE_UNQUOTED(RUNDIR, "$myrundir", [Where to place pid files])
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-08-23 10:42 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-23 10:42 [gentoo-commits] gentoo-x86 commit in sys-devel/icecream/files: 0.9.7-automake.patch 0.9.7-automake-1.11.2.patch Kacper Kowalik (xarthisius)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox