diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2008-07-05 03:15:16 +0000 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2008-07-05 03:15:16 +0000 |
commit | 054f2cde956c764989f69b973d699ab2ab692106 (patch) | |
tree | 2d1dbc0dd7a7c1c639b67f65d32e0e5a0f1e29b9 /sys-power/nut/files | |
parent | (#223111) Bump, fix various compilation issues of the older version with newe... (diff) | |
download | gentoo-2-054f2cde956c764989f69b973d699ab2ab692106.tar.gz gentoo-2-054f2cde956c764989f69b973d699ab2ab692106.tar.bz2 gentoo-2-054f2cde956c764989f69b973d699ab2ab692106.zip |
Bug #229443, compile-fix for newer libtool setups.
(Portage version: 2.2_rc1/cvs/Linux 2.6.26-rc4-00103-g1beee8d x86_64)
Diffstat (limited to 'sys-power/nut/files')
-rw-r--r-- | sys-power/nut/files/nut-2.2.2-no-libdummy.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/sys-power/nut/files/nut-2.2.2-no-libdummy.patch b/sys-power/nut/files/nut-2.2.2-no-libdummy.patch new file mode 100644 index 000000000000..646e9fefe184 --- /dev/null +++ b/sys-power/nut/files/nut-2.2.2-no-libdummy.patch @@ -0,0 +1,32 @@ +diff -Nuar nut-2.2.2.orig/common/Makefile.am nut-2.2.2/common/Makefile.am +--- nut-2.2.2.orig/common/Makefile.am 2007-05-27 07:07:56.000000000 -0700 ++++ nut-2.2.2/common/Makefile.am 2008-07-04 20:09:14.062814944 -0700 +@@ -10,8 +10,8 @@ + + # Define a dummy library so that Automake builds rules for the + # corresponding object files. This library is not actually built, +-EXTRA_LIBRARIES = libdummy.a +-libdummy_a_SOURCES = parseconf.c state.c upsconf.c ++#EXTRA_LIBRARIES = libdummy.a ++#libdummy_a_SOURCES = parseconf.c state.c upsconf.c + + ../include/nut_version.h: FORCE + (cd ../include/ && $(MAKE) $(AM_MAKEFLAGS) nut_version.h) +diff -Nuar nut-2.2.2.orig/drivers/Makefile.am nut-2.2.2/drivers/Makefile.am +--- nut-2.2.2.orig/drivers/Makefile.am 2008-07-04 20:12:38.201211819 -0700 ++++ nut-2.2.2/drivers/Makefile.am 2008-07-04 20:12:59.829462787 -0700 +@@ -211,10 +211,12 @@ + upscode2.h victronups.h powerpanel.h powerp-bin.h powerp-txt.h \ + upshandler.h netxml-ups.h mge-xml.h + ++EXTRA_LIBRARIES = ++ + # Define a dummy library so that Automake builds rules for the + # corresponding object files. This library is not actually built, +-EXTRA_LIBRARIES = libdummy.a +-libdummy_a_SOURCES = main.c dstate.c serial.c ++#EXTRA_LIBRARIES += libdummy.a ++#libdummy_a_SOURCES = main.c dstate.c serial.c + + # the nuthalmain library combines the code for main-hal.c and + # dstate-hal.c. It is necessary for Automake-technical reasons, |