GNU MyServer: Make the binary installable.

svn path=/nixpkgs/trunk/; revision=26162
This commit is contained in:
Ludovic Courtès 2011-03-04 13:19:04 +00:00
parent 69e259eaf2
commit e7fc725ddb
2 changed files with 16 additions and 1 deletions

View file

@ -10,7 +10,8 @@ let version = "0.10"; in
sha256 = "0w8njgka54if8ycd9cyxgmqa0ivv7r0rka7gda3x2rfr2z4nxvpb";
};
patches = [ ./disable-dns-lookup-in-chroot.patch ];
patches =
[ ./disable-dns-lookup-in-chroot.patch ./installable-binary.patch ];
buildInputs =
[ libgcrypt libevent libidn gnutls libxml2 zlib guile texinfo xz ]

View file

@ -0,0 +1,14 @@
We actually want the `myserver' binary to be installable. Failing to do that
it gets an RPATH pointing to $top_builddir/src/.libs.
--- myserver-0.10/src/Makefile.in 2010-10-14 12:45:42.000000000 +0200
+++ myserver-0.10/src/Makefile.in 2011-03-03 22:23:05.000000000 +0100
@@ -1307,7 +1307,6 @@ libmyserver_la_LIBADD = \
$(INTLLIBS) $(LDFLAGS)
myserver_CXXFLAGS = $(AM_CXXFLAGS) $(CXXFLAGS) -DHOST_STR=\"$(build)\" -DPREFIX=\"$(prefix)\"
-myserver_LDFLAGS = -static -no-install
myserver_LDADD = libmyserver.la $(PTHREAD_LIB) $(IDN_LIB) \
$(XNET_LIB) $(DL_LIB) $(ZLIB_LIB) \
$(XML_LIBS) $(INTLLIBS) $(LDFLAGS)