Author: ludo
Date: Fri Mar 4 13:19:04 2011
New Revision: 26162
URL: https://svn.nixos.org/websvn/nix/?rev=26162&sc=1
Log:
GNU MyServer: Make the binary installable.
Added:
nixpkgs/trunk/pkgs/servers/http/myserver/installable-binary.patch
Modified:
nixpkgs/trunk/pkgs/servers/http/myserver/default.nix
Modified: nixpkgs/trunk/pkgs/servers/http/myserver/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/servers/http/myserver/default.nix Fri Mar 4
13:19:00 2011 (r26161)
+++ nixpkgs/trunk/pkgs/servers/http/myserver/default.nix Fri Mar 4
13:19:04 2011 (r26162)
@@ -10,7 +10,8 @@
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 ]
Added: nixpkgs/trunk/pkgs/servers/http/myserver/installable-binary.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/servers/http/myserver/installable-binary.patch Fri Mar
4 13:19:04 2011 (r26162)
@@ -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)
+
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
