| 1 |
pva 08/11/03 15:51:22 |
| 2 |
|
| 3 |
Added: dictd-1.10.11-automatic-plugins_build-failure.patch |
| 4 |
Log: |
| 5 |
Fixed build problem reported by Markus Meier in bug #244246 comment 9. Dropped keywords due to new dependencies. |
| 6 |
(Portage version: 2.2_rc12/cvs/Linux 2.6.26-openvz.git-35f41f1 i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 app-text/dictd/files/dictd-1.10.11-automatic-plugins_build-failure.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/dictd/files/dictd-1.10.11-automatic-plugins_build-failure.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/dictd/files/dictd-1.10.11-automatic-plugins_build-failure.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: dictd-1.10.11-automatic-plugins_build-failure.patch |
| 15 |
=================================================================== |
| 16 |
=== modified file 'Makefile.in' |
| 17 |
--- Makefile.in 2008-11-03 11:47:00 +0000 |
| 18 |
+++ Makefile.in 2008-11-03 14:01:26 +0000 |
| 19 |
@@ -58,7 +58,7 @@ |
| 20 |
EXEEXT=@EXEEXT@ |
| 21 |
|
| 22 |
CONF_DIR=@sysconfdir@/ |
| 23 |
-PLUGIN_DIR=${libexecdir}/ |
| 24 |
+PLUGIN_DIR=${libexecdir} |
| 25 |
DICT_DIR=${datadir}/ |
| 26 |
|
| 27 |
CC= @CC@ |
| 28 |
@@ -80,6 +80,8 @@ |
| 29 |
|
| 30 |
LDFLAGS= @LDFLAGS@ @LIBS@ |
| 31 |
LIBOBJS= @LIBOBJS@ |
| 32 |
+MAALIB= @MAALIB@ |
| 33 |
+MAACPPFLAGS= @MAACPPFLAGS@ |
| 34 |
EXES= dict dictd dictzip dictfmt |
| 35 |
|
| 36 |
all: $(EXES) $(LIBRARIES) |
| 37 |
@@ -155,19 +157,19 @@ |
| 38 |
endif |
| 39 |
|
| 40 |
%.o: %.c |
| 41 |
- $(LIBTOOL) --tag=CC --mode=compile $(CC) -c $(CFLAGS) $< -o $@ |
| 42 |
+ $(LIBTOOL) --tag=CC --mode=compile $(CC) -c $(CFLAGS) $(MAACPPFLAGS) $< -o $@ |
| 43 |
%.o: %.cpp |
| 44 |
- $(LIBTOOL) --tag=CXX --mode=compile $(CXX) -c $(CFLAGS) $< -o $@ |
| 45 |
+ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) -c $(CFLAGS) $(MAACPPFLAGS) $< -o $@ |
| 46 |
|
| 47 |
%: %.o |
| 48 |
$(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ -static \ |
| 49 |
$(filter-out local_regex local_zlib local_libmaa, $^) \ |
| 50 |
- $(OBJS) $(LDFLAGS) -lz |
| 51 |
+ $(OBJS) $(LDFLAGS) $(MAALIB) -lz |
| 52 |
|
| 53 |
dictd: dictd.o |
| 54 |
$(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ -static \ |
| 55 |
$(filter-out local_regex local_zlib local_libmaa, $^) \ |
| 56 |
- $(DBILIB) $(OBJS) $(LDFLAGS) -lz |
| 57 |
+ $(DBILIB) $(OBJS) $(LDFLAGS) $(MAALIB) -lz |
| 58 |
|
| 59 |
include $(srcdir)/deps |
| 60 |
|
| 61 |
@@ -197,14 +199,14 @@ |
| 62 |
$(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ -module \ |
| 63 |
$(filter-out local_regex local_zlib local_libmaa, $(^:.o=.lo)) \ |
| 64 |
-rpath "${PLUGIN_DIR}" \ |
| 65 |
- $(LDFLAGS) $(JUDYLIB) |
| 66 |
+ $(LDFLAGS) |
| 67 |
|
| 68 |
dictdplugin_dbi.la : heap.o dictdplugin_dbi.o str.o \ |
| 69 |
plugins_common.o $(LIBOBJS) |
| 70 |
$(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ -module \ |
| 71 |
$(filter-out local_regex local_zlib local_libmaa, $(^:.o=.lo)) \ |
| 72 |
-rpath "${PLUGIN_DIR}" \ |
| 73 |
- $(LDFLAGS) $(DBILIB) -ldl |
| 74 |
+ $(LDFLAGS) -ldl |
| 75 |
|
| 76 |
.PHONY: plugins |
| 77 |
plugins: $(PLUGINS) |
| 78 |
|
| 79 |
=== modified file 'configure.in' |
| 80 |
--- configure.in 2008-11-03 11:47:00 +0000 |
| 81 |
+++ configure.in 2008-11-03 13:56:42 +0000 |
| 82 |
@@ -215,14 +215,14 @@ |
| 83 |
echo Checking for libraries |
| 84 |
|
| 85 |
if test "$local_libmaa" = 0; then |
| 86 |
- AC_CHECK_LIB(maa,maa_shutdown,XLDFLAGS="$XLDFLAGS -lmaa",local_libmaa=1) |
| 87 |
+ AC_CHECK_LIB(maa,maa_shutdown,MAALIB="-lmaa",local_libmaa=1) |
| 88 |
fi |
| 89 |
|
| 90 |
if test "$local_libmaa" = 1; then |
| 91 |
AC_MSG_CHECKING(for libmaa in local source tree) |
| 92 |
if test -d libmaa; then |
| 93 |
- XLDFLAGS="$XLDFLAGS -Llibmaa -lmaa" |
| 94 |
- XCPPFLAGS="$XCPPFLAGS -Ilibmaa" |
| 95 |
+ MAALIB="-Llibmaa -lmaa" |
| 96 |
+ MAACPPFLAGS="$XCPPFLAGS -Ilibmaa" |
| 97 |
|
| 98 |
AC_CONFIG_SUBDIRS(libmaa) |
| 99 |
|
| 100 |
@@ -234,8 +234,21 @@ |
| 101 |
fi |
| 102 |
fi |
| 103 |
|
| 104 |
-AC_CHECK_LIB(Judy, JudySLNext, [JUDYLIB=-lJudy]) |
| 105 |
-AC_CHECK_LIB(dbi, dbi_shutdown, [DBILIB=-ldbi]) |
| 106 |
+AC_ARG_WITH(dbi, |
| 107 |
+[ --with-dbi build libdbi plugin if possible (plugin support should be enabled)], |
| 108 |
+[ |
| 109 |
+if test "x${withval}" != xno; then |
| 110 |
+ AC_CHECK_LIB(dbi, dbi_shutdown, [DBILIB=-ldbi]) |
| 111 |
+fi |
| 112 |
+]) |
| 113 |
+ |
| 114 |
+AC_ARG_WITH(judy, |
| 115 |
+[ --with-judy build judy plugin if possible (plugin support should be enabled)], |
| 116 |
+[ |
| 117 |
+if test "x${withval}" != xno; then |
| 118 |
+ AC_CHECK_LIB(Judy, JudySLNext, [JUDYLIB=-lJudy]) |
| 119 |
+fi |
| 120 |
+]) |
| 121 |
|
| 122 |
AC_CHECK_LIB(socket,main) |
| 123 |
AC_CHECK_LIB(c,inet_ntoa, |
| 124 |
@@ -364,12 +377,10 @@ |
| 125 |
LIBEXECDIR=`eval3 $libexecdir` |
| 126 |
DATADIR=`eval3 $datadir` |
| 127 |
|
| 128 |
-CPPFLAGS="$CPPFLAGS $XCPPFLAGS" |
| 129 |
CFLAGS="$CFLAGS $XCFLAGS" |
| 130 |
LDFLAGS="$LDFLAGS $XLDFLAGS" |
| 131 |
|
| 132 |
AC_SUBST(DICT_VERSION) |
| 133 |
-AC_SUBST(CPPFLAGS) |
| 134 |
AC_SUBST(CFLAGS) |
| 135 |
AC_SUBST(USE_PLUGIN) |
| 136 |
AC_SUBST(EXEEXT) |
| 137 |
@@ -380,6 +391,8 @@ |
| 138 |
AC_SUBST(JUDYLIB) |
| 139 |
AC_SUBST(DBILIB) |
| 140 |
AC_SUBST(LIBTOOL) |
| 141 |
+AC_SUBST(MAALIB) |
| 142 |
+AC_SUBST(MAACPPFLAGS) |
| 143 |
|
| 144 |
AC_SUBST(SYSCONFDIR) |
| 145 |
AC_SUBST(BINDIR) |
Archives