Gentoo Archives: gentoo-commits

From: "Robin H. Johnson (robbat2)" <robbat2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-power/nut/files: nut-2.2.2-no-libdummy.patch
Date: Sat, 05 Jul 2008 03:15:22
Message-Id: E1KEyF3-0005mz-5C@stork.gentoo.org
1 robbat2 08/07/05 03:15:17
2
3 Added: nut-2.2.2-no-libdummy.patch
4 Log:
5 Bug #229443, compile-fix for newer libtool setups.
6 (Portage version: 2.2_rc1/cvs/Linux 2.6.26-rc4-00103-g1beee8d x86_64)
7
8 Revision Changes Path
9 1.1 sys-power/nut/files/nut-2.2.2-no-libdummy.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-power/nut/files/nut-2.2.2-no-libdummy.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-power/nut/files/nut-2.2.2-no-libdummy.patch?rev=1.1&content-type=text/plain
13
14 Index: nut-2.2.2-no-libdummy.patch
15 ===================================================================
16 diff -Nuar nut-2.2.2.orig/common/Makefile.am nut-2.2.2/common/Makefile.am
17 --- nut-2.2.2.orig/common/Makefile.am 2007-05-27 07:07:56.000000000 -0700
18 +++ nut-2.2.2/common/Makefile.am 2008-07-04 20:09:14.062814944 -0700
19 @@ -10,8 +10,8 @@
20
21 # Define a dummy library so that Automake builds rules for the
22 # corresponding object files. This library is not actually built,
23 -EXTRA_LIBRARIES = libdummy.a
24 -libdummy_a_SOURCES = parseconf.c state.c upsconf.c
25 +#EXTRA_LIBRARIES = libdummy.a
26 +#libdummy_a_SOURCES = parseconf.c state.c upsconf.c
27
28 ../include/nut_version.h: FORCE
29 (cd ../include/ && $(MAKE) $(AM_MAKEFLAGS) nut_version.h)
30 diff -Nuar nut-2.2.2.orig/drivers/Makefile.am nut-2.2.2/drivers/Makefile.am
31 --- nut-2.2.2.orig/drivers/Makefile.am 2008-07-04 20:12:38.201211819 -0700
32 +++ nut-2.2.2/drivers/Makefile.am 2008-07-04 20:12:59.829462787 -0700
33 @@ -211,10 +211,12 @@
34 upscode2.h victronups.h powerpanel.h powerp-bin.h powerp-txt.h \
35 upshandler.h netxml-ups.h mge-xml.h
36
37 +EXTRA_LIBRARIES =
38 +
39 # Define a dummy library so that Automake builds rules for the
40 # corresponding object files. This library is not actually built,
41 -EXTRA_LIBRARIES = libdummy.a
42 -libdummy_a_SOURCES = main.c dstate.c serial.c
43 +#EXTRA_LIBRARIES += libdummy.a
44 +#libdummy_a_SOURCES = main.c dstate.c serial.c
45
46 # the nuthalmain library combines the code for main-hal.c and
47 # dstate-hal.c. It is necessary for Automake-technical reasons,
48
49
50
51 --
52 gentoo-commits@l.g.o mailing list